From 1b1a9ce2503021c275a470c8da21d33bbdcf5681 Mon Sep 17 00:00:00 2001 From: Wim Date: Tue, 27 Jun 2017 00:28:18 +0200 Subject: [PATCH] Fix samechannel gateway issue. Closes #207 --- gateway/gateway.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gateway/gateway.go b/gateway/gateway.go index 7d53069c..be09ac76 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -5,6 +5,7 @@ import ( "github.com/42wim/matterbridge/bridge" "github.com/42wim/matterbridge/bridge/config" log "github.com/Sirupsen/logrus" + // "github.com/davecgh/go-spew/spew" "regexp" "strings" "time" @@ -181,6 +182,17 @@ func (gw *Gateway) getDestChannel(msg *config.Message, dest bridge.Bridge) []con if _, ok := gw.Channels[getChannelID(*msg)]; !ok { continue } + // add gateway to message + gw.validGatewayDest(msg, channel) + + // do samechannelgateway logic + if channel.SameChannel[msg.Gateway] { + if msg.Channel == channel.Name && msg.Account != dest.Account { + channels = append(channels, *channel) + } + continue + } + if channel.Direction == "out" && channel.Account == dest.Account && gw.validGatewayDest(msg, channel) { channels = append(channels, *channel) }