Use a user's full name as their display name if a nickname hasn't been specified

1 files changed, 14 insertions, 0 deletions

diff --git a/model/user.go b/model/user.go
index 5b603cd92..727165b8c 100644
--- a/model/user.go
+++ b/model/user.go
@@ -237,9 +237,23 @@ func (u *User) AddNotifyProp(key string, value string) {
 	u.NotifyProps[key] = value
 }
 
+func (u *User) GetFullName() string {
+	if u.FirstName != "" && u.LastName != "" {
+		return u.FirstName + " " + u.LastName
+	} else if u.FirstName != "" {
+		return u.FirstName
+	} else if u.LastName != "" {
+		return u.LastName
+	} else {
+		return ""
+	}
+}
+
 func (u *User) GetDisplayName() string {
 	if u.Nickname != "" {
 		return u.Nickname
+	} else if fullName := u.GetFullName(); fullName != "" {
+		return fullName
 	} else {
 		return u.Username
 	}