Skip to content

Commit 785f505

Browse files
committed
fix(federation): can't add local and remote users together via room creation modal
1 parent 4bd409d commit 785f505

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

ee/packages/federation-matrix/src/FederationMatrix.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,10 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
238238

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

241-
for await (const member of members) {
242-
if (member === owner.username) {
243-
continue;
244-
}
245-
246-
// We are not generating bridged users for members outside of the current workspace
247-
// They will be created when the invite is accepted
241+
const federatedRoom = await Rooms.findOneById(room._id);
248242

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

252247
this.logger.debug('Room creation completed successfully', room._id);

0 commit comments

Comments
 (0)