Skip to content

fix(federation): DM creation sending invite twice #37222

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
Oct 14, 2025
Merged

fix(federation): DM creation sending invite twice #37222

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
33 changes: 17 additions & 16 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 @@ -314,27 +314,28 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
// For group DMs (more than 2 members), create a private room
const roomName = room.name || room.fname || `Group chat with ${members.length} members`;
matrixRoomResult = await this.homeserverServices.room.createRoom(userIdSchema.parse(actualMatrixUserId), roomName, 'invite');
}

for await (const member of members) {
if (member._id === creatorId) {
continue;
}
for await (const member of members) {
if (member._id === creatorId) {
continue;
}

if (!isUserNativeFederated(member)) {
continue;
}
if (!isUserNativeFederated(member)) {
continue;
}

try {
await this.homeserverServices.invite.inviteUserToRoom(
userIdSchema.parse(member.username),
roomIdSchema.parse(matrixRoomResult.room_id),
userIdSchema.parse(actualMatrixUserId),
);
} catch (error) {
this.logger.error('Error creating or updating bridged user for DM:', error);
try {
await this.homeserverServices.invite.inviteUserToRoom(
userIdSchema.parse(member.username),
roomIdSchema.parse(matrixRoomResult.room_id),
userIdSchema.parse(actualMatrixUserId),
);
} catch (error) {
this.logger.error('Error creating or updating bridged user for DM:', error);
}
}
}

await Rooms.setAsFederated(room._id, {
mrid: matrixRoomResult.room_id,
origin: this.serverName,
Expand Down
Loading