commit 50dae56cc521d6155dff0140f3d4ade04528490f
Author: Wim <wim@42.be>
Date: Sun Nov 20 23:50:12 2016 +0000
Add support for RemoteNickFormat in general configuration (samechannelgateway)
diff --git a/gateway/samechannel/samechannel.go b/gateway/samechannel/samechannel.go
index a4777a6..5ea58b8 100644
--- a/gateway/samechannel/samechannel.go
+++ b/gateway/samechannel/samechannel.go
@@ -737 +7310 @@ func (gw *SameChannelGateway) handleMessage(msg config.Message, dest *bridge.Bri
func (gw *SameChannelGateway) modifyUsername(msg *config.Message, dest *bridge.Bridge) {
br := gw.Bridges[msg.Account]
- nick := dest.Config.RemoteNickFormat
+ nick := gw.Config.General.RemoteNickFormat
+ if nick == "" {
+ nick = dest.Config.RemoteNickFormat
+ }
nick = strings.Replace(nick, "{NICK}", msg.Username, -1)
nick = strings.Replace(nick, "{BRIDGE}", br.Name, -1)
nick = strings.Replace(nick, "{PROTOCOL}", br.Protocol, -1)
