Merge pull request #607 from H7GhosT/feature/botforum-managed-topics

Botforums in case topics cannot be managed

Author: morethanwords

src/components/appSelectPeers.ts

@@ -196,7 +196,8 @@ export default class AppSelectPeers {
     excludeMonoforums?: boolean,
     excludeBotforums?: boolean,
     placeholderSizes?: ConstructorParameters<typeof DialogsPlaceholder>[0],
-    getPeerIdFromKey?: AppSelectPeers['getPeerIdFromKey']
+    getPeerIdFromKey?: AppSelectPeers['getPeerIdFromKey'],
+    topSectionContentElements?: HTMLElement[]
   }) {
     safeAssign(this, options);
 
@@ -388,6 +389,10 @@ export default class AppSelectPeers {
       section.content = section.generateContentElement();
     }
 
+    if(options.topSectionContentElements) {
+      section.content.append(...options.topSectionContentElements);
+    }
+
     // it can't have full height then
     if(!this.sectionCaption) {
       section.content.classList.add('selector-list-section-content');

src/components/chat/bubbleGroups.ts

@@ -510,6 +510,7 @@ export default class BubbleGroups {
 
       if(item.message._ !== 'message') return;
       if(!bubbleAddons.continueLastTopicReplyMarkup) return;
+      if(!getMessageThreadId(item.message, {isBotforum: this.chat.isBotforum})) return;
 
       bubbleAddons.continueLastTopicReplyMarkup.feedProps<false>({
         visible: visible && !(item.message.reply_markup as ReplyMarkup.replyInlineMarkup)?.rows

src/components/chat/bubbleParts/continuouslyTypingMessage.ts

@@ -42,7 +42,7 @@ export function wrapContinuouslyTypingMessage({root, bubble, scrollable, isEnd =
     if(ended) return;
     ended = true;
 
-    if(!isEnd) appendDots(lastTextNode);
+    if(!isEnd && lastTextNode) appendDots(lastTextNode);
   }
 
   const result = {

src/components/chat/bubbles.ts

@@ -9928,7 +9928,7 @@ export default class ChatBubbles {
         return this.renderBotforumPlaceholder();
       }
 
-      if(side === 'top' && value && this.chat.isBot) {
+      if(side === 'top' && value && this.chat.isBot && !this.chat.threadId) {
         return this.renderBotPlaceholder();
       }
 
@@ -10148,6 +10148,7 @@ export default class ChatBubbles {
       this.scrollable.loadedAll.bottom &&
       this.emptyPlaceholderBubble === undefined &&
       !shouldShowUnknownUserPlaceholder(this.peerSettings) &&
+      (!this.chat.isBotforum || this.chat.canManageBotforumTopics) &&
       (
         this.chat.isRestricted ||
         this.chat.type === ChatType.Logs ||
@@ -10500,7 +10501,7 @@ export default class ChatBubbles {
   }
 
   private shouldShowBotforumNewTopic() {
-    return this.chat.isBotforum && !this.chat.threadId;
+    return this.chat.isBotforum && !this.chat.threadId && this.chat.canManageBotforumTopics;
   }
 
   private finalizeTypingMessage(message: MyMessage, tempId: number) {

src/components/chat/chat.ts

@@ -167,6 +167,7 @@ export default class Chat extends EventListenerBase<{
   public isMonoforum: boolean;
   public isBotforum: boolean;
   public canManageDirectMessages: boolean;
+  public canManageBotforumTopics: boolean;
   public isTemporaryThread: boolean;
   public noInput: boolean;
 
@@ -912,6 +913,7 @@ export default class Chat extends EventListenerBase<{
 
     const isForum = apiManagerProxy.isForum(peerId);
     const isBotforum = apiManagerProxy.isBotforum(peerId);
+    const canManageBotforumTopics = apiManagerProxy.canManageBotforumTopics(peerId);
 
     if(threadId && !isForum && !isBotforum) {
       options.type = options.peerId === rootScope.myId ? ChatType.Saved : ChatType.Discussion;
@@ -976,6 +978,7 @@ export default class Chat extends EventListenerBase<{
     this.isMonoforum = !!(chat?._ === 'channel' && chat?.pFlags?.monoforum);
     this.isBotforum = isBotforum;
     this.canManageDirectMessages = canManageDirectMessages;
+    this.canManageBotforumTopics = canManageBotforumTopics;
 
     if(starsAmount.cached) {
       this.starsAmount = await starsAmount.result;
@@ -1334,9 +1337,10 @@ export default class Chat extends EventListenerBase<{
       this.managers.appPeersManager.isBot(this.peerId),
       this.managers.appMessagesManager.getDialogOnly(this.peerId),
       this.getHistoryStorage(true),
-      this.peerId.isUser() ? this.managers.appProfileManager.isCachedUserBlocked(this.peerId.toUserId()) : undefined
-    ]).then(([isBot, dialog, historyStorage, isUserBlocked]) => {
-      if(!isBot || isVerificationBot(this.peerId)) {
+      this.peerId.isUser() ? this.managers.appProfileManager.isCachedUserBlocked(this.peerId.toUserId()) : undefined,
+      this.managers.appPeersManager.isBotforum(this.peerId)
+    ]).then(([isBot, dialog, historyStorage, isUserBlocked, isBotforum]) => {
+      if(!isBot || isVerificationBot(this.peerId) || isBotforum) {
         return false;
       }
 

src/components/chat/input.ts

@@ -2271,6 +2271,8 @@ export default class ChatInput {
         });
       }
 
+      haveSomethingInControl ||= this.chat.isBotforum && this.chat.canManageBotforumTopics;
+
       this.botStartBtn.classList.toggle('hide', haveSomethingInControl);
 
       if(this.messageInput) {
@@ -2411,6 +2413,8 @@ export default class ChatInput {
         this.chat.monoforumThreadId || this.directMessagesHandler.store.isReplying ?
           'Message' :
           'ChannelDirectMessages.ChooseMessage';
+    } else if(this.chat.isBotforum && !this.chat.canManageBotforumTopics && !this.chat.threadId) {
+      key = 'OffThreadMessage'
     } else if(
       (this.sendAsPeerId !== undefined && this.sendAsPeerId !== rootScope.myId) ||
       await this.managers.appMessagesManager.isAnonymousSending(peerId)

src/components/dialogsContextMenu.ts

@@ -61,7 +61,7 @@ export default class DialogsContextMenu {
         this.monoforumParentPeerId = +li.dataset.monoforumParentPeerId || undefined;
 
         if(li.dataset.isAllChats) {
-          throw {};
+          throw 'All chats dialog';
         }
 
         this.dialog = this.monoforumParentPeerId ?

src/components/forumTab/botforumTab.ts

@@ -81,6 +81,11 @@ export class BotforumTab extends ForumTab {
       }
     });
 
+    this.listenerSetter.add(rootScope)('dialog_drop', (dialog) => {
+      if(this.peerId !== dialog.peerId) return;
+      this.updateDialogsCount();
+    });
+
     this.listenerSetter.add(rootScope)('dialog_draft', ({dialog}) => {
       if(!isDialog(dialog) || dialog.peerId !== this.peerId) return;
       this.updateAllChatsDialog(dialog);
@@ -123,13 +128,21 @@ export class BotforumTab extends ForumTab {
       }));
 
       this.title.append(peerTitle);
-      this.subtitle.append(this.dialogsCountI18nEl = i18n('TopicsCount', [dialogs ? dialogs.count + '' : '~']))
+      this.subtitle.append(this.dialogsCountI18nEl = this.getTopicsCountI18n(dialogs ? dialogs.count : null));
     } catch{}
   }
 
+  private getTopicsCountI18n(count: number | null) {
+    if(count === 0) {
+      return i18n('NoTopics');
+    }
+
+    return i18n('TopicsCount', [count ? count + '' : '~']);
+  }
+
   private updateDialogsCount = asyncThrottle(async() => {
     if(!this.dialogsCountI18nEl) return;
     const {count} = await this.managers.dialogsStorage.getDialogs({filterId: this.peerId, limit: 1});
-    this.dialogsCountI18nEl.replaceWith(this.dialogsCountI18nEl = i18n('TopicsCount', [count + '']));
+    this.dialogsCountI18nEl.replaceWith(this.dialogsCountI18nEl = this.getTopicsCountI18n(count));
   }, 0);
 }

src/components/peerTitle.ts

@@ -195,16 +195,32 @@ export default class PeerTitle {
         getTopicIconPromise
       ]);
 
-      if(icons?.elements?.length || icons?.botVerification || topicIcon) {
+      const createInnerTitleSpan = () => {
         const inner = document.createElement('span');
         inner.classList.add('peer-title-inner');
         hasInner = true;
         setInnerHTML(inner, title);
 
+        return inner;
+      };
+
+      const setElementContent = (nodes: (Node | string)[]) => {
         const fragment = document.createDocumentFragment();
-        fragment.append(...[icons.botVerification, topicIcon, inner, ...(icons.elements ?? [])].filter(Boolean));
+        fragment.append(...nodes);
 
         setInnerHTML(this.element, fragment);
+      }
+
+      if(topicIcon) {
+        setElementContent(
+          [topicIcon, createInnerTitleSpan()].filter(Boolean)
+        );
+      } else if(icons?.elements?.length || icons?.botVerification) {
+        setElementContent(
+          [
+            icons.botVerification, topicIcon, createInnerTitleSpan(), ...(icons.elements ?? [])
+          ].filter(Boolean)
+        );
       } else {
         setInnerHTML(this.element, title);
       }

src/components/popups/pickUser.ts

@@ -30,6 +30,7 @@ import {AutonomousMonoforumThreadList} from '@components/autonomousDialogList/mo
 import Scrollable from '@components/scrollable';
 import SortedDialogList from '@components/sortedDialogList';
 import rootScope from '@lib/rootScope';
+import apiManagerProxy from '@lib/apiManagerProxy';
 
 type PopupPickUserOptions = Modify<ConstructorParameters<typeof AppSelectPeers>[0], {
   multiSelect?: never,
@@ -77,6 +78,29 @@ async function wrapTopicRow({
   return row.container;
 }
 
+function wrapAllMessagesRow({
+  onClick
+}: {
+  onClick: () => void
+}) {
+  const row = new Row({
+    title: i18n('AllMessages'),
+    clickable: onClick
+  });
+  row.container.classList.add('selector-forum-topic');
+  const media = row.createMedia('abitbigger');
+  media.append(wrapEmojiText('💬'));
+  return row.container;
+}
+
+type OnSelectOptions = {
+  threadId?: number;
+  monoforumThreadId?: PeerId;
+  done?: boolean;
+};
+
+type LocalOnSelectCallback = (peerId: PeerId, options?: OnSelectOptions) => void;
+
 export default class PopupPickUser extends PopupElement {
   public selector: AppSelectPeers;
   public forumSelector: AppSelectPeers;
@@ -110,13 +134,15 @@ export default class PopupPickUser extends PopupElement {
     const headerSearch = options.headerSearch ?? isMultiSelect;
 
     let ignoreOnSelect: boolean;
-    const onSelect = async(peerId: PeerId | PeerId[], threadId?: number, monoforumThreadId?: PeerId) => {
+
+    const onSelect = async(peerId: PeerId | PeerId[], {threadId, monoforumThreadId, done}: OnSelectOptions = {}) => {
       if(ignoreOnSelect) {
         return;
       }
 
       if(
         options.useTopics &&
+        !done &&
         !Array.isArray(peerId) &&
         !threadId && !monoforumThreadId &&
         (await this.managers.appPeersManager.isForum(peerId) || await this.managers.appPeersManager.isBotforum(peerId))
@@ -134,6 +160,7 @@ export default class PopupPickUser extends PopupElement {
 
       if(
         !Array.isArray(peerId) &&
+        !done &&
         !threadId && !monoforumThreadId &&
         await this.managers.appPeersManager.canManageDirectMessages(peerId) &&
         await this.managers.appPeersManager.isMonoforum(peerId)
@@ -263,7 +290,7 @@ export default class PopupPickUser extends PopupElement {
     tabsContainer: HTMLElement,
     peerId: PeerId,
     placeholder: LangPackKey,
-    onSelect: (peerId: PeerId, threadId: number) => any
+    onSelect: LocalOnSelectCallback
   }) {
     const middlewareHelper = this.middlewareHelper.get().create();
     const middleware = middlewareHelper.get();
@@ -313,7 +340,7 @@ export default class PopupPickUser extends PopupElement {
         forumSelector.list[!append ? 'append' : 'prepend'](...elements);
       },
       onSelect: (topicId) => {
-        onSelect(peerId, topicId);
+        onSelect(peerId, {threadId: topicId});
       },
       placeholderSizes: {
         avatarSize: 32,
@@ -329,7 +356,14 @@ export default class PopupPickUser extends PopupElement {
       },
       onFirstRender: () => {
         deferred.resolve();
-      }
+      },
+      topSectionContentElements: apiManagerProxy.isBotforum(peerId) && !apiManagerProxy.canManageBotforumTopics(peerId) ? [
+        wrapAllMessagesRow({
+          onClick: () => {
+            onSelect(peerId, {done: true});
+          }
+        })
+      ] : undefined
     });
 
     forumSelector.container.classList.add('tabs-tab');
@@ -363,7 +397,7 @@ export default class PopupPickUser extends PopupElement {
     peerId: PeerId,
     tabsContainer: HTMLElement,
     placeholder: LangPackKey,
-    onSelect: PopupPickUserOptions['onSelect']
+    onSelect: LocalOnSelectCallback
   }) {
     const middlewareHelper = this.middlewareHelper.get().create();
     const middleware = middlewareHelper.get();
@@ -404,7 +438,7 @@ export default class PopupPickUser extends PopupElement {
       const peerId = target.dataset.peerId?.toPeerId?.();
       if(!peerId) return;
 
-      onSelect?.(parentPeerId, undefined, peerId);
+      onSelect?.(parentPeerId, {monoforumThreadId: peerId});
     });
 
     const container = document.createElement('div');