cwinfo/matterbridge
4
0
Fork 0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-08-12 01:08:09 +00:00
Code Releases Activity

Make our callbackid more unique. Fixes issue with running multiple matterbridge on the same channel (slack,mattermost)

Browse Source
This commit is contained in:
Wim
2018-04-13 22:01:03 +02:00
parent 8bfaa007d5
commit 68fbed9281
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/slack/slack.go
View File

@@ -177,7 +177,7 @@ func (b *Bslack) Send(msg config.Message) (string, error) {
np.IconURL = msg.Avatar
}
// add a callback ID so we can see we created it
np.Attachments = append(np.Attachments, slack.Attachment{CallbackID: "matterbridge"})
np.Attachments = append(np.Attachments, slack.Attachment{CallbackID: "matterbridge_" + b.si.User.ID})
// add file attachments
np.Attachments = append(np.Attachments, b.createAttach(msg.Extra)...)
// add slack attachments (from another slack bridge)
@@ -644,7 +644,7 @@ func (b *Bslack) skipMessageEvent(ev *slack.MessageEvent) bool {
// skip messages we made ourselves
if len(ev.Attachments) > 0 {
if ev.Attachments[0].CallbackID == "matterbridge" {
if ev.Attachments[0].CallbackID == "matterbridge_"+b.si.User.ID {
return true
}
}