From 915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2 Mon Sep 17 00:00:00 2001
From: Patrick Connolly <patrick.c.connolly@gmail.com>
Date: Fri, 20 Oct 2017 14:58:39 -0400
Subject: [PATCH] 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.
---
 gateway/gateway.go       | 4 ++--
 matterbridge.toml.sample | 2 +-
 2 files changed, 3 insertions(+), 3 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
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 81bf1cc9..3586977f 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -773,7 +773,7 @@ RemoteNickFormat="{NICK}"
 ###################################################################
 #General configuration
 ###################################################################
-#Settings here override specific settings for each protocol
+# Settings here are defaults that each protocol can override
 [general]
 #RemoteNickFormat defines how remote users appear on this bridge 
 #The string "{NICK}" (case sensitive) will be replaced by the actual nick / username.