watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix misleading connection error message in private chat portals

Browse Source
This commit is contained in:
Tulir Asokan 2019-08-30 21:37:12 +03:00
parent 4747d6999b
commit c4d2b04e67
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
portal.go
View File

@ -1088,8 +1088,12 @@ func (portal *Portal) sendMatrixConnectionError(sender *User, eventID string) bo
return true return true
} else if !sender.IsConnected() { } else if !sender.IsConnected() {
portal.log.Debugln("Ignoring event", eventID, "from", sender.MXID, "as user is not connected") portal.log.Debugln("Ignoring event", eventID, "from", sender.MXID, "as user is not connected")
inRoom := ""
if portal.IsPrivateChat() {
inRoom = " in your management room"
}
msg := format.RenderMarkdown(fmt.Sprintf("\u26a0 You are not connected to WhatsApp, so your message was not bridged. " + msg := format.RenderMarkdown(fmt.Sprintf("\u26a0 You are not connected to WhatsApp, so your message was not bridged. " +
"Use `%s reconnect` to reconnect.", portal.bridge.Config.Bridge.CommandPrefix)) "Use `%s reconnect`%s to reconnect.", portal.bridge.Config.Bridge.CommandPrefix, inRoom))
msg.MsgType = mautrix.MsgNotice msg.MsgType = mautrix.MsgNotice
_, err := portal.MainIntent().SendMessageEvent(portal.MXID, mautrix.EventMessage, msg) _, err := portal.MainIntent().SendMessageEvent(portal.MXID, mautrix.EventMessage, msg)
if err != nil { if err != nil {