You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
fix: keep the quote when replying in direct message to a thread message - #7899
"Reply in direct message" on a thread reply opened the DM without the quote. The DM composer looked up the quoted id in the messages table only, and a thread reply that was loaded by opening its thread lives only in thread_messages.
Add getMessageOrThreadMessageById, which falls back to thread_messages when the message isn't in messages and there's no tmid.
Use it for the quote preview (useMessage) and the quote link added on send (prepareQuoteMessage).
getMessageById is unchanged, since room sync relies on it only reading messages.
Regression from the new message composer (#5205, 4.47.0), which switched Reply in DM from passing the message object to a messageId lookup. #7535 added the thread lookup only when a tmid is passed, so the DM path stayed broken.
No actionable comments were generated in the recent review.
Walkthrough
The message service adds a lookup that can fall back from messages to thread messages. MessageComposer uses this lookup when loading a message and preparing quoted messages. Tests cover lookup behavior, thread IDs, and quote handling.
Changes
Thread-aware message lookup
Layer / File(s)
Summary
Message lookup and fallback app/lib/database/services/Message.ts, app/lib/database/services/Message.test.ts
The service adds getMessageOrThreadMessageById. It checks the message lookup first and can fall back to a thread-message lookup. Tests cover message matches, fallback behavior, thread IDs, and missing results.
Message loading and quote preparation use the new lookup. Tests update mocks and verify calls with and without thread IDs, while retaining quote behavior assertions.
This change restores the quote when replying in a direct message to a thread message. No merge-blocking risk was identified.
Pre-merge checks: 4
Check name
Status
Explanation
Title check
The title states the main change: the quote is kept when replying in a direct message to a thread message. The changeset adds getMessageOrThreadMessageById, which falls back to thread_messages, and us…
Linked Issues check
Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check
Check skipped because no linked issues were found for this pull request.
Description Check
Check skipped - CodeRabbit’s high-level summary is enabled.
Full details: Title check
Explanation
The title states the main change: the quote is kept when replying in a direct message to a thread message. The changeset adds getMessageOrThreadMessageById, which falls back to thread_messages, and uses it in useMessage and prepareQuoteMessage. The title matches this fix.
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Warning
Errors were encountered while retrieving linked issues.
Errors: 1
JIRA integration encountered authorization issues. Please disconnect and reconnect the integration in the CodeRabbit UI.
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 7 remain after this review.
Recent review details
Context from checks skipped due to timeout: 3
GitHub Check: ESLint and Test / run-eslint-and-test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GitHub Actions
Waiting
Proposed changes
"Reply in direct message" on a thread reply opened the DM without the quote. The DM composer looked up the quoted id in the
messagestable only, and a thread reply that was loaded by opening its thread lives only inthread_messages.getMessageOrThreadMessageById, which falls back tothread_messageswhen the message isn't inmessagesand there's notmid.useMessage) and the quote link added on send (prepareQuoteMessage).getMessageByIdis unchanged, since room sync relies on it only readingmessages.Regression from the new message composer (#5205, 4.47.0), which switched Reply in DM from passing the message object to a
messageIdlookup. #7535 added the thread lookup only when atmidis passed, so the DM path stayed broken.Issue(s)
https://rocketchat.atlassian.net/browse/SUP-1144
How to test or reproduce
Screenshots
Types of changes
Checklist