Groups online count

src/helpers/cacheFunctionPolyfill.ts

@@ -0,0 +1,36 @@
+/*
+ * https://github.com/morethanwords/tweb
+ * Copyright (C) 2019-2021 Eduard Kuzmenko
+ * https://github.com/morethanwords/tweb/blob/master/LICENSE
+ */
+
+import ctx from "../environment/ctx";
+
+type CacheFunction = (...args: any[]) => any;
+const cache: Map<CacheFunction, {result: any, timeout: number}> = new Map();
+
+Function.prototype.cache = function(thisArg, ...args: any[]) {
+  let cached = cache.get(this);
+  if(cached) {
+    return cached.result;
+  }
+
+  const result = this.apply(thisArg, args as any);
+
+  cache.set(this, cached = {
+    result,
+    timeout: ctx.setTimeout(() => {
+      cache.delete(this);
+    }, 60000)
+  });
+
+  return result;
+};
+
+declare global {
+  interface Function {
+    cache<T, A extends any[], R>(this: (this: T, ...args: A) => R, thisArg?: T, ...args: A): R;
+  }
+}
+
+export {};

src/index.ts

@@ -99,7 +99,7 @@ console.timeEnd('get storage1'); */
     const workerProxy = new Proxy(Worker, workerHandler);
     Worker = workerProxy;
 
