MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-05-29 01:03:53 +02:00
Code Issues Projects Releases Wiki Activity

Fix participant ID in replies and update comment

Browse source
This commit is contained in:
Tulir Asokan 2021-11-01 16:28:32 +02:00
parent 02dc422089
commit dd50379c3a
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
portal.go
View file

@ -2158,13 +2158,6 @@ func parseGeoURI(uri string) (lat, long float64, err error) {
return
}
func fallbackQuoteContent() *waProto.Message {
blankString := ""
return &waProto.Message{
Conversation: &blankString,
}
}
func (portal *Portal) convertMatrixMessage(sender *User, evt *event.Event) (*waProto.Message, *User) {
content, ok := evt.Content.Parsed.(*event.MessageEventContent)
if !ok {
@ -2179,11 +2172,13 @@ func (portal *Portal) convertMatrixMessage(sender *User, evt *event.Event) (*waP
replyToMsg := portal.bridge.DB.Message.GetByMXID(replyToID)
if replyToMsg != nil {
ctxInfo.StanzaId = &replyToMsg.JID
ctxInfo.Participant = proto.String(replyToMsg.Sender.String())
ctxInfo.Participant = proto.String(replyToMsg.Sender.ToNonAD().String())
// Using blank content here seems to work fine on all official WhatsApp apps.
// Getting the content from the phone would be possible, but it's complicated.
// https://github.com/mautrix/whatsapp/commit/b3312bc663772aa274cea90ffa773da2217bb5e0
ctxInfo.QuotedMessage = fallbackQuoteContent()
//
// We could probably invent a slightly more accurate version of the quoted message
// by fetching the Matrix event and converting it to the WhatsApp format, but that's
// a lot of work and this works fine.
ctxInfo.QuotedMessage = &waProto.Message{Conversation: proto.String("")}
}
}
relaybotFormatted := false