[NEW] Matrix Federation UX improvements

apps/meteor/.mocharc.js

@@ -25,6 +25,7 @@ module.exports = {
 	exit: true,
 	spec: [
 		'ee/tests/**/*.tests.ts',
+		'ee/tests/**/*.spec.ts',
 		'tests/unit/app/**/*.spec.ts',
 		'tests/unit/app/**/*.tests.js',
 		'tests/unit/app/**/*.tests.ts',

apps/meteor/app/discussion/client/tabBar.ts

@@ -1,26 +1,30 @@
 import { useMemo, lazy } from 'react';
 import { useSetting } from '@rocket.chat/ui-contexts';
+import { isIRoomFederated } from '@rocket.chat/core-typings';
 
 import { addAction } from '../../../client/views/room/lib/Toolbox';
 
 const template = lazy(() => import('../../../client/views/room/contextualBar/Discussions'));
 
-addAction('discussions', ({ room: { prid } }) => {
+addAction('discussions', ({ room }) => {
 	const discussionEnabled = useSetting('Discussion_enabled');
+	const federated = isIRoomFederated(room);
 
 	return useMemo(
 		() =>
-			discussionEnabled && !prid
+			discussionEnabled && !room.prid
 				? {
-						groups: ['channel', 'group', 'direct', 'direct_multiple', 'team'],
-						id: 'discussions',
-						title: 'Discussions',
-						icon: 'discussion',
+						'groups': ['channel', 'group', 'direct', 'direct_multiple', 'team'],
+						'id': 'discussions',
+						'title': 'Discussions',
+						'icon': 'discussion',
 						template,
-						full: true,
-						order: 3,
+						'full': true,
+						'disabled': federated,
+						'data-tooltip': 'Discussions_unavailable_for_federation',
+						'order': 3,
 				  }
 				: null,
-		[discussionEnabled, prid],
+		[discussionEnabled, room.prid, federated],
 	);
 });

apps/meteor/app/federation-v2/client/Federation.ts

@@ -0,0 +1,16 @@
+import { ValueOf } from '@rocket.chat/core-typings';
+
+import { RoomMemberActions } from '../../../definition/IRoomTypeConfig';
+
+const allowedActionsInFederatedRooms: ValueOf<typeof RoomMemberActions>[] = [
+	RoomMemberActions.REMOVE_USER,
+	RoomMemberActions.INVITE,
+	RoomMemberActions.JOIN,
+	RoomMemberActions.LEAVE,
+];
+
+export class Federation {
+	public static federationActionAllowed(action: ValueOf<typeof RoomMemberActions>): boolean {
+		return allowedActionsInFederatedRooms.includes(action);
+	}
+}

apps/meteor/app/federation-v2/client/index.ts

@@ -0,0 +1 @@
+import './slash-commands';

apps/meteor/app/federation-v2/client/slash-commands/index.ts

@@ -0,0 +1,20 @@
+import { slashCommands } from '../../../utils/lib/slashCommand';
+
+const callback = undefined;
+const result = undefined;
+const providesPreview = false;
+const previewer = undefined;
+const previewCallback = undefined;
+
+slashCommands.add({
+	command: 'federation',
+	callback,
+	options: {
+		description: 'Federation_slash_commands',
+		params: '#command (dm) #user',
+	},
+	result,
+	providesPreview,
+	previewer,
+	previewCallback,
+});

apps/meteor/app/federation-v2/server/application/RoomServiceReceiver.ts

@@ -11,18 +11,15 @@ import {
 	FederationRoomCreateInputDto,
 	FederationRoomChangeMembershipDto,
 	FederationRoomSendInternalMessageDto,
-	FederationRoomChangeJoinRulesDto,
-	FederationRoomChangeNameDto,
-	FederationRoomChangeTopicDto,
 } from './input/RoomReceiverDto';
 
 export class FederationRoomServiceReceiver {
 	constructor(
-		private rocketRoomAdapter: RocketChatRoomAdapter,
-		private rocketUserAdapter: RocketChatUserAdapter,
-		private rocketMessageAdapter: RocketChatMessageAdapter,
-		private rocketSettingsAdapter: RocketChatSettingsAdapter,
-		private bridge: IFederationBridge,
+		protected rocketRoomAdapter: RocketChatRoomAdapter,
+		protected rocketUserAdapter: RocketChatUserAdapter,
+		protected rocketMessageAdapter: RocketChatMessageAdapter,
+		protected rocketSettingsAdapter: RocketChatSettingsAdapter,
+		protected bridge: IFederationBridge,
 	) {} // eslint-disable-line no-empty-function
 
 	public async createRoom(roomCreateInput: FederationRoomCreateInputDto): Promise<void> {
@@ -78,14 +75,15 @@ export class FederationRoomServiceReceiver {
 			leave,
 		} = roomChangeMembershipInput;
 		const affectedFederatedRoom = await this.rocketRoomAdapter.getFederatedRoomByExternalId(externalRoomId);
+
 		if (!affectedFederatedRoom && eventOrigin === EVENT_ORIGIN.LOCAL) {
 			throw new Error(`Could not find room with external room id: ${externalRoomId}`);
 		}
-		const isInviterFromTheSameHomeServer = await this.bridge.isUserIdFromTheSameHomeserver(
+		const isInviterFromTheSameHomeServer = this.bridge.isUserIdFromTheSameHomeserver(
 			externalInviterId,
 			this.rocketSettingsAdapter.getHomeServerDomain(),
 		);
-		const isInviteeFromTheSameHomeServer = await this.bridge.isUserIdFromTheSameHomeserver(
+		const isInviteeFromTheSameHomeServer = this.bridge.isUserIdFromTheSameHomeserver(
 			externalInviteeId,
 			this.rocketSettingsAdapter.getHomeServerDomain(),
 		);
@@ -118,9 +116,8 @@ export class FederationRoomServiceReceiver {
 
 		const federatedInviteeUser = await this.rocketUserAdapter.getFederatedUserByExternalId(externalInviteeId);
 		const federatedInviterUser = await this.rocketUserAdapter.getFederatedUserByExternalId(externalInviterId);
-
 		if (!affectedFederatedRoom && eventOrigin === EVENT_ORIGIN.REMOTE) {
-			const members = [federatedInviterUser, federatedInviteeUser] as any[];
+			const members = [federatedInviterUser, federatedInviteeUser] as FederatedUser[];
 			const newFederatedRoom = FederatedRoom.createInstance(
 				externalRoomId,
 				normalizedRoomId,
@@ -134,14 +131,42 @@ export class FederationRoomServiceReceiver {
 			await this.bridge.joinRoom(externalRoomId, externalInviteeId);
 		}
 		const federatedRoom = affectedFederatedRoom || (await this.rocketRoomAdapter.getFederatedRoomByExternalId(externalRoomId));
-
 		if (leave) {
+			if (
+				!(await this.rocketRoomAdapter.isUserAlreadyJoined(
+					federatedRoom?.internalReference?._id as string,
+					federatedInviteeUser?.internalReference._id as string,
+				))
+			) {
+				return;
+			}
+
 			return this.rocketRoomAdapter.removeUserFromRoom(
 				federatedRoom as FederatedRoom,
 				federatedInviteeUser as FederatedUser,
 				federatedInviterUser as FederatedUser,
 			);
 		}
+		if (affectedFederatedRoom?.isDirectMessage() && eventOrigin === EVENT_ORIGIN.REMOTE) {
+			const membersUsernames = [
+				...(affectedFederatedRoom.internalReference?.usernames || []),
+				federatedInviteeUser?.internalReference.username as string,
+			];
+			const newFederatedRoom = FederatedRoom.createInstance(
+				externalRoomId,
+				normalizedRoomId,
+				federatedInviterUser as FederatedUser,
+				RoomType.DIRECT_MESSAGE,
+				externalRoomName,
+			);
+			if (affectedFederatedRoom.internalReference?.usernames?.includes(federatedInviteeUser?.internalReference.username || '')) {
+				return;
+			}
+			await this.rocketRoomAdapter.removeDirectMessageRoom(affectedFederatedRoom);
+			await this.rocketRoomAdapter.createFederatedRoomForDirectMessage(newFederatedRoom, membersUsernames);
+			return;
+		}
+
 		await this.rocketRoomAdapter.addUserToRoom(
 			federatedRoom as FederatedRoom,
 			federatedInviteeUser as FederatedUser,
@@ -164,54 +189,4 @@ export class FederationRoomServiceReceiver {
 
 		await this.rocketMessageAdapter.sendMessage(senderUser, text, federatedRoom);
 	}
-
-	public async changeJoinRules(roomJoinRulesChangeInput: FederationRoomChangeJoinRulesDto): Promise<void> {
-		const { externalRoomId, roomType } = roomJoinRulesChangeInput;
-
-		const federatedRoom = await this.rocketRoomAdapter.getFederatedRoomByExternalId(externalRoomId);
-		if (!federatedRoom) {
-			return;
-		}
-
-		if (federatedRoom.isDirectMessage()) {
-			return;
-		}
-
-		federatedRoom.setRoomType(roomType);
-		await this.rocketRoomAdapter.updateRoomType(federatedRoom);
-	}
-
-	public async changeRoomName(roomChangeNameInput: FederationRoomChangeNameDto): Promise<void> {
-		const { externalRoomId, normalizedRoomName } = roomChangeNameInput;
-
-		const federatedRoom = await this.rocketRoomAdapter.getFederatedRoomByExternalId(externalRoomId);
-		if (!federatedRoom) {
-			return;
-		}
-
-		if (federatedRoom.isDirectMessage()) {
-			return;
-		}
-
-		federatedRoom.changeRoomName(normalizedRoomName);
-
-		await this.rocketRoomAdapter.updateRoomName(federatedRoom);
-	}
-
-	public async changeRoomTopic(roomChangeTopicInput: FederationRoomChangeTopicDto): Promise<void> {
-		const { externalRoomId, roomTopic } = roomChangeTopicInput;
-
-		const federatedRoom = await this.rocketRoomAdapter.getFederatedRoomByExternalId(externalRoomId);
-		if (!federatedRoom) {
-			return;
-		}
-
-		if (federatedRoom.isDirectMessage()) {
-			return;
-		}
-
-		federatedRoom.changeRoomTopic(roomTopic);
-
-		await this.rocketRoomAdapter.updateRoomTopic(federatedRoom);
-	}
 }