From 007da552a46c0f7e72c6e63af9bd98bb41a8ba3b Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:11:36 +0200
Subject: [PATCH] Global Search: Include archive, fix pagination (#5013)

---
 src/api/gramjs/methods/messages.ts           |  2 --
 src/components/left/search/AudioResults.tsx  |  2 +-
 src/components/left/search/BotAppResults.tsx |  2 +-
 src/components/left/search/FileResults.tsx   |  2 +-
 src/components/left/search/LeftSearch.scss   |  1 +
 src/components/left/search/LinkResults.tsx   |  2 +-
 src/components/left/search/MediaResults.tsx  |  2 +-
 src/global/actions/api/globalSearch.ts       | 16 ++++++++--------
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/api/gramjs/methods/messages.ts b/src/api/gramjs/methods/messages.ts
index d1f2ea2b8..e1f93eae8 100644
--- a/src/api/gramjs/methods/messages.ts
+++ b/src/api/gramjs/methods/messages.ts
@@ -29,7 +29,6 @@ import type {
 import { MAIN_THREAD_ID, MESSAGE_DELETED } from '../../types';
 
 import {
-  ALL_FOLDER_ID,
   API_GENERAL_ID_LIMIT,
   DEBUG,
   GIF_MIME_TYPE,
@@ -1253,7 +1252,6 @@ export async function searchMessagesGlobal({
     broadcastsOnly: type === 'channels' || undefined,
     limit,
     filter,
-    folderId: ALL_FOLDER_ID,
     minDate,
     maxDate,
   }));
diff --git a/src/components/left/search/AudioResults.tsx b/src/components/left/search/AudioResults.tsx
index 26e08dad5..3debf1efd 100644
--- a/src/components/left/search/AudioResults.tsx
+++ b/src/components/left/search/AudioResults.tsx
@@ -127,7 +127,7 @@ const AudioResults: FC<OwnProps & StateProps> = ({
     <div className="LeftSearch--content">
       <InfiniteScroll
         className="search-content documents-list custom-scroll"
-        items={foundMessages}
+        items={canRenderContents ? foundMessages : undefined}
         onLoadMore={handleLoadMore}
         noFastList
       >
diff --git a/src/components/left/search/BotAppResults.tsx b/src/components/left/search/BotAppResults.tsx
index dc62b8666..00ac59f65 100644
--- a/src/components/left/search/BotAppResults.tsx
+++ b/src/components/left/search/BotAppResults.tsx
@@ -87,7 +87,7 @@ const BotAppResults: FC<OwnProps & StateProps> = ({
     <div ref={containerRef} className="LeftSearch--content">
       <InfiniteScroll
         className="search-content custom-scroll"
-        items={filteredFoundIds}
+        items={canRenderContents ? filteredFoundIds : undefined}
         onLoadMore={handleLoadMore}
         noFastList
       >
diff --git a/src/components/left/search/FileResults.tsx b/src/components/left/search/FileResults.tsx
index 664b29df6..302f95574 100644
--- a/src/components/left/search/FileResults.tsx
+++ b/src/components/left/search/FileResults.tsx
@@ -133,7 +133,7 @@ const FileResults: FC<OwnProps & StateProps> = ({
     <div ref={containerRef} className="LeftSearch--content">
       <InfiniteScroll
         className="search-content documents-list custom-scroll"
-        items={foundMessages}
+        items={canRenderContents ? foundMessages : undefined}
         onLoadMore={handleLoadMore}
         noFastList
       >
diff --git a/src/components/left/search/LeftSearch.scss b/src/components/left/search/LeftSearch.scss
index e23e4e3ff..790f6951f 100644
--- a/src/components/left/search/LeftSearch.scss
+++ b/src/components/left/search/LeftSearch.scss
@@ -18,6 +18,7 @@
   &--content {
     padding-top: 0.5rem;
     overflow-y: auto;
+    height: 100%;
   }
 
   &--media {
diff --git a/src/components/left/search/LinkResults.tsx b/src/components/left/search/LinkResults.tsx
index 8624b471c..9e085c689 100644
--- a/src/components/left/search/LinkResults.tsx
+++ b/src/components/left/search/LinkResults.tsx
@@ -126,7 +126,7 @@ const LinkResults: FC<OwnProps & StateProps> = ({
     <div ref={containerRef} className="LeftSearch--content">
       <InfiniteScroll
         className="search-content documents-list custom-scroll"
-        items={foundMessages}
+        items={canRenderContents ? foundMessages : undefined}
         onLoadMore={handleLoadMore}
         noFastList
       >
diff --git a/src/components/left/search/MediaResults.tsx b/src/components/left/search/MediaResults.tsx
index 514700cb4..ef44bc629 100644
--- a/src/components/left/search/MediaResults.tsx
+++ b/src/components/left/search/MediaResults.tsx
@@ -126,7 +126,7 @@ const MediaResults: FC<OwnProps & StateProps> = ({
     <div ref={containerRef} className="LeftSearch--content LeftSearch--media">
       <InfiniteScroll
         className={classNames}
-        items={foundMessages}
+        items={canRenderContents ? foundMessages : undefined}
         itemSelector={!searchQuery ? '.Media' : '.ListItem'}
         onLoadMore={handleLoadMore}
         noFastList
diff --git a/src/global/actions/api/globalSearch.ts b/src/global/actions/api/globalSearch.ts
index dd42ad896..4bc501c46 100644
--- a/src/global/actions/api/globalSearch.ts
+++ b/src/global/actions/api/globalSearch.ts
@@ -89,23 +89,23 @@ addActionHandler('searchMessagesGlobal', (global, actions, payload): ActionRetur
   const {
     query, resultsByType, chatId,
   } = selectTabState(global, tabId).globalSearch;
-  const offsetId = (resultsByType?.[type])?.nextOffsetId;
-  const offsetRate = (resultsByType?.[type])?.nextOffsetRate;
-  const offsetPeerId = (resultsByType?.[type])?.nextOffsetPeerId;
+  const {
+    totalCount, foundIds, nextOffsetId, nextOffsetPeerId, nextOffsetRate,
+  } = resultsByType?.[type] || {};
 
-  // Stop loading if we have all the messages
-  if (resultsByType?.[type]?.totalCount && resultsByType[type]!.totalCount! >= resultsByType[type]!.foundIds.length) {
+  // Stop loading if we have all the messages or server returned 0
+  if (totalCount !== undefined && (!totalCount || (foundIds && foundIds.length >= totalCount))) {
     return;
   }
 
   const chat = chatId ? selectChat(global, chatId) : undefined;
-  const offsetPeer = offsetPeerId ? selectChat(global, offsetPeerId) : undefined;
+  const offsetPeer = nextOffsetPeerId ? selectChat(global, nextOffsetPeerId) : undefined;
 
   searchMessagesGlobal(global, {
     query,
     type,
-    offsetRate,
-    offsetId,
+    offsetRate: nextOffsetRate,
+    offsetId: nextOffsetId,
     offsetPeer,
     chat,
     tabId,