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

blaboing · Feb 6, 2022 · c8d7fde · c8d7fde
1 parent c211152
commit c8d7fde
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/bridge/config/config.go b/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

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

diff --git a/matterbridge.toml.sample b/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)