jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-30 14:42:00 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix sending to different channels on same account (slack). Closes #177

Browse Source
This commit is contained in:
Wim 2017-05-24 22:10:21 +02:00
parent f065e9e4d5
commit 87229bab13
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bridge/slack/slack.go
View File

@ -89,9 +89,6 @@ func (b *Bslack) JoinChannel(channel string) error {
func (b *Bslack) Send(msg config.Message) error { func (b *Bslack) Send(msg config.Message) error {
flog.Debugf("Receiving %#v", msg) flog.Debugf("Receiving %#v", msg)
if msg.Account == b.Account {
return nil
}
nick := msg.Username nick := msg.Username
message := msg.Text message := msg.Text
channel := msg.Channel channel := msg.Channel

3
gateway/gateway.go
View File

@ -192,9 +192,10 @@ func (gw *Gateway) handleMessage(msg config.Message, dest *bridge.Bridge) {
return return
} }
originchannel := msg.Channel originchannel := msg.Channel
origmsg := msg
for _, channel := range gw.DestChannelFunc(&msg, *dest) { for _, channel := range gw.DestChannelFunc(&msg, *dest) {
// do not send to ourself // do not send to ourself
if channel.ID == getChannelID(msg) { if channel.ID == getChannelID(origmsg) {
continue continue
} }
log.Debugf("Sending %#v from %s (%s) to %s (%s)", msg, msg.Account, originchannel, dest.Account, channel.Name) log.Debugf("Sending %#v from %s (%s) to %s (%s)", msg, msg.Account, originchannel, dest.Account, channel.Name)