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

Connect only once to each bridge

Browse Source
This commit is contained in:
Wim 2016-09-19 23:05:49 +02:00
parent 596096d6da
commit 4737442185
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gateway/gateway.go
View File

@ -23,15 +23,27 @@ func New(cfg *config.Config, gateway *config.Gateway) error {
gw.Name = gateway.Name gw.Name = gateway.Name
gw.Config = cfg gw.Config = cfg
gw.MyConfig = gateway gw.MyConfig = gateway
for _, br := range gateway.In { exists := make(map[string]bool)
for _, br := range append(gateway.In, gateway.Out...) {
if exists[br.Account+br.Channel] {
continue
}
log.Infof("Starting bridge: %s channel: %s", br.Account, br.Channel)
gw.Bridges = append(gw.Bridges, bridge.New(cfg, &br, c)) gw.Bridges = append(gw.Bridges, bridge.New(cfg, &br, c))
exists[br.Account+br.Channel] = true
} }
gw.mapChannels() gw.mapChannels()
gw.mapIgnores() gw.mapIgnores()
exists = make(map[string]bool)
for _, br := range gw.Bridges { for _, br := range gw.Bridges {
br.Connect() br.Connect()
for _, channel := range gw.ChannelsOut[br.FullOrigin()] { for _, channel := range append(gw.ChannelsOut[br.FullOrigin()], gw.ChannelsIn[br.FullOrigin()]...) {
if exists[br.FullOrigin()+channel] {
continue
}
log.Infof("%s: joining %s", br.FullOrigin(), channel)
br.JoinChannel(channel) br.JoinChannel(channel)
exists[br.FullOrigin()+channel] = true
} }
} }
gw.handleReceive(c) gw.handleReceive(c)
@ -85,7 +97,6 @@ func (gw *Gateway) handleMessage(msg config.Message, dest bridge.Bridge) {
for _, channel := range channels { for _, channel := range channels {
// do not send the message to the bridge we come from if also the channel is the same // do not send the message to the bridge we come from if also the channel is the same
if msg.FullOrigin == dest.FullOrigin() && msg.Channel == channel { if msg.FullOrigin == dest.FullOrigin() && msg.Channel == channel {
log.Debug("continue", msg.Protocol, msg.Origin, dest.Protocol(), dest.Origin())
continue continue
} }
msg.Channel = channel msg.Channel = channel