diff options
author | cpanato <ctadeu@gmail.com> | 2018-07-12 19:50:16 +0200 |
---|---|---|
committer | cpanato <ctadeu@gmail.com> | 2018-07-12 19:50:16 +0200 |
commit | adc56ae78df2a84c14c5e2921ec9cb14817a2474 (patch) | |
tree | a66d4646ecc3baef4d365f7148fe3921ab267e15 /model | |
parent | 8cad7070acc537d070edd1029fe0c6ce422ab0ed (diff) | |
parent | 2e861c4df4063f325df40861ee045c0136d34f1e (diff) | |
download | chat-adc56ae78df2a84c14c5e2921ec9cb14817a2474.tar.gz chat-adc56ae78df2a84c14c5e2921ec9cb14817a2474.tar.bz2 chat-adc56ae78df2a84c14c5e2921ec9cb14817a2474.zip |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180712
Diffstat (limited to 'model')
-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 e56f3aaed..f02b5afa1 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 } } |