Skip to content

refactor(server): optimize addAllUserToRoom cursor iteration #39476

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

Open
Harxhit wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

refactor(server): optimize addAllUserToRoom cursor iteration #39476

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2814a81
refactor(server): optimize addAllUserToRoom cursor iteration
Harxhit Mar 9, 2026
637e338
Merge branch 'develop' into optimize-add-all-users-room
Harxhit Mar 9, 2026
fff88fb
refactor(server): use single cursor pass in addAllUserToRoom to avoid…
Harxhit Mar 9, 2026
a8ee26f
style(server): consolidate IUser import
Harxhit Mar 9, 2026
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
33 changes: 21 additions & 12 deletions apps/meteor/server/methods/addAllUserToRoom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Message } from '@rocket.chat/core-services';
import type { IRoom } from '@rocket.chat/core-typings';
import type { IRoom, IUser } from '@rocket.chat/core-typings';
import type { ServerMethods } from '@rocket.chat/ddp-client';
import { Subscriptions, Rooms, Users } from '@rocket.chat/models';
import { check } from 'meteor/check';
Expand Down Expand Up @@ -36,30 +36,39 @@ export const addAllUserToRoomFn = async (userId: string, rid: IRoom['_id'], acti
if (activeUsersOnly === true) {
userFilter.active = true;
}

const users = await Users.find(userFilter).toArray();
if (users.length > settings.get<number>('API_User_Limit')) {
throw new Meteor.Error('error-user-limit-exceeded', 'User Limit Exceeded', {
const room = await Rooms.findOneById(rid);
if (!room) {
throw new Meteor.Error('error-invalid-room', 'Invalid room', {
method: 'addAllToRoom',
});
}

const room = await Rooms.findOneById(rid);
if (!room) {
throw new Meteor.Error('error-invalid-room', 'Invalid room', {
const count = await Users.countDocuments(userFilter);
if (count > settings.get<number>('API_User_Limit')) {
throw new Meteor.Error('error-user-limit-exceeded', 'User Limit Exceeded', {
method: 'addAllToRoom',
});
}
const usersCursor = Users.find(userFilter).batchSize(100)

const collectedUsers: IUser[] = [];
const usernames: string[] = [];
for await(const user of usersCursor){
collectedUsers.push(user);
if(user.username){
usernames.push(user.username)
}
}
await beforeAddUserToRoom(
users.map((u) => u.username!),
room,
usernames,
room
);

const now = new Date();
for await (const user of users) {
for (const user of collectedUsers) {
const subscription = await Subscriptions.findOneByRoomIdAndUserId(rid, user._id);
if (subscription != null) {
if (subscription) {
continue;
}
await callbacks.run('beforeJoinRoom', user, room);
Expand Down