Fix message replies in e2e threads #57
Merged
Conversation
This file contains 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
javiercr
commented
May 7, 2024
| @@ -101,8 +101,7 @@ func (mc *MessageConverter) ToWhatsApp( | |||
| var meta waMsgApplication.MessageApplication_Metadata | |||
| if replyTo := mc.GetMetaReply(ctx, content); replyTo != nil { | |||
| meta.QuotedMessage = &waMsgApplication.MessageApplication_Metadata_QuotedMessage{ | |||
| StanzaID: replyTo.ReplyMessageId, | |||
| RemoteJID: mc.GetData(ctx).JID().String(), | |||
| StanzaID: replyTo.ReplyMessageId, | |||
| // TODO: this is hacky since it hardcodes the server | |||
| // TODO 2: should this be included for DMs? | |||
There was a problem hiding this comment.
@tulir does this clear this TODO?
There was a problem hiding this comment.
Probably not, the TODO is for the Participant field
There was a problem hiding this comment.
Oh actually it might clear the second one if you've confirmed DMs are supposed to have that field. I think on WhatsApp the same field is meant for groups (and RemoteJID is used for DM recipient or group ID)
There was a problem hiding this comment.
From the screenshot in the PR description it seems that the Participant field is indeed required.
tulir
approved these changes
May 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In an e2e encrypted conversation/thread, message replies sent through the bridge were not rendered in Messenger web/desktop (while they were rendered in the Messenger mobile app).
Debugging the service worker for messenger.com, we can compare an incoming reply message sent from the official Messenger web client (left) to one sent from mautrix/meta bridge (right):
From this, we can infer that
quotedMessage.remoteJidis not needed (which, btw, used to have the same value asquotedMessage.participant).