-    const [_, touchSupport, userAgent, rootScope, appStateManager, I18n, __] = await Promise.all([
+    const [_, touchSupport, userAgent, rootScope, appStateManager, I18n, __/* , ___ */] = await Promise.all([
       import('./lib/polyfill'),
       import('./environment/touchSupport'),
       import('./environment/userAgent'),
@@ -107,6 +107,7 @@ console.timeEnd('get storage1'); */
       import('./lib/appManagers/appStateManager'),
       import('./lib/langPack'),
       import('./helpers/peerIdPolyfill'),
+      // import('./helpers/cacheFunctionPolyfill')
     ]);
 
     //console.timeEnd('get storage');

src/lang.ts

@@ -588,6 +588,10 @@ const lang = {
   "AudioUnknownArtist": "Unknown artist",
   "AudioUnknownTitle": "Unknown title",
   "LogOut": "Log out",
+  "OnlineCount": {
+    "one_value": "%1$d online",
+    "other_value": "%1$d online"
+  },
 
   // * macos
   "AccountSettings.Filters": "Chat Folders",

src/lib/appManagers/appChatsManager.ts

@@ -111,6 +111,8 @@ export class AppChatsManager {
   }
 
   public saveApiChats(apiChats: any[], override?: boolean) {
+    if((apiChats as any).saved) return;
+    (apiChats as any).saved = true;
     apiChats.forEach(chat => this.saveApiChat(chat, override));
   }
 

src/lib/appManagers/appImManager.ts

@@ -42,7 +42,7 @@ import { MOUNT_CLASS_TO } from '../../config/debug';
 import appNavigationController from '../../components/appNavigationController';
 import appNotificationsManager from './appNotificationsManager';
 import AppPrivateSearchTab from '../../components/sidebarRight/tabs/search';
-import { i18n, LangPackKey } from '../langPack';
+import { i18n, join, LangPackKey } from '../langPack';
 import { ChatInvite, Dialog, SendMessageAction } from '../../layer';
 import { hslaStringToHex } from '../../helpers/color';
 import { copy, getObjectKeysAndSort } from '../../helpers/object';
@@ -71,6 +71,7 @@ import MEDIA_MIME_TYPES_SUPPORTED from '../../environment/mediaMimeTypesSupport'
 import { NULL_PEER_ID } from '../mtproto/mtproto_config';
 import telegramMeWebManager from '../mtproto/telegramMeWebManager';
 import { ONE_DAY } from '../../helpers/date';
+import { numberThousandSplitter } from '../../helpers/number';
 
 //console.log('appImManager included33!');
 
@@ -1423,7 +1424,7 @@ export class AppImManager {
 
   public async getPeerStatus(peerId: PeerId) {
     let subtitle: HTMLElement;
-    if(!peerId) return '';
+    if(!peerId) return;
 
     if(peerId.isAnyChat()) { // not human
       let span = this.getPeerTyping(peerId);
@@ -1431,18 +1432,25 @@ export class AppImManager {
         return span;
       }
 
-      const chatInfo = await appProfileManager.getChatFull(peerId.toChatId()) as any;
+      const chatId = peerId.toChatId();
+      const chatInfo = await appProfileManager.getChatFull(chatId) as any;
       this.chat.log('chatInfo res:', chatInfo);
 
       const participants_count = chatInfo.participants_count || (chatInfo.participants && chatInfo.participants.participants && chatInfo.participants.participants.length) || 1;
       //if(participants_count) {
-        subtitle = appProfileManager.getChatMembersString(peerId.toChatId());
+        subtitle = appProfileManager.getChatMembersString(chatId);
 
-        if(participants_count < 2) return subtitle;
+        if(participants_count < 2) {
-        /* const onlines = await appChatsManager.getOnlines(chat.id);
+          return subtitle;
+        }
+
+        const onlines = await appProfileManager.getOnlines(chatId);
         if(onlines > 1) {
-          subtitle += ', ' + numberThousandSplitter(onlines) + ' online';
+          const span = document.createElement('span');
-        } */
+          
+          span.append(...join([subtitle, i18n('OnlineCount', [numberThousandSplitter(onlines)])], false));
+          subtitle = span;
+        }
   
         return subtitle;
       //}
@@ -1450,7 +1458,7 @@ export class AppImManager {
       const user = appUsersManager.getUser(peerId);
       
       if(rootScope.myId === peerId) {
-        return '';
+        return;
       } else if(user) {
         subtitle = appUsersManager.getUserStatusString(user.id);
 

src/lib/appManagers/appMessagesManager.ts

@@ -19,7 +19,7 @@ import { randomLong } from "../../helpers/random";
 import { splitStringByLength, limitSymbols, escapeRegExp } from "../../helpers/string";
 import { Chat, ChatFull, Dialog as MTDialog, DialogPeer, DocumentAttribute, InputMedia, InputMessage, InputPeerNotifySettings, InputSingleMedia, Message, MessageAction, MessageEntity, MessageFwdHeader, MessageMedia, MessageReplies, MessageReplyHeader, MessagesDialogs, MessagesFilter, MessagesMessages, MethodDeclMap, NotifyPeer, PeerNotifySettings, PhotoSize, SendMessageAction, Update, Photo, Updates, ReplyMarkup, InputPeer, InputPhoto, InputDocument, InputGeoPoint, WebPage, GeoPoint, ReportReason, MessagesGetDialogs, InputChannel, InputDialogPeer } from "../../layer";
 import { InvokeApiOptions } from "../../types";
-import I18n, { i18n, join, langPack, LangPackKey, _i18n } from "../langPack";
+import I18n, { FormatterArguments, i18n, join, langPack, LangPackKey, _i18n } from "../langPack";
 import { logger, LogTypes } from "../logger";
 import type { ApiFileManager } from '../mtproto/apiFileManager';
 //import apiManager from '../mtproto/apiManager';
@@ -41,7 +41,7 @@ import appPollsManager from "./appPollsManager";
 import appStateManager from "./appStateManager";
 import appUsersManager from "./appUsersManager";
 import appWebPagesManager from "./appWebPagesManager";
-import appDraftsManager from "./appDraftsManager";
+import appDraftsManager, { MyDraftMessage } from "./appDraftsManager";
 import { getFileNameByLocation } from "../../helpers/fileName";
 import appProfileManager from "./appProfileManager";
 import DEBUG, { MOUNT_CLASS_TO } from "../../config/debug";
@@ -2332,14 +2332,12 @@ export class AppMessagesManager {
     return appMessagesIdsManager.generateMessageId(dialog?.top_message || 0, true);
   }
 
-  public saveMessages(messages: any[], options: Partial<{
+  public saveMessage(message: any, options: Partial<{
     storage: MessagesStorage,
     isScheduled: true,
     isOutgoing: true,
     //isNew: boolean, // * new - from update
   }> = {}) {
-    //let groups: Set<string>;
-    messages.forEach((message) => {
     if(message.pFlags === undefined) {
       message.pFlags = {};
     }
@@ -2452,10 +2450,12 @@ export class AppMessagesManager {
 
     if(message.media) {
       switch(message.media._) {
-          case 'messageMediaEmpty':
+        case 'messageMediaEmpty': {
           delete message.media;
           break;
-          case 'messageMediaPhoto':
+        }
+
+        case 'messageMediaPhoto': {
           if(message.media.ttl_seconds) {
             message.media = {_: 'messageMediaUnsupportedWeb'};
           } else {
@@ -2467,12 +2467,16 @@ export class AppMessagesManager {
           }
           
           break;
-          case 'messageMediaPoll':
+        }
+          
+        case 'messageMediaPoll': {
           const result = appPollsManager.savePoll(message.media.poll, message.media.results, message);
           message.media.poll = result.poll;
           message.media.results = result.results;
           break;
-          case 'messageMediaDocument':
+        }
+          
+        case 'messageMediaDocument': {
           if(message.media.ttl_seconds) {
             message.media = {_: 'messageMediaUnsupportedWeb'};
           } else {
@@ -2480,19 +2484,25 @@ export class AppMessagesManager {
           }
 
           break;
-          case 'messageMediaWebPage':
+        }
+          
+        case 'messageMediaWebPage': {
           const messageKey = appWebPagesManager.getMessageKeyForPendingWebPage(peerId, mid, options.isScheduled);
           message.media.webpage = appWebPagesManager.saveWebPage(message.media.webpage, messageKey, mediaContext);
           break;
+        }
+          
         /*case 'messageMediaGame':
           AppGamesManager.saveGame(apiMessage.media.game, apiMessage.mid, mediaContext);
           apiMessage.media.handleMessage = true;
           break; */
-          case 'messageMediaInvoice':
+
+        case 'messageMediaInvoice': {
           message.media = {_: 'messageMediaUnsupportedWeb'};
           break;
         }
       }
+    }
 
     if(message.action) {
       const action = message.action as MessageAction;
@@ -2642,20 +2652,22 @@ export class AppMessagesManager {
     }
 
     storage.set(mid, message);
+  }
+
+  public saveMessages(messages: any[], options: Partial<{
+    storage: MessagesStorage,
+    isScheduled: true,
+    isOutgoing: true,
+    //isNew: boolean, // * new - from update
+  }> = {}) {
+    if((messages as any).saved) return;
+    (messages as any).saved = true;
+    messages.forEach((message) => {
+      this.saveMessage(message, options);
     });
-
-    /* if(groups) {
-      for(const groupId of groups) {
-        const mids = this.groupedMessagesStorage[groupId];
-        for(const mid in mids) {
-          const message = this.groupedMessagesStorage[groupId][mid];
-          message.rReply = this.getRichReplyText(message);
-        }
-      }
-    } */
   }
 
-  private wrapMessageEntities(message: any) {
+  private wrapMessageEntities(message: Message.message) {
     const apiEntities = message.entities ? message.entities.slice() : [];
     message.message = RichTextProcessor.fixEmoji(message.message, apiEntities);
 
@@ -2663,9 +2675,9 @@ export class AppMessagesManager {
     message.totalEntities = RichTextProcessor.mergeEntities(apiEntities, myEntities); // ! only in this order, otherwise bold and emoji formatting won't work
   }
 
-  public wrapMessageForReply(message: any, text: string, usingMids: number[], plain: true, highlightWord?: string, withoutMediaType?: boolean): string;
+  public wrapMessageForReply(message: MyMessage | MyDraftMessage, text: string, usingMids: number[], plain: true, highlightWord?: string, withoutMediaType?: boolean): string;
-  public wrapMessageForReply(message: any, text?: string, usingMids?: number[], plain?: false, highlightWord?: string, withoutMediaType?: boolean): DocumentFragment;
+  public wrapMessageForReply(message: MyMessage | MyDraftMessage, text?: string, usingMids?: number[], plain?: false, highlightWord?: string, withoutMediaType?: boolean): DocumentFragment;
-  public wrapMessageForReply(message: any, text: string = message.message, usingMids?: number[], plain?: boolean, highlightWord?: string, withoutMediaType?: boolean): DocumentFragment | string {
+  public wrapMessageForReply(message: MyMessage | MyDraftMessage, text: string = (message as Message.message).message, usingMids?: number[], plain?: boolean, highlightWord?: string, withoutMediaType?: boolean): DocumentFragment | string {
     const parts: (HTMLElement | string)[] = [];
 
     const addPart = (langKey: LangPackKey, part?: string | HTMLElement, text?: string) => {
@@ -2687,7 +2699,7 @@ export class AppMessagesManager {
       }
     };
 
-    if(message.media) {
+    if('media' in message) {
       let usingFullAlbum = true;
       if(message.grouped_id) {
         if(usingMids) {
@@ -2784,7 +2796,7 @@ export class AppMessagesManager {
       } 
     }
 
-    if(message.action) {
+    if('action' in message) {
       const actionWrapped = this.wrapMessageActionTextNew(message, plain);
       if(actionWrapped) {
         addPart(undefined, actionWrapped);
@@ -2865,20 +2877,21 @@ export class AppMessagesManager {
     return el;
   }
 
-  public wrapMessageActionTextNew(message: any, plain: true): string;
+  public wrapMessageActionTextNew(message: MyMessage, plain: true): string;
-  public wrapMessageActionTextNew(message: any, plain?: false): HTMLElement;
+  public wrapMessageActionTextNew(message: MyMessage, plain?: false): HTMLElement;
-  public wrapMessageActionTextNew(message: any, plain: boolean): HTMLElement | string;
+  public wrapMessageActionTextNew(message: MyMessage, plain: boolean): HTMLElement | string;
-  public wrapMessageActionTextNew(message: any, plain?: boolean): HTMLElement | string {
+  public wrapMessageActionTextNew(message: MyMessage, plain?: boolean): HTMLElement | string {
     const element: HTMLElement = plain ? undefined : document.createElement('span');
-    const action = message.action as MessageAction;
+    const action = 'action' in message && message.action;
 
     // this.log('message action:', action);
 
     if((action as MessageAction.messageActionCustomAction).message) {
+      const unsafeMessage = (action as MessageAction.messageActionCustomAction).message;
       if(plain) {
-        return RichTextProcessor.wrapPlainText(message.message);
+        return RichTextProcessor.wrapPlainText(unsafeMessage);
       } else {
-        element.innerHTML = RichTextProcessor.wrapRichText((action as MessageAction.messageActionCustomAction).message, {noLinebreaks: true});
+        element.innerHTML = RichTextProcessor.wrapRichText(unsafeMessage, {noLinebreaks: true});
         return element;
       }
     } else {
@@ -2912,7 +2925,7 @@ export class AppMessagesManager {
         }
 
         case 'messageActionInviteToGroupCall': {
-          const peerIds = [message.fromId, action.users[0]];
+          const peerIds = [message.fromId, action.users[0].toPeerId()];
           let a = 'ActionGroupCall';
           const myId = appUsersManager.getSelf().id;
           if(peerIds[0] === myId) a += 'You';
@@ -2942,7 +2955,7 @@ export class AppMessagesManager {
             args.push(getNameDivHTML(message.fromId, plain));
           }
 
-          let k: LangPackKey, _args: any[] = [];
+          let k: LangPackKey, _args: FormatterArguments = [];
           if(daysToStart < 1 && date.getDate() === today.getDate()) {
             k = 'TodayAtFormattedWithToday';
           } else if(daysToStart < 2 && date.getDate() === tomorrowDate.getDate()) {

src/lib/appManagers/appProfileManager.ts

@@ -12,7 +12,7 @@
 import { MOUNT_CLASS_TO } from "../../config/debug";
 import { tsNow } from "../../helpers/date";
 import { numberThousandSplitter } from "../../helpers/number";
-import { ChannelParticipantsFilter, ChannelsChannelParticipants, Chat, ChatFull, ChatParticipants, ChatPhoto, ExportedChatInvite, InputChannel, InputFile, InputFileLocation, PhotoSize, SendMessageAction, Update, UserFull, UserProfilePhoto } from "../../layer";
+import { ChannelParticipantsFilter, ChannelsChannelParticipants, ChannelParticipant, Chat, ChatFull, ChatParticipants, ChatPhoto, ExportedChatInvite, InputChannel, InputFile, InputFileLocation, PhotoSize, SendMessageAction, Update, UserFull, UserProfilePhoto } from "../../layer";
 import { LangPackKey, i18n } from "../langPack";
 //import apiManager from '../mtproto/apiManager';
 import apiManager from '../mtproto/mtprotoworker';
@@ -34,9 +34,6 @@ export class AppProfileManager {
   public usersFull: {[id: UserId]: UserFull.userFull} = {};
   public chatsFull: {[id: ChatId]: ChatFull} = {};
   private fullPromises: {[peerId: PeerId]: Promise<ChatFull.chatFull | ChatFull.channelFull | UserFull>} = {};
-
-  private megagroupOnlines: {[id: ChatId]: {timestamp: number, onlines: number}};
-
   private typingsInPeer: {[peerId: PeerId]: UserTyping[]};
 
   constructor() {
@@ -129,7 +126,6 @@ export class AppProfileManager {
       this.invalidateChannelParticipants(chatId);
     });
 
-    this.megagroupOnlines = {};
     this.typingsInPeer = {};
   }
 
@@ -404,7 +400,7 @@ export class AppProfileManager {
           break;
       }
 
-      return Promise.reject(error);
+      throw error;
     }) as any;
   }
 
@@ -461,7 +457,7 @@ export class AppProfileManager {
 
   public invalidateChannelParticipants(id: ChatId) {
     delete this.chatsFull[id];
-    delete this.fullPromises[-id];
+    delete this.fullPromises[id.toPeerId(true)];
     apiManager.clearCache('channels.getParticipants', (params) => (params.channel as InputChannel.inputChannel).channel_id === id);
     rootScope.dispatchEvent('chat_full_update', id);
   }
@@ -494,7 +490,7 @@ export class AppProfileManager {
         _: 'updateUserPhoto',
         user_id: myId,
         date: tsNow(true),
-        photo: appUsersManager.getUser(myId).photo,
+        photo: appUsersManager.getUser(myId.toUserId()).photo,
         previous: true
       });
     });
@@ -536,42 +532,43 @@ export class AppProfileManager {
     return i18n(key, [numberThousandSplitter(count)]);
   }
 
-  public async getOnlines(id: ChatId): Promise<number> {
+  private verifyParticipantForOnlineCount(participant: {user_id: UserId}) {
-    if(appChatsManager.isMegagroup(id)) {
+    const user = appUsersManager.getUser(participant.user_id);
-      const timestamp = Date.now() / 1000 | 0;
+    return !!(user && user.status && user.status._ === 'userStatusOnline');
-      const cached = this.megagroupOnlines[id] ?? (this.megagroupOnlines[id] = {timestamp: 0, onlines: 1});
-      if((timestamp - cached.timestamp) < 60) {
-        return cached.onlines;
   }
 
-      const res = await apiManager.invokeApi('messages.getOnlines', {
+  private reduceParticipantsForOnlineCount(participants: {user_id: UserId}[]) {
-        peer: appChatsManager.getChannelInputPeer(id)
+    return participants.reduce((acc, participant) => {
-      });
+      return acc + +this.verifyParticipantForOnlineCount(participant);
+    }, 0);
+  }
 
-      const onlines = res.onlines ?? 1;
+  public async getOnlines(id: ChatId): Promise<number> {
-      cached.timestamp = timestamp;
+    const minOnline = 1;
-      cached.onlines = onlines;
+    if(appChatsManager.isBroadcast(id)) {
-
+      return minOnline;
-      return onlines;
-    } else if(appChatsManager.isBroadcast(id)) {
-      return 1;
     }
     
     const chatInfo = await this.getChatFull(id);
-    const _participants = (chatInfo as ChatFull.chatFull).participants as ChatParticipants.chatParticipants;
+    if(appChatsManager.isMegagroup(id)) {
-    if(_participants && _participants.participants) {
+      if((chatInfo as ChatFull.channelFull).participants_count <= 100) {
-      const participants = _participants.participants;
+        const channelParticipants = await this.getChannelParticipants(id, {_: 'channelParticipantsRecent'}, 100);
-
+        return this.reduceParticipantsForOnlineCount(channelParticipants.participants as ChannelParticipant.channelParticipant[]);
-      return participants.reduce((acc: number, participant) => {
-        const user = appUsersManager.getUser(participant.user_id);
-        if(user && user.status && user.status._ === 'userStatusOnline') {
-          return acc + 1;
       }
 
-        return acc;
+      const res = await apiManager.invokeApiCacheable('messages.getOnlines', {
-      }, 0);
+        peer: appChatsManager.getChannelInputPeer(id)
+      }, {cacheSeconds: 60});
+
+      const onlines = res.onlines ?? minOnline;
+      return onlines;
+    }
+
+    const _participants = (chatInfo as ChatFull.chatFull).participants as ChatParticipants.chatParticipants;
+    if(_participants?.participants) {
+      return this.reduceParticipantsForOnlineCount(_participants.participants);
     } else {
-      return 1;
+      return minOnline;
     }
   }
 

src/lib/appManagers/appUsersManager.ts

@@ -360,6 +360,8 @@ export class AppUsersManager {
   }
 
   public saveApiUsers(apiUsers: MTUser[], override?: boolean) {
+    if((apiUsers as any).saved) return;
+    (apiUsers as any).saved = true;
     apiUsers.forEach((user) => this.saveApiUser(user, override));
   }
 
@@ -691,7 +693,6 @@ export class AppUsersManager {
     if(user.status &&
       user.status._ === 'userStatusOnline' &&
       user.status.expires < timestampNow) {
-
       user.status = {_: 'userStatusOffline', was_online: user.status.expires};
       rootScope.dispatchEvent('user_update', user.id);
 
@@ -902,17 +903,19 @@ export class AppUsersManager {
 
     const user = this.users[userId];
     if(user) {
-      const status: any = offline ? {
+      const status: UserStatus = offline ? {
         _: 'userStatusOffline',
         was_online: tsNow(true)
       } : {
         _: 'userStatusOnline',
-        expires: tsNow(true) + 500
+        expires: tsNow(true) + 50
       };
 
       user.status = status;
       //user.sortStatus = this.getUserStatusForSort(user.status);
       rootScope.dispatchEvent('user_update', userId);
+
+      this.setUserToStateIfNeeded(user);
     }
   }