From 1dba330146a10718a2fc9eac0ae7d6e1d6bc0d79 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Tue, 14 Jul 2015 17:07:19 -0400
Subject: Use a user's full name as their display name if a nickname hasn't
 been specified

---
 model/user.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'model/user.go')

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
 	}
-- 
cgit v1.2.3-1-g7c22