From d0ccc85522cd7c549900bec180e5a7a117b7a8bd Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 25 Jun 2020 17:01:40 +0300 Subject: [PATCH] Actually log errors when accepting invite fails. Fixes #143 --- matrix.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/matrix.go b/matrix.go index dfd97a9..44a473d 100644 --- a/matrix.go +++ b/matrix.go @@ -77,32 +77,32 @@ func (mx *MatrixHandler) HandleBotInvite(evt *event.Event) { resp, err := intent.JoinRoomByID(evt.RoomID) 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 } members, err := intent.JoinedMembers(resp.RoomID) if err != nil { - mx.log.Debugln("Failed to get members in room", resp.RoomID, "after accepting invite from", evt.Sender) - intent.LeaveRoom(resp.RoomID) + 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) return } if len(members.Joined) < 2 { mx.log.Debugln("Leaving empty room", resp.RoomID, "after accepting invite from", evt.Sender) - intent.LeaveRoom(resp.RoomID) + _, _ = intent.LeaveRoom(resp.RoomID) return } 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.") - intent.LeaveRoom(resp.RoomID) + _, _ = intent.LeaveRoom(resp.RoomID) return } 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) return }