Improve typing of homeserver.matrix.message

rodrigok · rodrigok · commit 17fc36185e46 · 2025-09-21T11:56:18.000-03:00
diff --git a/packages/federation-sdk/src/index.ts b/packages/federation-sdk/src/index.ts
@@ -1,4 +1,4 @@
-import type { Membership } from '@hs/core';
+import type { Membership, MessageType } from '@hs/core';
 import type { EventID } from '@hs/room';
 import { container } from 'tsyringe';
 import { ConfigService } from './services/config.service';
@@ -115,20 +115,32 @@ export type HomeserverEventSignatures = {
 		origin_server_ts: number;
 		content: {
 			body: string;
-			msgtype: string;
-			'm.relates_to'?: {
-				rel_type: 'm.replace' | 'm.annotation' | 'm.thread';
-				event_id: EventID;
-				'm.in_reply_to'?: {
-					event_id: EventID;
-					room_id: string;
-					sender: string;
-					origin_server_ts: number;
-				};
-			};
+			msgtype: MessageType;
+			url?: string;
+			'm.relates_to'?:
+				| {
+						rel_type: 'm.replace';
+						event_id: EventID;
+				  }
+				| {
+						rel_type: 'm.annotation';
+						event_id: EventID;
+						key: string;
+				  }
+				| {
+						rel_type: 'm.thread';
+						event_id: EventID;
+						'm.in_reply_to'?: {
+							event_id: EventID;
+							room_id: string;
+							sender: string;
+							origin_server_ts: number;
+						};
+						is_falling_back?: boolean;
+				  };
 			'm.new_content'?: {
 				body: string;
-				msgtype: string;
+				msgtype: MessageType;
 				'm.mentions'?: Record<string, string>;
 			};
 			formatted_body?: string;
diff --git a/packages/federation-sdk/src/services/staging-area.service.ts b/packages/federation-sdk/src/services/staging-area.service.ts
@@ -1,8 +1,8 @@
 import type { EventBase, EventStagingStore, Membership } from '@hs/core';
 import { singleton } from 'tsyringe';
 
-import { createLogger, isRedactedEvent } from '@hs/core';
-import { Pdu, PduPowerLevelsEventContent } from '@hs/room';
+import { MessageType, createLogger, isRedactedEvent } from '@hs/core';
+import { PduPowerLevelsEventContent } from '@hs/room';
 import type { EventID } from '@hs/room';
 import { EventAuthorizationService } from './event-authorization.service';
 import { EventEmitterService } from './event-emitter.service';
@@ -148,14 +148,24 @@ export class StagingAreaService {
 					content: {
 						...event.event.content,
 						body: event.event.content?.body as string,
-						msgtype: event.event.content?.msgtype as string,
-						'm.relates_to': event.event.content?.['m.relates_to'] as {
-							rel_type: 'm.replace' | 'm.annotation' | 'm.thread';
-							event_id: EventID;
-						},
+						msgtype: event.event.content?.msgtype as MessageType,
+						'm.relates_to': event.event.content?.['m.relates_to'] as
+							| {
+									rel_type: 'm.replace';
+									event_id: EventID;
+							  }
+							| {
+									rel_type: 'm.annotation';
+									event_id: EventID;
+									key: string;
+							  }
+							| {
+									rel_type: 'm.thread';
+									event_id: EventID;
+							  },
 						'm.new_content': event.event.content?.['m.new_content'] as {
 							body: string;
-							msgtype: string;
+							msgtype: MessageType;
 						},
 						formatted_body: (event.event.content?.formatted_body ||
 							'') as string,
