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

Don't drop messages even if database says authenticated user is not in chat

Browse source
This commit is contained in:
Tulir Asokan 2019-11-13 09:36:43 +02:00
parent 3caca1b9a0
commit 14f039f5a4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
portal.go
View file

@ -1223,11 +1223,16 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *mautrix.Event) {
relaybotFormatted := false relaybotFormatted := false
if sender.NeedsRelaybot(portal) { if sender.NeedsRelaybot(portal) {
if !portal.HasRelaybot() { if !portal.HasRelaybot() {
portal.log.Debugln("Ignoring message from", sender.MXID, "in chat with no relaybot") if user.HasSession() {
return portal.log.Debugln("Database says", sender.MXID, "not in chat and no relaybot, but trying to send anyway")
} else {
portal.log.Debugln("Ignoring message from", sender.MXID, "in chat with no relaybot")
return
}
} else {
relaybotFormatted = portal.addRelaybotFormat(sender, evt)
sender = portal.bridge.Relaybot
} }
relaybotFormatted = portal.addRelaybotFormat(sender, evt)
sender = portal.bridge.Relaybot
} }
var err error var err error
switch evt.Content.MsgType { switch evt.Content.MsgType {