Fix infinite loading of nearest albums

morethanwords · morethanwords · commit a7188f80d120 · 2025-08-07T14:03:04.000+04:00
diff --git a/src/lib/appManagers/appMessagesManager.ts b/src/lib/appManagers/appMessagesManager.ts
@@ -28,7 +28,7 @@ import {MyDocument} from './appDocsManager';
 import {MyPhoto} from './appPhotosManager';
 import DEBUG from '../../config/debug';
 import SlicedArray, {Slice, SliceEnd} from '../../helpers/slicedArray';
-import {FOLDER_ID_ALL, FOLDER_ID_ARCHIVE, GENERAL_TOPIC_ID, HIDDEN_PEER_ID, MUTE_UNTIL, NULL_PEER_ID, REAL_FOLDERS, REAL_FOLDER_ID, REPLIES_HIDDEN_CHANNEL_ID, REPLIES_PEER_ID, SERVICE_PEER_ID, TEST_NO_SAVED, THUMB_TYPE_FULL} from '../mtproto/mtproto_config';
+import {FOLDER_ID_ALL, FOLDER_ID_ARCHIVE, GENERAL_TOPIC_ID, HIDDEN_PEER_ID, MESSAGES_ALBUM_MAX_SIZE, MUTE_UNTIL, NULL_PEER_ID, REAL_FOLDERS, REAL_FOLDER_ID, REPLIES_HIDDEN_CHANNEL_ID, REPLIES_PEER_ID, SERVICE_PEER_ID, TEST_NO_SAVED, THUMB_TYPE_FULL} from '../mtproto/mtproto_config';
 import {getMiddleware} from '../../helpers/middleware';
 import assumeType from '../../helpers/assumeType';
 import copy from '../../helpers/object/copy';
@@ -7941,33 +7941,58 @@ export class AppMessagesManager extends AppManager {
       }
     }
 
-    // * load grouped missing messages
-    const firstMessage = messages[0] as Message.message;
-    const lastMessage = messages[messages.length - 1] as Message.message;
+    // * load grouped missing messages (only once per recursion)
+    if(!inputFilter && !recursion) {
+      const firstMessage = messages[0] as Message.message;
+      const lastMessage = messages[messages.length - 1] as Message.message;
 
-    if(!inputFilter && !isBottomEnd && firstMessage?.grouped_id) {
-      await this.getHistory({
-        ...options,
-        offsetId: firstMessage.mid,
-        limit: 20,
-        addOffset: -10
-      });
+      const fillMissingGroupedMessages = async(bottom: boolean) => {
+        if(!middleware()) {
+          return;
+        }
 
-      if(!middleware()) {
-        return;
-      }
-    }
+        const {
+          isEnd,
+          history,
+          messages = history.map((mid) => this.getMessageByPeer(peerId, mid))
+        } = await this.getHistory({
+          ...options,
+          offsetId: (bottom ? firstMessage : lastMessage).mid,
+          limit: (MESSAGES_ALBUM_MAX_SIZE + 1) * 2,
+          addOffset: -(MESSAGES_ALBUM_MAX_SIZE + 1)
+        });
 
-    if(!inputFilter && !isTopEnd && lastMessage?.grouped_id && lastMessage.grouped_id !== firstMessage?.grouped_id) {
-      await this.getHistory({
-        ...options,
-        offsetId: lastMessage.mid,
-        limit: 20,
-        addOffset: -10
-      });
+        if(!middleware()) {
+          return;
+        }
 
-      if(!middleware()) {
-        return;
+        // * erase unfilled grouped messages if they're last elements in their history slices
+        if(!isEnd[bottom ? 'bottom' : 'top']) {
+          if(!bottom) messages.reverse();
+          const messagesSlice = messages.slice(0, MESSAGES_ALBUM_MAX_SIZE) as Message.message[];
+          const groupedIds = messagesSlice.map((message) => message.grouped_id);
+          const slice = messagesSlice[0] && historyStorage.history.findSlice(messagesSlice[0].mid);
+          if(
+            groupedIds[0] &&
+            groupedIds[0] !== groupedIds[MESSAGES_ALBUM_MAX_SIZE - 1] &&
+            slice?.index === (bottom ? 0 : slice.slice.length - 1)
+          ) {
+            messagesSlice.forEach((message) => {
+              if(message.grouped_id === groupedIds[0]) {
+                historyStorage.history.delete(message.mid);
+              }
+            });
+          }
+        }
+      };
+
+
+      if(!isBottomEnd && firstMessage?.grouped_id) {
+        await fillMissingGroupedMessages(true);
+      }
+
+      if(!isTopEnd && lastMessage?.grouped_id && lastMessage.grouped_id !== firstMessage?.grouped_id) {
+        await fillMissingGroupedMessages(false);
       }
     }
     // * grouped end
diff --git a/src/lib/mtproto/mtproto_config.ts b/src/lib/mtproto/mtproto_config.ts
@@ -24,6 +24,7 @@ export const MAX_FILE_SAVE_SIZE = 20 * 1024 * 1024;
 export const THUMB_TYPE_FULL = '';
 export const TOPIC_COLORS = [0x6FB9F0, 0xFFD67E, 0xCB86DB, 0x8EEE98, 0xFF93B2, 0xFB6F5F];
 export const ATTACH_MENU_BOT_ICON_NAME = 'default_static';
+export const MESSAGES_ALBUM_MAX_SIZE = 10;
 export const MESSAGE_ID_OFFSET = 0x100000000;
 export const GENERAL_TOPIC_ID = MESSAGE_ID_OFFSET + 1;
 export const CAN_HIDE_TOPIC = false;
