MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2025-01-19 02:41:57 +01:00
Code Issues Projects Releases Wiki Activity

Use replies for error notices

Browse source
This commit is contained in:
Tulir Asokan 2022-07-01 11:06:54 +03:00
parent 676ae34bbe
commit 69f23666a5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
messagetracking.go
View file

@ -94,7 +94,7 @@ func errorToStatusReason(err error) (reason event.MessageStatusReason, isCertain
} }
} }
func (portal *Portal) sendErrorMessage(err error, confirmed bool, editID id.EventID) id.EventID { func (portal *Portal) sendErrorMessage(evt *event.Event, err error, confirmed bool, editID id.EventID) id.EventID {
if !portal.bridge.Config.Bridge.MessageErrorNotices { if !portal.bridge.Config.Bridge.MessageErrorNotices {
return "" return ""
} }
@ -112,6 +112,8 @@ func (portal *Portal) sendErrorMessage(err error, confirmed bool, editID id.Even
} }
if editID != "" { if editID != "" {
content.SetEdit(editID) content.SetEdit(editID)
} else {
content.SetReply(evt)
} }
resp, err := portal.sendMainIntentMessage(content) resp, err := portal.sendMainIntentMessage(content)
if err != nil { if err != nil {
@ -198,7 +200,7 @@ func (portal *Portal) sendMessageMetrics(evt *event.Event, err error, part strin
} }
portal.bridge.SendMessageCheckpoint(evt, bridge.MsgStepRemote, err, status, ms.getRetryNum()) portal.bridge.SendMessageCheckpoint(evt, bridge.MsgStepRemote, err, status, ms.getRetryNum())
if sendNotice { if sendNotice {
ms.setNoticeID(portal.sendErrorMessage(err, isCertain, ms.getNoticeID())) ms.setNoticeID(portal.sendErrorMessage(evt, err, isCertain, ms.getNoticeID()))
} }
portal.sendStatusEvent(origEvtID, evt.ID, err) portal.sendStatusEvent(origEvtID, evt.ID, err)
} else { } else {