4
0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-06-26 07:29:24 +00:00

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.
This commit is contained in:
Patrick Connolly
2017-10-20 14:58:39 -04:00
committed by Wim
parent d4d7fef313
commit 915a8fbad7
2 changed files with 3 additions and 3 deletions

View File

@ -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