From 1d708ab35196d814c932cb8570cfd01fa541f3fa Mon Sep 17 00:00:00 2001 From: Qais Patankar Date: Thu, 3 Oct 2019 23:19:50 +0100 Subject: [PATCH] Suppress unhandled HelloEvent message (slack) (#913) --- bridge/slack/handlers.go | 4 ++-- bridge/slack/slack.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go index 5a55949a..44a57db0 100644 --- a/bridge/slack/handlers.go +++ b/bridge/slack/handlers.go @@ -43,7 +43,7 @@ func (b *Bslack) handleSlack() { func (b *Bslack) handleSlackClient(messages chan *config.Message) { for msg := range b.rtm.IncomingEvents { - if msg.Type != sUserTyping && msg.Type != sLatencyReport { + if msg.Type != sUserTyping && msg.Type != sHello && msg.Type != sLatencyReport { b.Log.Debugf("== Receiving event %#v", msg.Data) } switch ev := msg.Data.(type) { @@ -86,7 +86,7 @@ func (b *Bslack) handleSlackClient(messages chan *config.Message) { b.Log.Errorf("Connection failed %#v %#v", ev.Error(), ev.ErrorObj) case *slack.MemberJoinedChannelEvent: b.users.populateUser(ev.User) - case *slack.LatencyReport: + case *slack.HelloEvent, *slack.LatencyReport: continue default: b.Log.Debugf("Unhandled incoming event: %T", ev) diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 2aaa2cb1..94f13025 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -12,7 +12,7 @@ import ( "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/helper" "github.com/42wim/matterbridge/matterhook" - "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru" "github.com/nlopes/slack" "github.com/rs/xid" ) @@ -36,6 +36,7 @@ type Bslack struct { } const ( + sHello = "hello" sChannelJoin = "channel_join" sChannelLeave = "channel_leave" sChannelJoined = "channel_joined"