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

Re-add sending bridging failure messages

Browse source
This commit is contained in:
Tulir Asokan 2020-05-24 15:44:20 +03:00
parent 91bb38eaa3
commit c909a85fc7
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
portal.go
View file

@ -1416,15 +1416,22 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event) {
portal.log.Warnfln("Response when bridging Matrix event %s is taking long to arrive", evt.ID) portal.log.Warnfln("Response when bridging Matrix event %s is taking long to arrive", evt.ID)
errorSendResp, err = portal.sendMainIntentMessage(event.MessageEventContent{ errorSendResp, err = portal.sendMainIntentMessage(event.MessageEventContent{
MsgType: event.MsgNotice, MsgType: event.MsgNotice,
Body: fmt.Sprintf("\u26a0 Your message may not have been bridged: %v", err), Body: fmt.Sprintf("\u26a0 Your message may not have been bridged: message sending timed out"),
}) })
if err != nil { if err != nil {
portal.log.Warnfln("Failed to send bridging failure message:", err) portal.log.Warnfln("Failed to send bridging timeout message:", err)
} }
err = <-errChan err = <-errChan
} }
if err != nil { if err != nil {
portal.log.Errorfln("Error handling Matrix event %s: %v", evt.ID, err) portal.log.Errorfln("Error handling Matrix event %s: %v", evt.ID, err)
_, err = portal.sendMainIntentMessage(event.MessageEventContent{
MsgType: event.MsgNotice,
Body: fmt.Sprintf("\u26a0 Your message may not have been bridged: %v", err),
})
if err != nil {
portal.log.Warnfln("Failed to send bridging failure message:", err)
}
} else { } else {
portal.log.Debugln("Handled Matrix event %s", evt.ID) portal.log.Debugln("Handled Matrix event %s", evt.ID)
} }