LordMZTE/mautrix-whatsapp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Actually log errors when accepting invite fails. Fixes #143

Browse source
This commit is contained in:
Tulir Asokan 2020-06-25 17:01:40 +03:00
parent f4ce80f98e
commit d0ccc85522
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
matrix.go
View file

@ -77,32 +77,32 @@ func (mx *MatrixHandler) HandleBotInvite(evt *event.Event) {
resp, err := intent.JoinRoomByID(evt.RoomID) resp, err := intent.JoinRoomByID(evt.RoomID)
if err != nil { if err != nil {
mx.log.Debugln("Failed to join room", evt.RoomID, "with invite from", evt.Sender) mx.log.Debugfln("Failed to join room %s with invite from %s: %v", evt.RoomID, evt.Sender, err)
return return
} }
members, err := intent.JoinedMembers(resp.RoomID) members, err := intent.JoinedMembers(resp.RoomID)
if err != nil { if err != nil {
mx.log.Debugln("Failed to get members in room", resp.RoomID, "after accepting invite from", evt.Sender) mx.log.Debugfln("Failed to get members in room %s after accepting invite from %s: %v", resp.RoomID, evt.Sender, err)
intent.LeaveRoom(resp.RoomID) _, _ = intent.LeaveRoom(resp.RoomID)
return return
} }
if len(members.Joined) < 2 { if len(members.Joined) < 2 {
mx.log.Debugln("Leaving empty room", resp.RoomID, "after accepting invite from", evt.Sender) mx.log.Debugln("Leaving empty room", resp.RoomID, "after accepting invite from", evt.Sender)
intent.LeaveRoom(resp.RoomID) _, _ = intent.LeaveRoom(resp.RoomID)
return return
} }
if !user.Whitelisted { if !user.Whitelisted {
intent.SendNotice(resp.RoomID, "You are not whitelisted to use this bridge.\n"+ _, _ = intent.SendNotice(resp.RoomID, "You are not whitelisted to use this bridge.\n"+
"If you're the owner of this bridge, see the bridge.permissions section in your config file.") "If you're the owner of this bridge, see the bridge.permissions section in your config file.")
intent.LeaveRoom(resp.RoomID) _, _ = intent.LeaveRoom(resp.RoomID)
return return
} }
if evt.RoomID == mx.bridge.Config.Bridge.Relaybot.ManagementRoom { if evt.RoomID == mx.bridge.Config.Bridge.Relaybot.ManagementRoom {
intent.SendNotice(evt.RoomID, "This is the relaybot management room. Send `!wa help` to get a list of commands.") _, _ = intent.SendNotice(evt.RoomID, "This is the relaybot management room. Send `!wa help` to get a list of commands.")
mx.log.Debugln("Joined relaybot management room", evt.RoomID, "after invite from", evt.Sender) mx.log.Debugln("Joined relaybot management room", evt.RoomID, "after invite from", evt.Sender)
return return
} }