fix: dm

ggazzo · ggazzo · commit ce2a25470100 · 2025-09-23T00:44:28.000-03:00
diff --git a/apps/meteor/app/discussion/server/hooks/propagateDiscussionMetadata.ts b/apps/meteor/app/discussion/server/hooks/propagateDiscussionMetadata.ts
@@ -48,7 +48,7 @@ callbacks.add(
 
 callbacks.add(
 	'afterDeleteMessage',
-	async (message, { _id, prid }) => {
+	async (message, { room: { _id, prid } }) => {
 		if (prid) {
 			const room = await Rooms.findOneById(_id, {
 				projection: {
diff --git a/apps/meteor/app/lib/server/functions/createDirectRoom.ts b/apps/meteor/app/lib/server/functions/createDirectRoom.ts
@@ -46,6 +46,7 @@ export async function createDirectRoom(
 	options: {
 		creator?: string;
 		subscriptionExtra?: ISubscriptionExtraData;
+		federatedRoomId?: string;
 	},
 ): Promise<ICreatedRoom> {
 	const maxUsers = settings.get<number>('DirectMesssage_maxUsers') || 1;
@@ -179,7 +180,11 @@ export async function createDirectRoom(
 	if (isNewRoom) {
 		const insertedRoom = await Rooms.findOneById(rid);
 
-		await callbacks.run('afterCreateDirectRoom', insertedRoom, { members: roomMembers, creatorId: options?.creator });
+		await callbacks.run('afterCreateDirectRoom', insertedRoom, {
+			members: roomMembers,
+			creatorId: options?.creator,
+			mrid: options?.federatedRoomId,
+		});
 
 		void Apps.self?.triggerEvent(AppEvents.IPostRoomCreate, insertedRoom);
 	}
diff --git a/apps/meteor/app/lib/server/methods/sendMessage.ts b/apps/meteor/app/lib/server/methods/sendMessage.ts
@@ -55,13 +55,7 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 		}
 	}
 
-	const user = await Users.findOneById(uid, {
-		projection: {
-			username: 1,
-			type: 1,
-			name: 1,
-		},
-	});
+	const user = await Users.findOneById(uid);
 	if (!user?.username) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user');
 	}
diff --git a/apps/meteor/ee/server/hooks/federation/index.ts b/apps/meteor/ee/server/hooks/federation/index.ts
@@ -38,10 +38,6 @@ callbacks.add(
 			return;
 		}
 
-		if (!isUserNativeFederated(user)) {
-			return;
-		}
-
 		try {
 			// TODO: Check if message already exists in the database, if it does, don't send it to the federation to avoid loops
 			// If message is federated, it will save external_message_id like into the message object
@@ -221,7 +217,14 @@ callbacks.add(
 
 callbacks.add(
 	'afterCreateDirectRoom',
-	async (room: IRoom, params: { members: IUser[]; creatorId: IUser['_id'] }): Promise<void> => {
+	async (room: IRoom, params: { members: IUser[]; creatorId: IUser['_id']; mrid?: string }): Promise<void> => {
+		if (params.mrid) {
+			await Rooms.setAsFederated(room._id, {
+				mrid: params.mrid,
+				origin: params.mrid.split(':').pop()!,
+			});
+			return;
+		}
 		if (FederationActions.shouldPerformFederationAction(room)) {
 			await FederationMatrix.createDirectMessageRoom(room, params.members, params.creatorId);
 		}
diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
@@ -64,7 +64,7 @@ interface EventLikeCallbackSignatures {
 		user: AtLeast<IUser, '_id' | 'federated' | 'roles'>;
 		inviter: AtLeast<IUser, '_id' | 'username'>;
 	}) => void;
-	'afterCreateDirectRoom': (params: IRoom, second: { members: IUser[]; creatorId: IUser['_id'] }) => void;
+	'afterCreateDirectRoom': (params: IRoom, second: { members: IUser[]; creatorId: IUser['_id']; mrid?: string }) => void;
 	'beforeDeleteRoom': (params: IRoom) => void;
 	'beforeJoinDefaultChannels': (user: IUser) => void;
 	'beforeCreateChannel': (owner: IUser, room: IRoom) => void;

Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,7 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- const user = await Users.findOneById(uid, {`
`59`		`- projection: {`
`60`		`- username: 1,`
`61`		`- type: 1,`
`62`		`- name: 1,`
`63`		`- },`
`64`		`- });`
	`58`	`+ const user = await Users.findOneById(uid);`
`65`	`59`	`if (!user?.username) {`
`66`	`60`	`throw new Meteor.Error('error-invalid-user', 'Invalid user');`
`67`	`61`	`}`