mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
Unify all locations where we determine a user's display named based off of their nickname/username into a helper function
This commit is contained in:
@@ -487,12 +487,7 @@ func InviteMembers(team *model.Team, user *model.User, invites []string) {
|
||||
teamUrl = fmt.Sprintf("http://%v.%v", team.Domain, utils.Cfg.ServiceSettings.Domain)
|
||||
}
|
||||
|
||||
sender := ""
|
||||
if len(strings.TrimSpace(user.Nickname)) == 0 {
|
||||
sender = user.Username
|
||||
} else {
|
||||
sender = user.Nickname
|
||||
}
|
||||
sender := user.GetDisplayName()
|
||||
|
||||
senderRole := ""
|
||||
if strings.Contains(user.Roles, model.ROLE_ADMIN) || strings.Contains(user.Roles, model.ROLE_SYSTEM_ADMIN) {
|
||||
|
||||
Reference in New Issue
Block a user