verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate users during mention (#5233)

This commit is contained in:
Reinaldo Neto 2023-09-26 15:47:12 -03:00 committed by GitHub
parent 9fa29047dd
commit 987778b737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/lib/methods/search.ts
View File

@ -107,12 +107,18 @@ export const search = async ({ text = '', filterUsers = true, filterRooms = true
}
let localSearchData = [];
// the users provided by localSearchUsersMessageByRid return the username properly, data.username
// Example: Diego Mello's user -> {name: "Diego Mello", username: "diego.mello"}
// Meanwhile, the username provided by localSearchSubscription is in name's property
// Example: Diego Mello's subscription -> {fname: "Diego Mello", name: "diego.mello"}
let usernames = [];
if (rid) {
localSearchData = await localSearchUsersMessageByRid({ text, rid });
usernames = localSearchData.map(sub => sub.username as string);
} else {
localSearchData = await localSearchSubscription({ text, filterUsers, filterRooms });
usernames = localSearchData.map(sub => sub.name as string);
}
const usernames = localSearchData.map(sub => sub.name as string);
const data: TSearch[] = localSearchData;
@ -126,7 +132,13 @@ export const search = async ({ text = '', filterUsers = true, filterRooms = true
if (filterUsers) {
users
.filter((item1, index) => users.findIndex(item2 => item2._id === item1._id) === index) // Remove duplicated data from response
.filter(user => !data.some(sub => user.username === sub.name)) // Make sure to remove users already on local database
.filter(
user =>
!data.some(sub =>
// Check comments at usernames' declaration
rid && 'username' in sub ? user.username === sub.username : user.username === sub.name
)
) // Make sure to remove users already on local database
.forEach(user => {
data.push({
...user,