commit 64d7265cae98845e7d24c73405ae52dc82190759
Author: Wim <wim@42.be>
Date: Sun Oct 23 22:23:20 2016 +0000
Launch every account only once. Fixes #48
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 2a9749d..685d292 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -10610 +1067 @@ func (b *Bmattermost) Protocol() string {
func (b *Bmattermost) Send(msg config.Message) error {
flog.Debugf("Receiving %#v", msg)
- if msg.FullOrigin != b.FullOrigin() {
- return b.SendType(msg.Username, msg.Text, msg.Channel, "")
- }
- return nil
+ return b.SendType(msg.Username, msg.Text, msg.Channel, "")
}
func (b *Bmattermost) SendType(nick string, message string, channel string, mtype string) error {
diff --git a/gateway/gateway.go b/gateway/gateway.go
index 45bb9e3..464a4d9 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -2612 +2612 @@ func New(cfg *config.Config, gateway *config.Gateway) error {
gw.MyConfig = gateway
exists := make(map[string]bool)
for _, br := range append(gateway.In, gateway.Out...) {
- if exists[br.Account+br.Channel] {
+ if exists[br.Account] {
continue
}
log.Infof("Starting bridge: %s channel: %s", br.Account, br.Channel)
gw.Bridges = append(gw.Bridges, bridge.New(cfg, &br, c))
- exists[br.Account+br.Channel] = true
+ exists[br.Account] = true
}
gw.mapChannels()
gw.mapIgnores()
@@ -10310 +10311 @@ func (gw *Gateway) handleMessage(msg config.Message, dest bridge.Bridge) {
if gw.ignoreMessage(&msg) {
return
}
+ originchannel := msg.Channel
channels := gw.getDestChannel(&msg, dest.FullOrigin())
for _, channel := range channels {
// 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() && channel == originchannel {
continue
}
msg.Channel = channel
@@ -1157 +1167 @@ func (gw *Gateway) handleMessage(msg config.Message, dest bridge.Bridge) {
return
}
gw.modifyMessage(&msg, dest)
- log.Debugf("Sending %#v from %s to %s", msg, msg.FullOrigin, dest.FullOrigin())
+ log.Debugf("Sending %#v from %s (%s) to %s (%s)", msg, msg.FullOrigin, originchannel, dest.FullOrigin(), channel)
err := dest.Send(msg)
if err != nil {
fmt.Println(err)
