Skip to content

Commit feb682a

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

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,14 @@ 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-
}
241+
const federatedRoom = await Rooms.findOneById(room._id);
245242

246-
// We are not generating bridged users for members outside of the current workspace
247-
// They will be created when the invite is accepted
248-
249-
await this.homeserverServices.invite.inviteUserToRoom(userIdSchema.parse(member), matrixRoomResult.room_id, matrixUserId);
243+
if (federatedRoom && isRoomNativeFederated(federatedRoom)) {
244+
await this.inviteUsersToRoom(
245+
federatedRoom,
246+
members.filter((m) => m != owner.username),
247+
owner,
248+
);
250249
}
251250

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

0 commit comments

Comments
 (0)