diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2018-07-11 09:01:49 -0400 |
|---|---|---|
| committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-07-11 15:01:49 +0200 |
| commit | 00abe3a13691c7f495392d98e966ca33d3adf888 (patch) | |
| tree | 405e79c82c1824ae57717e5044a225189e26e429 /model/user.go | |
| parent | 7ed712f938588491da35b1d04b7f44700975c70b (diff) | |
| download | chat-00abe3a13691c7f495392d98e966ca33d3adf888.tar.gz chat-00abe3a13691c7f495392d98e966ca33d3adf888.tar.bz2 chat-00abe3a13691c7f495392d98e966ca33d3adf888.zip | |
push notifications follow teammate name display user or server setting (#9049)
* push notifications follow teammate name display user or server setting
* Feedback review
Diffstat (limited to 'model/user.go')
| -rw-r--r-- | model/user.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/model/user.go b/model/user.go index c5d6c13b6..c4dbfb6d0 100644 --- a/model/user.go +++ b/model/user.go @@ -406,11 +406,11 @@ func (u *User) AddNotifyProp(key string, value string) { } func (u *User) GetFullName() string { - if u.FirstName != "" && u.LastName != "" { + if len(u.FirstName) > 0 && len(u.LastName) > 0 { return u.FirstName + " " + u.LastName - } else if u.FirstName != "" { + } else if len(u.FirstName) > 0 { return u.FirstName - } else if u.LastName != "" { + } else if len(u.LastName) > 0 { return u.LastName } else { return "" @@ -421,13 +421,13 @@ func (u *User) GetDisplayName(nameFormat string) string { displayName := u.Username if nameFormat == SHOW_NICKNAME_FULLNAME { - if u.Nickname != "" { + if len(u.Nickname) > 0 { displayName = u.Nickname - } else if fullName := u.GetFullName(); fullName != "" { + } else if fullName := u.GetFullName(); len(fullName) > 0 { displayName = fullName } } else if nameFormat == SHOW_FULLNAME { - if fullName := u.GetFullName(); fullName != "" { + if fullName := u.GetFullName(); len(fullName) > 0 { displayName = fullName } } |