summaryrefslogtreecommitdiffstats
path: root/model/channel_extra.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-17 14:01:01 -0800
committerCorey Hulen <corey@hulen.com>2015-07-17 14:01:01 -0800
commitb306ec84378b36372b5465c09233094314789bf2 (patch)
tree1995d12ac34a4c6ba459884c84cb28b62d62b296 /model/channel_extra.go
parent66c22d342fa42068382c9e80427ea953676357db (diff)
parent1dba330146a10718a2fc9eac0ae7d6e1d6bc0d79 (diff)
downloadchat-b306ec84378b36372b5465c09233094314789bf2.tar.gz
chat-b306ec84378b36372b5465c09233094314789bf2.tar.bz2
chat-b306ec84378b36372b5465c09233094314789bf2.zip
Merge pull request #177 from hmhealey/mm825
MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname
Diffstat (limited to 'model/channel_extra.go')
-rw-r--r--model/channel_extra.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/model/channel_extra.go b/model/channel_extra.go
index a5c9acf71..3a918b524 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"`
@@ -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.FullName = ""
- }
}
type ChannelExtra struct {