remove some federation code spread all around

Author: sampaiodiego

apps/meteor/app/lib/server/functions/createRoom.ts

@@ -156,7 +156,7 @@ export const createRoom = async <T extends RoomType>(
 		rid: string;
 	}
 > => {
-	const { teamId, ...optionalExtraData } = roomExtraData || ({} as IRoom);
+	const { teamId, ...extraData } = roomExtraData || ({} as IRoom);
 
 	// TODO: use a shared helper to check whether a user is federated
 	const hasFederatedMembers = members.some((member) => {
@@ -167,23 +167,12 @@ export const createRoom = async <T extends RoomType>(
 	});
 
 	// Prevent adding federated users to rooms that are not marked as federated explicitly
-	if (hasFederatedMembers && optionalExtraData.federated !== true) {
+	if (hasFederatedMembers && extraData.federated !== true) {
 		throw new Meteor.Error('error-federated-users-in-non-federated-rooms', 'Cannot add federated users to non-federated rooms', {
 			method: 'createRoom',
 		});
 	}
 
-	const extraData = {
-		...optionalExtraData,
-		...((hasFederatedMembers || optionalExtraData.federated) && {
-			federated: true,
-			federation: {
-				version: 1,
-				// TODO we should be able to provide all values from here, currently we update on callback afterCreateRoom
-			},
-		}),
-	};
-
 	await prepareCreateRoomCallback.run({
 		type,
 		// name,

apps/meteor/ee/server/hooks/federation/index.ts

@@ -252,17 +252,30 @@ callbacks.add(
 	'federation-matrix-before-create-direct-room',
 );
 
+callbacks.add('federation.beforeCreateDirectMessage', async (roomUsers) => {
+	// TODO: use a shared helper to check whether a user is federated
+	// since the DM creation API doesn't tell us if the room is federated (unlike normal channels),
+	// we're currently inferring it: if any participant has a Matrix-style ID (@user:server), we treat the DM as federated
+	const hasFederatedMembers = roomUsers.some((user: unknown) => typeof user === 'string' && user.includes(':') && user.includes('@'));
+
+	if (hasFederatedMembers) {
+		return {
+			federated: true,
+			federation: {
+				version: 1,
+			},
+		};
+	}
+});
+
 callbacks.add(
 	'afterCreateDirectRoom',
-	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()!,
-			});
+	async (room: IRoom, params: { members: IUser[]; creatorId: IUser['_id'] }): Promise<void> => {
+		if (!FederationActions.shouldPerformFederationAction(room)) {
 			return;
 		}
-		if (FederationActions.shouldPerformFederationAction(room)) {
+
+		if (!room.federation.mrid) {
 			await FederationMatrix.createDirectMessageRoom(room, params.members, params.creatorId);
 		}
 	},

apps/meteor/server/methods/createDirectMessage.ts

@@ -43,11 +43,6 @@ export async function createDirectMessage(
 	const options: Exclude<ICreateRoomParams['options'], undefined> = { creator: me._id };
 	const roomUsers = excludeSelf ? users : [me, ...users];
 
-	// TODO: use a shared helper to check whether a user is federated
-	// since the DM creation API doesn't tell us if the room is federated (unlike normal channels),
-	// we're currently inferring it: if any participant has a Matrix-style ID (@user:server), we treat the DM as federated
-	const hasFederatedMembers = roomUsers.some((user) => typeof user === 'string' && user.includes(':') && user.includes('@'));
-
 	// allow self-DMs
 	if (roomUsers.length === 1 && roomUsers[0] !== undefined && typeof roomUsers[0] !== 'string' && roomUsers[0]._id !== me._id) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', {
@@ -78,27 +73,19 @@ export async function createDirectMessage(
 	if (excludeSelf && (await hasPermissionAsync(userId, 'view-room-administration'))) {
 		options.subscriptionExtra = { open: true };
 	}
+
+	let extraData = {};
+
 	try {
-		await callbacks.run('federation.beforeCreateDirectMessage', roomUsers);
+		extraData = await callbacks.run('federation.beforeCreateDirectMessage', roomUsers);
 	} catch (error) {
 		throw new Meteor.Error((error as any)?.message);
 	}
 	const {
 		_id: rid,
 		inserted,
 		...room
-	} = await createRoom<'d'>(
-		'd',
-		undefined,
-		undefined,
-		roomUsers as IUser[],
-		false,
-		undefined,
-		{
-			...(hasFederatedMembers && { federated: true }),
-		},
-		options,
-	);
+	} = await createRoom<'d'>('d', undefined, undefined, roomUsers as IUser[], false, undefined, extraData, options);
 
 	return {
 		// @ts-expect-error - room type is already defined in the `createRoom` return type