MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-06-18 10:58:20 +02:00
Code Issues Projects Releases Wiki Activity

Always use blank content for replies

Browse source 
It seems to work fine on the iOS, Android and Web versions of WhatsApp,
so let's save the two LoadMessages calls.
This commit is contained in:
Tulir Asokan 2021-08-19 19:17:46 +03:00
parent 4fe179d0d7
commit b3312bc663
1 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
portal.go
View file

@ -2087,36 +2087,6 @@ func fallbackQuoteContent() *waProto.Message {
}
}
func loadQuoteContent(sender *User, msg *database.Message) *waProto.Message {
resp, err := sender.Conn.LoadMessagesBefore(msg.Chat.JID, msg.JID, msg.Sender == sender.JID, 1)
if err != nil {
return fallbackQuoteContent()
}
msgList, ok := resp.Content.([]interface{})
if !ok || len(msgList) == 0 {
return fallbackQuoteContent()
}
wmi, ok := msgList[0].(*waProto.WebMessageInfo)
if !ok {
return fallbackQuoteContent()
}
sender.log.Debugln("Loaded message before %s: %s", msg.JID, wmi.GetKey().GetId())
resp, err = sender.Conn.LoadMessagesAfter(msg.Chat.JID, wmi.GetKey().GetId(), wmi.GetKey().GetFromMe(), 1)
if err != nil {
return fallbackQuoteContent()
}
msgList, ok = resp.Content.([]interface{})
if !ok || len(msgList) == 0 {
return fallbackQuoteContent()
}
wmi, ok = msgList[0].(*waProto.WebMessageInfo)
if !ok {
return fallbackQuoteContent()
}
sender.log.Debugln("Loaded message %s", wmi.GetKey().GetId())
return wmi.GetMessage()
}
func (portal *Portal) convertMatrixMessage(sender *User, evt *event.Event) (*waProto.WebMessageInfo, *User) {
content, ok := evt.Content.Parsed.(*event.MessageEventContent)
if !ok {
@ -2146,7 +2116,7 @@ func (portal *Portal) convertMatrixMessage(sender *User, evt *event.Event) (*waP
if msg != nil {
ctxInfo.StanzaId = &msg.JID
ctxInfo.Participant = &msg.Sender
ctxInfo.QuotedMessage = loadQuoteContent(sender, msg)
ctxInfo.QuotedMessage = fallbackQuoteContent()
}
}
relaybotFormatted := false