Skip to content

chore: Replace non-reactive collection usage with a Map #35598

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

Merged
kodiakhq merged 1 commit into from
Mar 25, 2025
Merged

chore: Replace non-reactive collection usage with a Map #35598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions apps/meteor/app/ui-message/client/popup/messagePopupConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Meteor } from 'meteor/meteor';
import { Mongo } from 'meteor/mongo';
import { Tracker } from 'meteor/tracker';

import { RoomManager } from '../../../../client/lib/RoomManager';
import { asReactiveSource } from '../../../../client/lib/tracker';
import { Messages } from '../../../models/client';

export const usersFromRoomMessages = new Mongo.Collection<{
type UserFromRoomMessage = {
_id: string;
username: string;
name: string | undefined;
ts: Date;
suggestion?: boolean;
}>(null);
};

export const usersFromRoomMessages = new Map<UserFromRoomMessage['_id'], UserFromRoomMessage>();

Meteor.startup(() => {
Tracker.autorun(() => {
Expand All @@ -27,7 +28,7 @@ Meteor.startup(() => {
return;
}

usersFromRoomMessages.remove({});
usersFromRoomMessages.clear();

const uniqueMessageUsersControl: Record<string, boolean> = {};

Expand All @@ -53,13 +54,13 @@ Meteor.startup(() => {
uniqueMessageUsersControl[username] = true;
return notMapped;
})
.forEach(({ u: { username, name, _id }, ts }) =>
usersFromRoomMessages.upsert(_id, {
.forEach(({ u: { username, name, _id }, ts }) => {
usersFromRoomMessages.set(_id, {
_id,
username,
name,
ts,
}),
);
});
});
});
});
36 changes: 8 additions & 28 deletions apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,10 @@ const ComposerPopupProvider = ({ children, room }: ComposerPopupProviderProps) =
const filterRegex = filter && new RegExp(escapeRegExp(filter), 'i');
const items: ComposerBoxPopupUserProps[] = [];

const users = usersFromRoomMessages
.find(
{
ts: { $exists: true },
...(filter && {
$or: [{ username: filterRegex }, { name: filterRegex }],
}),
},
{
limit: suggestionsCount ?? 5,
sort: { ts: -1 },
},
)
.fetch()
const users = Array.from(usersFromRoomMessages.values())
.filter((u) => !!u.ts && (filterRegex ? u.username.match(filterRegex) || u.name?.match(filterRegex) : true))
.sort((a, b) => b.ts.getTime() - a.ts.getTime())
.slice(0, suggestionsCount ?? 5)
.map((u) => {
u.suggestion = true;
return u;
Expand Down Expand Up @@ -106,20 +96,10 @@ const ComposerPopupProvider = ({ children, room }: ComposerPopupProviderProps) =
},
getItemsFromServer: async (filter: string) => {
const filterRegex = filter && new RegExp(escapeRegExp(filter), 'i');
const usernames = usersFromRoomMessages
.find(
{
ts: { $exists: true },
...(filter && {
$or: [{ username: filterRegex }, { name: filterRegex }],
}),
},
{
limit: suggestionsCount ?? 5,
sort: { ts: -1 },
},
)
.fetch()
const usernames = Array.from(usersFromRoomMessages.values())
.filter((u) => !!u.ts && (filterRegex ? u.username.match(filterRegex) || u.name?.match(filterRegex) : true))
.sort((a, b) => b.ts.getTime() - a.ts.getTime())
.slice(0, suggestionsCount ?? 5)
.map((u) => {
return u.username;
});
Expand Down
Loading