From 3e23e299accd1bf7ddc4c5ed935e03669d9cdf07 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Fri, 1 Dec 2023 18:36:11 +0530 Subject: [PATCH 1/5] fix connected users search on spotlight --- apps/meteor/server/lib/spotlight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/server/lib/spotlight.js b/apps/meteor/server/lib/spotlight.js index 62fcdc3a66b40..bee5cc1a205e0 100644 --- a/apps/meteor/server/lib/spotlight.js +++ b/apps/meteor/server/lib/spotlight.js @@ -265,7 +265,7 @@ export class Spotlight { if (await this._searchOutsiderUsers(searchParams)) { return users; } - } else if (await this._searchConnectedUsers(userId, searchParams)) { + } else if (await this._searchConnectedUsers(userId, searchParams, 'd')) { return users; } From 962f7107aa82732d7a44892f84d9e939336ed569 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Fri, 1 Dec 2023 18:37:07 +0530 Subject: [PATCH 2/5] add cs --- .changeset/pretty-eyes-sleep.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/pretty-eyes-sleep.md diff --git a/.changeset/pretty-eyes-sleep.md b/.changeset/pretty-eyes-sleep.md new file mode 100644 index 0000000000000..6718a7c954146 --- /dev/null +++ b/.changeset/pretty-eyes-sleep.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fix connected users search on spotlight From eb66bf1838438adece28d365b63e9cdd96fd3eac Mon Sep 17 00:00:00 2001 From: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:31:44 -0300 Subject: [PATCH 3/5] Update changeset --- .changeset/pretty-eyes-sleep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/pretty-eyes-sleep.md b/.changeset/pretty-eyes-sleep.md index 6718a7c954146..04b276b18ff52 100644 --- a/.changeset/pretty-eyes-sleep.md +++ b/.changeset/pretty-eyes-sleep.md @@ -2,4 +2,4 @@ '@rocket.chat/meteor': patch --- -Fix connected users search on spotlight +Fixed issue searching connected users on spotlight From 569b618bb55d11eead91dd2a2f22d04742a4b05e Mon Sep 17 00:00:00 2001 From: guijun13 Date: Mon, 11 Dec 2023 14:49:48 -0300 Subject: [PATCH 4/5] fix view of users in room --- apps/meteor/server/lib/spotlight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/server/lib/spotlight.js b/apps/meteor/server/lib/spotlight.js index bee5cc1a205e0..0c5255046487f 100644 --- a/apps/meteor/server/lib/spotlight.js +++ b/apps/meteor/server/lib/spotlight.js @@ -237,7 +237,7 @@ export class Spotlight { } if (users.length === 0 && canListOutsiders) { - const exactMatch = await Users.findOneByUsernameIgnoringCase(text, { + const exactMatch = await Users.findOneByUsernameIgnoringCase(usernames, { projection: options.projection, readPreference: options.readPreference, }); From d9141fd092f912ba383faa03173375f566b8ec68 Mon Sep 17 00:00:00 2001 From: guijun13 Date: Wed, 13 Dec 2023 11:56:48 -0300 Subject: [PATCH 5/5] fix spotlight --- apps/meteor/server/lib/spotlight.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/meteor/server/lib/spotlight.js b/apps/meteor/server/lib/spotlight.js index 0c5255046487f..62218bd5928fc 100644 --- a/apps/meteor/server/lib/spotlight.js +++ b/apps/meteor/server/lib/spotlight.js @@ -236,8 +236,8 @@ export class Spotlight { } } - if (users.length === 0 && canListOutsiders) { - const exactMatch = await Users.findOneByUsernameIgnoringCase(usernames, { + if (users.length === 0 && canListOutsiders && text) { + const exactMatch = await Users.findOneByUsernameIgnoringCase(text, { projection: options.projection, readPreference: options.readPreference, });