Add UseUsername option (mattermost). Fixes #1665 (#1714)

bridge/config/config.go

@@ -170,7 +170,7 @@ type Protocol struct {
 	UseTLS                 bool       // IRC
 	UseDiscriminator       bool       // discord
 	UseFirstName           bool       // telegram
-	UseUserName            bool       // discord, matrix
+	UseUserName            bool       // discord, matrix, mattermost
 	UseInsecureURL         bool       // telegram
 	UserName               string     // IRC
 	VerboseJoinPart        bool       // IRC

bridge/mattermost/handlers.go

@@ -177,9 +177,11 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
 		}
 
 		// Use nickname instead of username if defined
+		if !b.GetBool("useusername") {
 			if nick := b.mc.GetNickName(rmsg.UserID); nick != "" {
 				rmsg.Username = nick
 			}
+		}
 
 		messages <- rmsg
 	}
@@ -232,9 +234,11 @@ func (b *Bmattermost) handleMatterClient6(messages chan *config.Message) {
 		}
 
 		// Use nickname instead of username if defined
+		if !b.GetBool("useusername") {
 			if nick := b.mc6.GetNickName(rmsg.UserID); nick != "" {
 				rmsg.Username = nick
 			}
+		}
 
 		messages <- rmsg
 	}

matterbridge.toml.sample

@@ -408,6 +408,10 @@ SkipTLSVerify=true
 ## RELOADABLE SETTINGS
 ## Settings below can be reloaded by editing the file
 
+# UseUserName shows the username instead of the server nickname
+# OPTIONAL (default false)
+UseUserName=false
+
 #how to format the list of IRC nicks when displayed in mattermost.
 #Possible options are "table" and "plain"
 #OPTIONAL (default plain)