feat: DMs #36762
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -230,11 +230,164 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS | |
|
|
||
| this.logger.debug('Room creation completed successfully', room._id); | ||
| } catch (error) { | ||
| console.log(error); | ||
| this.logger.error('Failed to create room:', error); | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| async ensureFederatedUsersExistLocally(members: (IUser | string)[]): Promise<void> { | ||
| try { | ||
| this.logger.debug('Ensuring federated users exist locally before DM creation', { memberCount: members.length }); | ||
|
|
||
| for await (const member of members) { | ||
| let username: string; | ||
|
|
||
| if (typeof member === 'string') { | ||
| username = member; | ||
| } else { | ||
| username = member.username as string; | ||
| } | ||
|
|
||
| if (!username.includes(':') && !username.includes('@')) { | ||
| continue; | ||
| } | ||
|
|
||
| const externalUserId = username.includes(':') ? `@${username}` : `@${username}:${this.serverName}`; | ||
|
|
||
| const existingUser = await Users.findOneByUsername(username); | ||
| if (existingUser) { | ||
| const existingBridge = await MatrixBridgedUser.getExternalUserIdByLocalUserId(existingUser._id); | ||
| if (!existingBridge) { | ||
| const remoteDomain = externalUserId.split(':')[1] || this.serverName; | ||
| await MatrixBridgedUser.createOrUpdateByLocalId(existingUser._id, externalUserId, true, remoteDomain); | ||
| } | ||
| continue; | ||
| } | ||
|
|
||
| this.logger.debug('Creating federated user locally', { externalUserId, username }); | ||
|
|
||
| const remoteDomain = externalUserId.split(':')[1] || this.serverName; | ||
| const localName = username.split(':')[0]?.replace('@', '') || username; | ||
|
|
||
| const newUser = { | ||
| username, | ||
| name: localName, | ||
| type: 'user' as const, | ||
| status: UserStatus.OFFLINE, | ||
| active: true, | ||
| roles: ['user'], | ||
| requirePasswordChange: false, | ||
| federated: true, | ||
| createdAt: new Date(), | ||
| _updatedAt: new Date(), | ||
| }; | ||
|
|
||
| const { insertedId } = await Users.insertOne(newUser); | ||
| await MatrixBridgedUser.createOrUpdateByLocalId(insertedId, externalUserId, true, remoteDomain); | ||
|
|
||
| this.logger.debug('Successfully created federated user locally', { userId: insertedId, externalUserId }); | ||
| } | ||
| } catch (error) { | ||
| this.logger.error('Failed to ensure federated users exist locally:', error); | ||
| } | ||
| } | ||
|
|
||
| async createDirectMessageRoom(room: IRoom, members: (IUser | string)[], creatorId: IUser['_id']): Promise<void> { | ||
| try { | ||
| this.logger.debug('Creating direct message room in Matrix', { roomId: room._id, memberCount: members.length }); | ||
|
|
||
| if (!this.homeserverServices) { | ||
| this.logger.warn('Homeserver services not available, skipping DM room creation'); | ||
| return; | ||
| } | ||
|
|
||
| const creator = await Users.findOneById(creatorId); | ||
| if (!creator) { | ||
| throw new Error('Creator not found in members list'); | ||
| } | ||
|
|
||
| const matrixUserId = `@${creator.username}:${this.serverName}`; | ||
| const existingMatrixUserId = await MatrixBridgedUser.getExternalUserIdByLocalUserId(creator._id); | ||
| if (!existingMatrixUserId) { | ||
| await MatrixBridgedUser.createOrUpdateByLocalId(creator._id, matrixUserId, true, this.serverName); | ||
| } | ||
|
|
||
| const actualMatrixUserId = existingMatrixUserId || matrixUserId; | ||
|
|
||
| let matrixRoomResult: { room_id: string; event_id?: string }; | ||
| if (members.length === 2) { | ||
| const otherMember = members.find((member) => { | ||
| if (typeof member === 'string') { | ||
| return true; // Remote user | ||
| } | ||
| return member._id !== creatorId; | ||
| }); | ||
| if (!otherMember) { | ||
| throw new Error('Other member not found for 1-on-1 DM'); | ||
| } | ||
| let otherMemberMatrixId: string; | ||
| if (typeof otherMember === 'string') { | ||
| otherMemberMatrixId = otherMember.startsWith('@') ? otherMember : `@${otherMember}`; | ||
| } else if (otherMember.username?.includes(':')) { | ||
| otherMemberMatrixId = otherMember.username.startsWith('@') ? otherMember.username : `@${otherMember.username}`; | ||
| } else { | ||
| otherMemberMatrixId = `@${otherMember.username}:${this.serverName}`; | ||
| } | ||
| const roomId = await this.homeserverServices.room.createDirectMessageRoom(actualMatrixUserId, otherMemberMatrixId); | ||
| matrixRoomResult = { room_id: roomId }; | ||
| } else { | ||
| // 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(actualMatrixUserId, roomName, 'invite'); | ||
| } | ||
|
|
||
| const mapping = await MatrixBridgedRoom.getLocalRoomId(matrixRoomResult.room_id); | ||
| if (!mapping) { | ||
| await MatrixBridgedRoom.createOrUpdateByLocalRoomId(room._id, matrixRoomResult.room_id, this.serverName); | ||
| } | ||
|
|
||
| for await (const member of members) { | ||
| if (typeof member !== 'string' && member._id === creatorId) continue; | ||
|
|
||
| try { | ||
| let memberMatrixUserId: string; | ||
| let memberId: string | undefined; | ||
|
|
||
| if (typeof member === 'string') { | ||
| memberMatrixUserId = member.startsWith('@') ? member : `@${member}`; | ||
| memberId = undefined; | ||
| } else if (member.username?.includes(':')) { | ||
| memberMatrixUserId = member.username.startsWith('@') ? member.username : `@${member.username}`; | ||
| memberId = member._id; | ||
| } else { | ||
| memberMatrixUserId = `@${member.username}:${this.serverName}`; | ||
| memberId = member._id; | ||
| } | ||
|
|
||
| if (memberId) { | ||
| const existingMemberMatrixUserId = await MatrixBridgedUser.getExternalUserIdByLocalUserId(memberId); | ||
|
|
||
| if (!existingMemberMatrixUserId) { | ||
| await MatrixBridgedUser.createOrUpdateByLocalId(memberId, memberMatrixUserId, true, this.serverName); | ||
| } | ||
| } | ||
|
|
||
| if (members.length > 2) { | ||
| await this.homeserverServices.invite.inviteUserToRoom(memberMatrixUserId, matrixRoomResult.room_id, actualMatrixUserId); | ||
| } | ||
| } catch (error) { | ||
| this.logger.error('Error creating or updating bridged user for DM:', error); | ||
| } | ||
| } | ||
| await Rooms.setAsFederated(room._id); | ||
| this.logger.debug('Direct message room creation completed successfully', room._id); | ||
| } catch (error) { | ||
| this.logger.error('Failed to create direct message room:', error); | ||
| throw error; | ||
| } | ||
| } | ||
|
Comment on lines
+296
to
+389
Contributor
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainVerify Matrix user ID format handling in DM creation. The method constructs Matrix user IDs differently for local vs. federated users, but doesn't validate the format consistently. Let's verify the Matrix ID format handling across the codebase: 🏁 Script executed: #!/bin/bash
# Check how Matrix user IDs are constructed elsewhere
rg -n "startsWith\('@'\)" ee/packages/federation-matrix/src/ -A 2 -B 2
# Check for any existing validation of Matrix ID format
rg -n "@.*:.*" ee/packages/federation-matrix/src/ --type ts | grep -E "(validate|check|verify)"
# Look for other instances of Matrix ID construction
ast-grep --pattern 'username.startsWith("@") ? username : `@${username}`'Length of output: 1638 Normalize and validate Matrix user IDs before use
|
||
|
|
||
| async sendMessage(message: IMessage, room: IRoom, user: IUser): Promise<void> { | ||
| try { | ||
| const matrixRoomId = await MatrixBridgedRoom.getExternalRoomId(room._id); | ||
|
|
@@ -260,7 +413,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS | |
| const parsedMessage = await toExternalMessageFormat({ | ||
| message: message.msg, | ||
| externalRoomId: matrixRoomId, | ||
| homeServerDomain: this.serverName, | ||
| }); | ||
| if (!message.tmid) { | ||
| if (message.attachments?.some((attachment) => isQuoteAttachment(attachment) && Boolean(attachment.message_link))) { | ||
|
|
@@ -370,7 +523,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS | |
| return; | ||
| } | ||
| const messageToReplyTo = await Messages.findOneById(messageToReplyToId); | ||
| if (!messageToReplyTo?.federation?.eventId) { | ||
| return; | ||
| } | ||
|
|
||
|
|
@@ -679,7 +832,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS | |
| const parsedMessage = await toExternalMessageFormat({ | ||
| message: newContent, | ||
| externalRoomId: matrixRoomId, | ||
| homeServerDomain: this.serverName, | ||
| }); | ||
| const eventId = await this.homeserverServices.message.updateMessage( | ||
| matrixRoomId, | ||
|
|
@@ -771,7 +924,6 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS | |
| } else if (role === 'moderator') { | ||
| powerLevel = 50; | ||
| } | ||
| await this.homeserverServices.room.setPowerLevelForUser(matrixRoomId, senderMatrixUserId, matrixUserId, powerLevel); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add input validation for federated users provisioning.
The method doesn't validate the input array or handle edge cases like empty members list.
Add validation at the beginning of the method:
async ensureFederatedUsersExistLocally(members: (IUser | string)[]): Promise<void> { try { + if (!members || members.length === 0) { + this.logger.debug('No members to provision'); + return; + } + this.logger.debug('Ensuring federated users exist locally before DM creation', { memberCount: members.length });📝 Committable suggestion
🤖 Prompt for AI Agents