Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: connected users search on spotlight for user mentions #31134

Merged
merged 10 commits into from
Dec 15, 2023
Merged

fix: connected users search on spotlight for user mentions #31134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3e23e29
fix connected users search on spotlight
yash-rajpal Dec 1, 2023
962f710
add cs
yash-rajpal Dec 1, 2023
6bcc2bb
Merge branch 'develop' into fix/spotlight-outside-users
scuciatto Dec 1, 2023
eb66bf1
Update changeset
matheusbsilva137 Dec 4, 2023
034a789
Merge branch 'develop' into fix/spotlight-outside-users
matheusbsilva137 Dec 4, 2023
569b618
fix view of users in room
guijun13 Dec 11, 2023
275242d
Merge branch 'develop' into fix/spotlight-outside-users
guijun13 Dec 12, 2023
d9141fd
fix spotlight
guijun13 Dec 13, 2023
ec8070c
Merge branch 'develop' into fix/spotlight-outside-users
guijun13 Dec 13, 2023
1190a03
Merge branch 'develop' into fix/spotlight-outside-users
kodiakhq[bot] Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/pretty-eyes-sleep.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed issue searching connected users on spotlight
4 changes: 2 additions & 2 deletions apps/meteor/server/lib/spotlight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class Spotlight {
}
}

if (users.length === 0 && canListOutsiders) {
if (users.length === 0 && canListOutsiders && text) {
const exactMatch = await Users.findOneByUsernameIgnoringCase(text, {
projection: options.projection,
readPreference: options.readPreference,
Expand Down Expand Up @@ -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;
}

Expand Down
Loading