diff options
| author | Patrick Connolly <patrick.c.connolly@gmail.com> | 2017-10-20 14:58:39 -0400 |
|---|---|---|
| committer | Wim <wim@42.be> | 2017-10-20 20:58:39 +0200 |
| commit | 915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2 (patch) | |
| tree | 500fc0477c2b9ef32eb751f7a6a53922a5ce5b3f /gateway/gateway.go | |
| parent | d4d7fef313ab1f26779845dddebd881739a7e95a (diff) | |
| download | matterbridge-msglm-915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2.tar.gz matterbridge-msglm-915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2.tar.bz2 matterbridge-msglm-915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2.zip | |
Make [general] settings default, not total override (specifically RemoteNickFormat) (#279)
* Use general settings as default, that specific protocols override.
* Fixed tab formatting.
* Clarified override precedence of [general] config.
Diffstat (limited to 'gateway/gateway.go')
| -rw-r--r-- | gateway/gateway.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gateway/gateway.go b/gateway/gateway.go index 663c3871..06eec560 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -243,9 +243,9 @@ func (gw *Gateway) ignoreMessage(msg *config.Message) bool { func (gw *Gateway) modifyUsername(msg config.Message, dest *bridge.Bridge) string { br := gw.Bridges[msg.Account] msg.Protocol = br.Protocol - nick := gw.Config.General.RemoteNickFormat + nick := dest.Config.RemoteNickFormat if nick == "" { - nick = dest.Config.RemoteNickFormat + nick = gw.Config.General.RemoteNickFormat } if len(msg.Username) > 0 { // fix utf-8 issue #193 |