requested changes

Signed-off-by: Abhinav Kumar <[email protected]>

Author: abhinavkrin

apps/meteor/app/api/server/v1/misc.ts

@@ -364,6 +364,7 @@ API.v1.addRoute(
 			const sortBy = sort ? Object.keys(sort)[0] : undefined;
 			const sortDirection = sort && Object.values(sort)[0] === 1 ? 'asc' : 'desc';
 
+			const user = await Users.findOneById(this.userId, { projection: { __rooms: 1 } });
 			const result = await browseChannelsMethod(
 				{
 					...filter,
@@ -372,7 +373,7 @@ API.v1.addRoute(
 					offset: Math.max(0, offset),
 					limit: Math.max(0, count),
 				},
-				this.user,
+				user,
 			);
 
 			if (!result) {

apps/meteor/server/methods/browseChannels.ts

@@ -1,5 +1,5 @@
 import { Team } from '@rocket.chat/core-services';
-import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Rooms, Users, Subscriptions } from '@rocket.chat/models';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
@@ -45,7 +45,7 @@ const sortUsers = (field: string, direction: 'asc' | 'desc'): Record<string, Sor
 };
 
 const getChannelsAndGroups = async (
-	user: IUser & { __rooms?: IRoom['_id'][] },
+	user: Pick<IUser, '_id' | '__rooms'>,
 	canViewAnon: boolean,
 	searchTerm: string,
 	sort: Record<string, number>,
@@ -119,7 +119,7 @@ const getChannelsCountForTeam = mem((teamId) => Rooms.countByTeamId(teamId), {
 });
 
 const getTeams = async (
-	user: IUser,
+	user: Pick<IUser, '_id' | '__rooms'>,
 	searchTerm: string,
 	sort: Record<string, number>,
 	pagination: {
@@ -247,7 +247,7 @@ const findUsers = async ({
 };
 
 const getUsers = async (
-	user: IUser | undefined,
+	user: Pick<IUser, '_id' | '__rooms'> | undefined,
 	text: string,
 	workspace: string,
 	sort: Record<string, SortDirection>,
@@ -299,7 +299,7 @@ export const browseChannelsMethod = async (
 		offset = 0,
 		limit = 10,
 	}: BrowseChannelsParams,
-	user: IUser | undefined | null,
+	user: Pick<IUser, '_id' | '__rooms'> | undefined | null,
 ) => {
 	const searchTerm = trim(escapeRegExp(text));
 
@@ -333,8 +333,6 @@ export const browseChannelsMethod = async (
 		return;
 	}
 
-	user.__rooms = user.__rooms ?? (await Users.findOneById(user._id, { projection: { __rooms: 1 } }))?.__rooms ?? [];
-
 	switch (type) {
 		case 'channels':
 			return getChannelsAndGroups(user, canViewAnonymous, searchTerm, sortChannels(sortBy, sortDirection), pagination);