Thumbnail

rani/matterbridge.git

Clone URL: https://git.buni.party/rani/matterbridge.git

commit 4f49031ebb0b7c9b54ef038a91cb58c4b04f561a Author: Wim <wim@42.be> Date: Sat Oct 29 21:05:33 2016 +0000 Drop first received message on connection to avoid duplicates (slack). Fixes #55 diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 5c28172..f943286 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -15723 +15729 @@ func (b *Bslack) handleSlack() {  }    func (b *Bslack) handleSlackClient(mchan chan *MMMessage) { + count := 0   for msg := range b.rtm.IncomingEvents {   switch ev := msg.Data.(type) {   case *slack.MessageEvent: - flog.Debugf("Receiving from slackclient %#v", ev) - channel, err := b.rtm.GetChannelInfo(ev.Channel) - if err != nil { - continue + // ignore first message + if count > 0 { + flog.Debugf("Receiving from slackclient %#v", ev) + //ev.ReplyTo + channel, err := b.rtm.GetChannelInfo(ev.Channel) + if err != nil { + continue + } + user, err := b.rtm.GetUserInfo(ev.User) + if err != nil { + continue + } + m := &MMMessage{} + m.Username = user.Name + m.Channel = channel.Name + m.Text = ev.Text + mchan <- m   } - user, err := b.rtm.GetUserInfo(ev.User) - if err != nil { - continue - } - m := &MMMessage{} - m.Username = user.Name - m.Channel = channel.Name - m.Text = ev.Text - mchan <- m + count++   case *slack.OutgoingErrorEvent:   flog.Debugf("%#v", ev.Error())   case *slack.ConnectedEvent: