remove uid from deleteMessage input and get it from message sender

Author: ricardogarim

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

@@ -1,5 +1,5 @@
 import { FederationMatrix } from '@rocket.chat/core-services';
-import { isEditedMessage, isUserNativeFederated, type IMessage, type IRoom, type IUser } from '@rocket.chat/core-typings';
+import { isEditedMessage, type IMessage, type IRoom, type IUser } from '@rocket.chat/core-typings';
 import { Rooms } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
@@ -57,22 +57,13 @@ callbacks.add(
 
 callbacks.add(
 	'afterDeleteMessage',
-	async (message: IMessage, { room, user }) => {
+	async (message: IMessage, { room }) => {
 		if (!message.federation?.eventId) {
 			return;
 		}
 
-		// removing messages from external users is not allowed
-		// TODO should we make it work for external users?
-		if (user.federated) {
-			return;
-		}
-
-		if (!isUserNativeFederated(user)) {
-			return;
-		}
 		if (FederationActions.shouldPerformFederationAction(room)) {
-			await FederationMatrix.deleteMessage(room.federation.mrid, message, user.federation.mui);
+			await FederationMatrix.deleteMessage(room.federation.mrid, message);
 		}
 	},
 	callbacks.priority.MEDIUM,

ee/packages/federation-matrix/src/FederationMatrix.ts

@@ -616,7 +616,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 		};
 	}
 
-	async deleteMessage(matrixRoomId: string, message: IMessage, uid: string): Promise<void> {
+	async deleteMessage(matrixRoomId: string, message: IMessage): Promise<void> {
 		try {
 			if (!isMessageFromMatrixFederation(message) || isDeletedMessage(message)) {
 				return;
@@ -634,7 +634,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 
 			// TODO fix branded EventID and remove type casting
 			// TODO message.u?.username is not the user who removed the message
-			const eventId = await this.homeserverServices.message.redactMessage(matrixRoomId, matrixEventId as EventID, uid);
+			const eventId = await this.homeserverServices.message.redactMessage(matrixRoomId, matrixEventId as EventID);
 
 			this.logger.debug('Message Redaction sent to Matrix successfully:', eventId);
 		} catch (error) {

packages/core-services/src/types/IFederationMatrixService.ts

@@ -10,7 +10,7 @@ export interface IFederationMatrixService {
 	ensureFederatedUsersExistLocally(members: string[]): Promise<void>;
 	createDirectMessageRoom(room: IRoomFederated, members: IUser[], creatorId: IUser['_id']): Promise<void>;
 	sendMessage(message: IMessage, room: IRoomFederated, user: IUser): Promise<void>;
-	deleteMessage(matrixRoomId: string, message: IMessage, uid: string): Promise<void>;
+	deleteMessage(matrixRoomId: string, message: IMessage): Promise<void>;
 	sendReaction(messageId: string, reaction: string, user: IUser): Promise<void>;
 	removeReaction(messageId: string, reaction: string, user: IUser, oldMessage: IMessage): Promise<void>;
 	getEventById(eventId: string): Promise<any | null>;