diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2015-07-13 17:47:57 -0400 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2015-07-17 15:22:57 -0400 |
| commit | 098cbcdc21effeebe7e57fbd912a785e85cbfc5d (patch) | |
| tree | fca1c712fe315ed49058de974b21efdaa0dd5b9c /api/team.go | |
| parent | abcb44089c421872de582584049ca4cc6b268f37 (diff) | |
| download | chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.tar.gz chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.tar.bz2 chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.zip | |
Unify all locations where we determine a user's display named based off of their nickname/username into a helper function
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/api/team.go b/api/team.go index dc7804b4d..7a4cabf7e 100644 --- a/api/team.go +++ b/api/team.go @@ -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) { |