mirror of
https://github.com/cwinfo/matterbridge.git
synced 2024-12-25 06:05:39 +00:00
Remove double username modify. Fixes #77
This commit is contained in:
parent
11def2edc0
commit
2d1316e32c
@ -4,7 +4,6 @@ import (
|
|||||||
"github.com/42wim/matterbridge/bridge"
|
"github.com/42wim/matterbridge/bridge"
|
||||||
"github.com/42wim/matterbridge/bridge/config"
|
"github.com/42wim/matterbridge/bridge/config"
|
||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type SameChannelGateway struct {
|
type SameChannelGateway struct {
|
||||||
@ -62,7 +61,6 @@ func (gw *SameChannelGateway) handleMessage(msg config.Message, dest bridge.Brid
|
|||||||
if msg.FullOrigin == dest.FullOrigin() {
|
if msg.FullOrigin == dest.FullOrigin() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
gw.modifyMessage(&msg, dest)
|
|
||||||
log.Debugf("Sending %#v from %s (%s) to %s (%s)", msg, msg.FullOrigin, msg.Channel, dest.FullOrigin(), msg.Channel)
|
log.Debugf("Sending %#v from %s (%s) to %s (%s)", msg, msg.FullOrigin, msg.Channel, dest.FullOrigin(), msg.Channel)
|
||||||
err := dest.Send(msg)
|
err := dest.Send(msg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -70,29 +68,6 @@ func (gw *SameChannelGateway) handleMessage(msg config.Message, dest bridge.Brid
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func setNickFormat(msg *config.Message, format string) {
|
|
||||||
if format == "" {
|
|
||||||
msg.Username = msg.Protocol + "." + msg.Origin + "-" + msg.Username + ": "
|
|
||||||
return
|
|
||||||
}
|
|
||||||
msg.Username = strings.Replace(format, "{NICK}", msg.Username, -1)
|
|
||||||
msg.Username = strings.Replace(msg.Username, "{BRIDGE}", msg.Origin, -1)
|
|
||||||
msg.Username = strings.Replace(msg.Username, "{PROTOCOL}", msg.Protocol, -1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (gw *SameChannelGateway) modifyMessage(msg *config.Message, dest bridge.Bridge) {
|
|
||||||
switch dest.Protocol() {
|
|
||||||
case "irc":
|
|
||||||
setNickFormat(msg, gw.Config.IRC[dest.Origin()].RemoteNickFormat)
|
|
||||||
case "mattermost":
|
|
||||||
setNickFormat(msg, gw.Config.Mattermost[dest.Origin()].RemoteNickFormat)
|
|
||||||
case "slack":
|
|
||||||
setNickFormat(msg, gw.Config.Slack[dest.Origin()].RemoteNickFormat)
|
|
||||||
case "discord":
|
|
||||||
setNickFormat(msg, gw.Config.Discord[dest.Origin()].RemoteNickFormat)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (gw *SameChannelGateway) validChannel(channel string) bool {
|
func (gw *SameChannelGateway) validChannel(channel string) bool {
|
||||||
for _, c := range gw.Channels {
|
for _, c := range gw.Channels {
|
||||||
if c == channel {
|
if c == channel {
|
||||||
|
Loading…
Reference in New Issue
Block a user