Skip to content

refactor: set tshow to true for the first thread message in federated rooms #37008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 3 commits into from
Sep 19, 2025
Merged

refactor: set tshow to true for the first thread message in federated rooms #37008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5c00f3
change threads tshow to false for all remote messages
ricardogarim Sep 19, 2025
9f688b9
check tcount from root message to decide tshow from incoming messages
ricardogarim Sep 19, 2025
7be3815
review
ggazzo Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions apps/meteor/server/services/messages/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,18 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
rid,
msg,
federation_event_id,
tmid,
thread,
}: {
fromId: string;
rid: string;
msg: string;
federation_event_id: string;
tmid?: string;
thread?: { tmid: string; tshow: boolean };
}): Promise<IMessage> {
const threadParams = tmid ? { tmid, tshow: true } : {};
Copy link
Member

@ggazzo ggazzo Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering if changing this true to false, would do the whole magic

Copy link
Contributor Author

@ricardogarim ricardogarim Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to comply with existing RC behavior we also need to check if is first thread message. if so, set tshow: true, otherwise, false

return executeSendMessage(fromId, {
rid,
msg,
...threadParams,
...thread,
federation: { eventId: federation_event_id },
});
}
Expand Down
15 changes: 8 additions & 7 deletions ee/packages/federation-matrix/src/events/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,16 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
}
}

let tmid: string | undefined;
let thread: { tmid: string; tshow: boolean } | undefined;
if (isThreadMessage && threadRootEventId) {
const threadRootMessage = await Messages.findOneByFederationId(threadRootEventId);
if (threadRootMessage) {
tmid = threadRootMessage._id;
logger.debug('Found thread root message:', { tmid, threadRootEventId });
} else {
if (!threadRootMessage) {
logger.warn('Thread root message not found for event:', threadRootEventId);
return;
}

const shouldSetTshow = !threadRootMessage?.tcount;
thread = { tmid: threadRootMessage._id, tshow: shouldSetTshow };
}

const isEditedMessage = data.content['m.relates_to']?.rel_type === 'm.replace';
Expand Down Expand Up @@ -201,7 +202,7 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
rid: internalRoomId,
msg: formatted,
federation_event_id: data.event_id,
tmid,
thread,
});
return;
}
Expand All @@ -217,7 +218,7 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
rid: internalRoomId,
msg: formatted,
federation_event_id: data.event_id,
tmid,
thread,
});
} catch (error) {
logger.error('Error processing Matrix message:', error);
Expand Down
Loading