status-im
/
matterbridge
mirror of https://github.com/status-im/matterbridge.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Wim 2022-02-06 17:33:41 +01:00 committed by GitHub
parent c211152e23
commit c8d7fdeedc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/config/config.go
View File

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

12
bridge/mattermost/handlers.go
View File

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

4
matterbridge.toml.sample
View File

@ -408,6 +408,10 @@ SkipTLSVerify=true
## RELOADABLE SETTINGS ## RELOADABLE SETTINGS
## Settings below can be reloaded by editing the file ## 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. #how to format the list of IRC nicks when displayed in mattermost.
#Possible options are "table" and "plain" #Possible options are "table" and "plain"
#OPTIONAL (default plain) #OPTIONAL (default plain)