refactor(federation): enhance file message type handling

ggazzo · ggazzo · commit 3af8527f51aa · 2025-09-22T15:19:00.000-03:00
- Updated fileTypes to use FileMessageType for improved type safety.
- Refined getMatrixMessageType to return FileMessageType.
- Adjusted message handling to ensure consistent type usage across the federation module.
diff --git a/ee/packages/federation-matrix/src/FederationMatrix.ts b/ee/packages/federation-matrix/src/FederationMatrix.ts
@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 
-import type { PresenceState } from '@hs/core';
+import type { FileMessageType, PresenceState } from '@hs/core';
 import { ConfigService, createFederationContainer, getAllServices } from '@hs/federation-sdk';
 import type { HomeserverEventSignatures, HomeserverServices, FederationContainerOptions } from '@hs/federation-sdk';
 import type { EventID } from '@hs/room';
@@ -30,9 +30,7 @@ import { saveExternalUserIdForLocalUser } from './helpers/identifiers';
 import { toExternalMessageFormat, toExternalQuoteMessageFormat } from './helpers/message.parsers';
 import { MatrixMediaService } from './services/MatrixMediaService';
 
-export type MatrixFileTypes = 'm.image' | 'm.video' | 'm.audio' | 'm.file';
-
-export const fileTypes: Record<string, MatrixFileTypes> = {
+export const fileTypes: Record<string, FileMessageType> = {
 	image: 'm.image',
 	video: 'm.video',
 	audio: 'm.audio',
@@ -411,7 +409,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 		}
 	}
 
-	private getMatrixMessageType(mimeType?: string): MatrixFileTypes {
+	private getMatrixMessageType(mimeType?: string): FileMessageType {
 		const mainType = mimeType?.split('/')[0];
 		if (!mainType) {
 			return fileTypes.file;
diff --git a/ee/packages/federation-matrix/src/events/message.ts b/ee/packages/federation-matrix/src/events/message.ts
@@ -1,12 +1,13 @@
+import type { FileMessageType, MessageType } from '@hs/core';
 import type { HomeserverEventSignatures } from '@hs/federation-sdk';
+import type { EventID } from '@hs/room';
 import { FederationMatrix, Message, MeteorService } from '@rocket.chat/core-services';
 import { UserStatus } from '@rocket.chat/core-typings';
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import type { Emitter } from '@rocket.chat/emitter';
 import { Logger } from '@rocket.chat/logger';
 import { Users, MatrixBridgedUser, MatrixBridgedRoom, Rooms, Subscriptions, Messages } from '@rocket.chat/models';
 
-import type { MatrixFileTypes } from '../FederationMatrix';
 import { fileTypes } from '../FederationMatrix';
 import { toInternalMessageFormat, toInternalQuoteMessageFormat } from '../helpers/message.parsers';
 import { MatrixMediaService } from '../services/MatrixMediaService';
@@ -109,7 +110,7 @@ async function getRoomAndEnsureSubscription(matrixRoomId: string, user: IUser):
 	return room;
 }
 
-async function getThreadMessageId(threadRootEventId: string): Promise<{ tmid: string; tshow: boolean } | undefined> {
+async function getThreadMessageId(threadRootEventId: EventID): Promise<{ tmid: string; tshow: boolean } | undefined> {
 	const threadRootMessage = await Messages.findOneByFederationId(threadRootEventId);
 	if (!threadRootMessage) {
 		logger.warn('Thread root message not found for event:', threadRootEventId);
@@ -123,7 +124,7 @@ async function getThreadMessageId(threadRootEventId: string): Promise<{ tmid: st
 async function handleMediaMessage(
 	// TODO improve typing
 	content: any,
-	msgtype: string,
+	msgtype: MessageType,
 	messageBody: string,
 	user: IUser,
 	room: IRoom,
@@ -247,7 +248,7 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
 
 			const thread = threadRootEventId ? await getThreadMessageId(threadRootEventId) : undefined;
 
-			const isMediaMessage = Object.values(fileTypes).includes(msgtype as MatrixFileTypes);
+			const isMediaMessage = Object.values(fileTypes).includes(msgtype as FileMessageType);
 
 			const isEditedMessage = relation?.rel_type === 'm.replace';
 			if (isEditedMessage && relation?.event_id && data.content['m.new_content']) {
