commit f8e4658a747ef1108049d40eebc0e4a84f62ebfb
Author: Wim <wim@42.be>
Date: Fri Apr 13 22:01:03 2018 +0000
Make our callbackid more unique. Fixes issue with running multiple matterbridge on the same channel (slack,mattermost)
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 7a3806a..42843d0 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -3667 +3667 @@ func (b *Bmattermost) sendWebhook(msg config.Message) (string, error) {
// this sends a message only if we received a config.EVENT_FILE_FAILURE_SIZE
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text, Props: make(map[string]interface{})}
- matterMessage.Props["matterbridge"] = true
+ matterMessage.Props["matterbridge_"+b.mc.User.Id] = true
b.mh.Send(matterMessage)
}
@@ -3857 +3857 @@ func (b *Bmattermost) sendWebhook(msg config.Message) (string, error) {
if msg.Avatar != "" {
matterMessage.IconURL = msg.Avatar
}
- matterMessage.Props["matterbridge"] = true
+ matterMessage.Props["matterbridge_"+b.mc.User.Id] = true
err := b.mh.Send(matterMessage)
if err != nil {
b.Log.Info(err)
@@ -4157 +4157 @@ func (b *Bmattermost) skipMessage(message *matterclient.Message) bool {
// Ignore messages sent from matterbridge
if message.Post.Props != nil {
- if _, ok := message.Post.Props["matterbridge"].(bool); ok {
+ if _, ok := message.Post.Props["matterbridge_"+b.mc.User.Id].(bool); ok {
b.Log.Debugf("sent by matterbridge, ignoring")
return true
}
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 7706f2b..7d41333 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -1777 +1777 @@ 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)
@@ -6447 +6447 @@ 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
}
}
