Skip to content

fix(federation): can't add local and remote users together via room creation modal #37208

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
ggazzo merged 1 commit into from
Oct 11, 2025
Merged

fix(federation): can't add local and remote users together via room creation modal #37208

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
15 changes: 7 additions & 8 deletions ee/packages/federation-matrix/src/FederationMatrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,14 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS

await Rooms.setAsFederated(room._id, { mrid: matrixRoomResult.room_id, origin: this.serverName });

for await (const member of members) {
if (member === owner.username) {
continue;
}
const federatedRoom = await Rooms.findOneById(room._id);

// We are not generating bridged users for members outside of the current workspace
// They will be created when the invite is accepted

await this.homeserverServices.invite.inviteUserToRoom(userIdSchema.parse(member), matrixRoomResult.room_id, matrixUserId);
if (federatedRoom && isRoomNativeFederated(federatedRoom)) {
await this.inviteUsersToRoom(
federatedRoom,
members.filter((m) => m !== owner.username),
owner,
);
}

this.logger.debug('Room creation completed successfully', room._id);
Expand Down
Loading