From 2e22fcfd20c66aabc50136106c11a293819cafce Mon Sep 17 00:00:00 2001
From: Jean <45966964+Jeanstaquet@users.noreply.github.com>
Date: Tue, 20 Apr 2021 05:40:58 -0700
Subject: [PATCH] [FIX] Allows more than 25 discussions/files to be loaded in
 the contextualbar (#21511)

---
 client/contexts/ServerContext/endpoints/v1/channels/files.ts   | 1 +
 .../views/room/contextualBar/Discussions/useDiscussionsList.ts | 2 +-
 .../views/room/contextualBar/RoomFiles/hooks/useFilesList.ts   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/contexts/ServerContext/endpoints/v1/channels/files.ts b/client/contexts/ServerContext/endpoints/v1/channels/files.ts
index 4b449aee5a1..c2dc3a3f16c 100644
--- a/client/contexts/ServerContext/endpoints/v1/channels/files.ts
+++ b/client/contexts/ServerContext/endpoints/v1/channels/files.ts
@@ -5,6 +5,7 @@ import { ObjectFromApi } from '../../../../../../definition/ObjectFromApi';
 export type FilesEndpoint = {
 	GET: (params: {
 		roomId: IRoom['_id'];
+		offset: number;
 		count: number;
 		sort: string;
 		query: string;
diff --git a/client/views/room/contextualBar/Discussions/useDiscussionsList.ts b/client/views/room/contextualBar/Discussions/useDiscussionsList.ts
index 6b7c2a10df7..9ce4ee857e3 100644
--- a/client/views/room/contextualBar/Discussions/useDiscussionsList.ts
+++ b/client/views/room/contextualBar/Discussions/useDiscussionsList.ts
@@ -31,7 +31,7 @@ export const useDiscussionsList = (
 				roomId: options.rid,
 				text: options.text,
 				offset: start,
-				count: end - start,
+				count: end,
 			});
 
 			return {
diff --git a/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts b/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
index c847fdfc57d..ff216f33435 100644
--- a/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
+++ b/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
@@ -40,7 +40,8 @@ export const useFilesList = (
 		async (start, end) => {
 			const { files, total } = await getFiles({
 				roomId: options.rid,
-				count: end - start,
+				offset: start,
+				count: end,
 				sort: JSON.stringify({ uploadedAt: -1 }),
 				query: JSON.stringify({
 					name: { $regex: options.text || '', $options: 'i' },