From c09f1b9e4e5638080622ff9aa70735db382a16df Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Thu, 9 Jul 2015 13:59:19 -0400
Subject: Renamed FullName column in database to Nickname. Renamed all
 serverside references from FullName to Nickname.

---
 model/channel_extra.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'model/channel_extra.go')

diff --git a/model/channel_extra.go b/model/channel_extra.go
index a5c9acf71..d1579f905 100644
--- a/model/channel_extra.go
+++ b/model/channel_extra.go
@@ -10,7 +10,7 @@ import (
 
 type ExtraMember struct {
 	Id       string `json:"id"`
-	FullName string `json:"full_name"`
+	Nickname string `json:"nickname"`
 	Email    string `json:"email"`
 	Roles    string `json:"roles"`
 	Username string `json:"username"`
@@ -21,7 +21,7 @@ func (o *ExtraMember) Sanitize(options map[string]bool) {
 		o.Email = ""
 	}
 	if len(options) == 0 || !options["fullname"] {
-		o.FullName = ""
+		o.Nickname = ""
 	}
 }
 
-- 
cgit v1.2.3-1-g7c22


From 31415c8ddcc915c64c791ece2e2439883b7cf6ae Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Fri, 10 Jul 2015 16:52:32 -0400
Subject: Sanitize FirstName and LastName fields of an object instead of the
 nickname when ShowFullName is set to false

---
 model/channel_extra.go | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'model/channel_extra.go')

diff --git a/model/channel_extra.go b/model/channel_extra.go
index d1579f905..3a918b524 100644
--- a/model/channel_extra.go
+++ b/model/channel_extra.go
@@ -20,9 +20,6 @@ func (o *ExtraMember) Sanitize(options map[string]bool) {
 	if len(options) == 0 || !options["email"] {
 		o.Email = ""
 	}
-	if len(options) == 0 || !options["fullname"] {
-		o.Nickname = ""
-	}
 }
 
 type ChannelExtra struct {
-- 
cgit v1.2.3-1-g7c22