diff options
| author | Wim <wim@42.be> | 2017-07-30 16:09:05 +0200 |
|---|---|---|
| committer | Wim <wim@42.be> | 2017-07-30 16:09:05 +0200 |
| commit | 12989bbd99768facafe5d77dec98ff2908502499 (patch) | |
| tree | 240bd84161474d023e7ff414de4b765e9ca180ca /gateway/gateway.go | |
| parent | 38d09dba2e02a3136ea202cea8b6df58dea19d1d (diff) | |
| download | matterbridge-msglm-12989bbd99768facafe5d77dec98ff2908502499.tar.gz matterbridge-msglm-12989bbd99768facafe5d77dec98ff2908502499.tar.bz2 matterbridge-msglm-12989bbd99768facafe5d77dec98ff2908502499.zip | |
Handle same account in multiple gateways better
Diffstat (limited to 'gateway/gateway.go')
| -rw-r--r-- | gateway/gateway.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gateway/gateway.go b/gateway/gateway.go index dfd0604a..86fa5723 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -170,7 +170,8 @@ func (gw *Gateway) handleMessage(msg config.Message, dest *bridge.Bridge) { } func (gw *Gateway) ignoreMessage(msg *config.Message) bool { - if gw.Router.getGatewayName(getChannelID(*msg)) != gw.Name { + // if we don't have the bridge, ignore it + if _, ok := gw.Bridges[msg.Account]; !ok { return true } if msg.Text == "" { @@ -240,7 +241,7 @@ func (gw *Gateway) modifyAvatar(msg config.Message, dest *bridge.Bridge) string func (gw *Gateway) modifyMessage(msg *config.Message) { // replace :emoji: to unicode msg.Text = emojilib.Replace(msg.Text) - msg.Gateway = gw.Router.getGatewayName(getChannelID(*msg)) + msg.Gateway = gw.Name } func getChannelID(msg config.Message) string { |