Merge remote-tracking branch 'origin/chore/federation-backup' into feat/federation-files-2

ggazzo · ggazzo · commit d77bdcf310e5 · 2025-09-19T19:25:18.000-03:00
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
@@ -90,25 +90,24 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 		rid,
 		msg,
 		federation_event_id,
-		tmid,
 		file,
 		files,
 		attachments,
+		thread,
 	}: {
 		fromId: string;
 		rid: string;
 		msg: string;
 		federation_event_id: string;
-		tmid?: string;
 		file?: IMessage['file'];
 		files?: IMessage['files'];
 		attachments?: IMessage['attachments'];
+		thread?: { tmid: string; tshow: boolean };
 	}): Promise<IMessage> {
-		const threadParams = tmid ? { tmid, tshow: true } : {};
 		return executeSendMessage(fromId, {
 			rid,
 			msg,
-			...threadParams,
+			...thread,
 			federation: { eventId: federation_event_id },
 			...(file && { file }),
 			...(files && { files }),
diff --git a/ee/packages/federation-matrix/src/events/message.ts b/ee/packages/federation-matrix/src/events/message.ts
@@ -108,18 +108,15 @@ async function getRoomAndEnsureSubscription(matrixRoomId: string, user: IUser):
 	return room;
 }
 
-async function getThreadMessageId(threadRootEventId: string | undefined): Promise<string | undefined> {
-	if (!threadRootEventId) {
-		return undefined;
-	}
-
+async function getThreadMessageId(threadRootEventId: string): Promise<{ tmid: string; tshow: boolean } | undefined> {
 	const threadRootMessage = await Messages.findOneByFederationId(threadRootEventId);
-	if (threadRootMessage) {
-		logger.debug('Found thread root message:', { tmid: threadRootMessage._id, threadRootEventId });
-		return threadRootMessage._id;
+	if (!threadRootMessage) {
+		logger.warn('Thread root message not found for event:', threadRootEventId);
+		return;
 	}
-	logger.warn('Thread root message not found for event:', threadRootEventId);
-	return undefined;
+
+	const shouldSetTshow = !threadRootMessage?.tcount;
+	return { tmid: threadRootMessage._id, tshow: shouldSetTshow };
 }
 
 async function handleMediaMessage(
@@ -246,7 +243,7 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
 			const isThreadMessage = threadRelation?.rel_type === 'm.thread';
 			const isQuoteMessage = replyToRelation?.['m.in_reply_to']?.event_id && !replyToRelation?.is_falling_back;
 			const threadRootEventId = isThreadMessage ? threadRelation.event_id : undefined;
-			const tmid = await getThreadMessageId(threadRootEventId);
+			const thread = await getThreadMessageId(threadRootEventId);
 
 			const isMediaMessage = Object.values(fileTypes).includes(msgtype);
 
@@ -327,7 +324,7 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
 					rid: room._id,
 					msg: formatted,
 					federation_event_id: data.event_id,
-					tmid,
+					thread,
 				});
 				return;
 			}
@@ -347,7 +344,7 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
 					rid: room._id,
 					msg: formatted,
 					federation_event_id: data.event_id,
-					tmid,
+					thread,
 				});
 			}
 		} catch (error) {
diff --git a/packages/core-services/src/types/IMessageService.ts b/packages/core-services/src/types/IMessageService.ts
@@ -14,19 +14,19 @@ export interface IMessageService {
 		rid,
 		msg,
 		federation_event_id,
-		tmid,
 		file,
 		files,
 		attachments,
+		thread,
 	}: {
 		fromId: string;
 		rid: string;
 		msg: string;
 		federation_event_id: string;
-		tmid?: string;
 		file?: IMessage['file'];
 		files?: IMessage['files'];
 		attachments?: IMessage['attachments'];
+		thread?: { tmid: string; tshow: boolean };
 	}): Promise<IMessage>;
 	saveSystemMessageAndNotifyUser<T = IMessage>(
 		type: MessageTypesValues,
