tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Log if finding reply target fails

Browse source
This commit is contained in:
Tulir Asokan 2023-06-27 11:17:41 +03:00
parent 2b8b4332b0
commit b33affe97d
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
historysync.go
View file

@ -653,7 +653,7 @@ func (portal *Portal) backfill(source *User, messages []*waProto.WebMessageInfo,
continue continue
} }
if converted.ReplyTo != nil { if converted.ReplyTo != nil {
portal.SetReply(converted.Content, converted.ReplyTo, true) portal.SetReply(msgEvt.Info.ID, converted.Content, converted.ReplyTo, true)
} }
err = portal.appendBatchEvents(source, converted, &msgEvt.Info, webMsg, &req.Events, &infos) err = portal.appendBatchEvents(source, converted, &msgEvt.Info, webMsg, &req.Events, &infos)
if err != nil { if err != nil {

25
portal.go
View file

@ -42,6 +42,7 @@ import (
"time" "time"
"github.com/chai2010/webp" "github.com/chai2010/webp"
"github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"golang.org/x/image/draw" "golang.org/x/image/draw"
@ -194,6 +195,7 @@ func (br *WABridge) newBlankPortal(key database.PortalKey) *Portal {
portal := &Portal{ portal := &Portal{
bridge: br, bridge: br,
log: br.Log.Sub(fmt.Sprintf("Portal/%s", key)), log: br.Log.Sub(fmt.Sprintf("Portal/%s", key)),
zlog: br.ZLog.With().Str("portal_key", key.String()).Logger(),
messages: make(chan PortalMessage, br.Config.Bridge.PortalMessageBuffer), messages: make(chan PortalMessage, br.Config.Bridge.PortalMessageBuffer),
matrixMessages: make(chan PortalMatrixMessage, br.Config.Bridge.PortalMessageBuffer), matrixMessages: make(chan PortalMatrixMessage, br.Config.Bridge.PortalMessageBuffer),
@ -256,7 +258,9 @@ type Portal struct {
*database.Portal *database.Portal
bridge *WABridge bridge *WABridge
// Deprecated: use zerolog
log log.Logger log log.Logger
zlog zerolog.Logger
roomCreateLock sync.Mutex roomCreateLock sync.Mutex
encryptLock sync.Mutex encryptLock sync.Mutex
@ -772,7 +776,7 @@ func (portal *Portal) handleMessage(source *User, evt *events.Message) {
portal.MarkDisappearing(nil, existingMsg.MXID, converted.ExpiresIn, evt.Info.Timestamp) portal.MarkDisappearing(nil, existingMsg.MXID, converted.ExpiresIn, evt.Info.Timestamp)
converted.Content.SetEdit(existingMsg.MXID) converted.Content.SetEdit(existingMsg.MXID)
} else if converted.ReplyTo != nil { } else if converted.ReplyTo != nil {
portal.SetReply(converted.Content, converted.ReplyTo, false) portal.SetReply(evt.Info.ID, converted.Content, converted.ReplyTo, false)
} }
dbMsgType := database.MsgNormal dbMsgType := database.MsgNormal
if editTargetMsg != nil { if editTargetMsg != nil {
@ -1916,10 +1920,15 @@ func (portal *Portal) addReplyMention(content *event.MessageEventContent, sender
} }
} }
func (portal *Portal) SetReply(content *event.MessageEventContent, replyTo *ReplyInfo, isHungryBackfill bool) bool { func (portal *Portal) SetReply(msgID string, content *event.MessageEventContent, replyTo *ReplyInfo, isHungryBackfill bool) bool {
if replyTo == nil { if replyTo == nil {
return false return false
} }
log := portal.zlog.With().
Str("message_id", msgID).
Object("reply_to", replyTo).
Str("action", "SetReply").
Logger()
key := portal.Key key := portal.Key
targetPortal := portal targetPortal := portal
defer func() { defer func() {
@ -1946,6 +1955,8 @@ func (portal *Portal) SetReply(content *event.MessageEventContent, replyTo *Repl
content.RelatesTo = (&event.RelatesTo{}).SetReplyTo(targetPortal.deterministicEventID(replyTo.Sender, replyTo.MessageID, "")) content.RelatesTo = (&event.RelatesTo{}).SetReplyTo(targetPortal.deterministicEventID(replyTo.Sender, replyTo.MessageID, ""))
portal.addReplyMention(content, replyTo.Sender, "") portal.addReplyMention(content, replyTo.Sender, "")
return true return true
} else {
log.Warn().Msg("Failed to find reply target")
} }
return false return false
} }
@ -1956,14 +1967,14 @@ func (portal *Portal) SetReply(content *event.MessageEventContent, replyTo *Repl
} }
evt, err := targetPortal.MainIntent().GetEvent(targetPortal.MXID, message.MXID) evt, err := targetPortal.MainIntent().GetEvent(targetPortal.MXID, message.MXID)
if err != nil { if err != nil {
portal.log.Warnln("Failed to get reply target:", err) log.Warn().Err(err).Msg("Failed to get reply target event")
return true return true
} }
_ = evt.Content.ParseRaw(evt.Type) _ = evt.Content.ParseRaw(evt.Type)
if evt.Type == event.EventEncrypted { if evt.Type == event.EventEncrypted {
decryptedEvt, err := portal.bridge.Crypto.Decrypt(evt) decryptedEvt, err := portal.bridge.Crypto.Decrypt(evt)
if err != nil { if err != nil {
portal.log.Warnln("Failed to decrypt reply target:", err) log.Warn().Err(err).Msg("Failed to decrypt reply target event")
} else { } else {
evt = decryptedEvt evt = decryptedEvt
} }
@ -2100,6 +2111,12 @@ type ReplyInfo struct {
Sender types.JID Sender types.JID
} }
func (r ReplyInfo) MarshalZerologObject(e *zerolog.Event) {
e.Str("message_id", r.MessageID)
e.Str("chat_jid", r.Chat.String())
e.Str("sender_jid", r.Sender.String())
}
type Replyable interface { type Replyable interface {
GetStanzaId() string GetStanzaId() string
GetParticipant() string GetParticipant() string