diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 16:13:01 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 16:13:01 -0500 |
| commit | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (patch) | |
| tree | 5e1653318a6a14bcad80025793adab0f700deed9 /model/channel_member_history.go | |
| parent | 62efb1df754bfe6b10a3c17ca6f89fd33b991f56 (diff) | |
| parent | c209e4457457edc042f063390c9a222a694f3a6d (diff) | |
| download | chat-32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c.tar.gz chat-32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c.tar.bz2 chat-32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c.zip | |
Merge branch 'release-4.7-revertmaster' into release-4.7
Diffstat (limited to 'model/channel_member_history.go')
| -rw-r--r-- | model/channel_member_history.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/model/channel_member_history.go b/model/channel_member_history.go index 47c59d54e..bc71b580a 100644 --- a/model/channel_member_history.go +++ b/model/channel_member_history.go @@ -6,10 +6,7 @@ package model type ChannelMemberHistory struct { ChannelId string UserId string + UserEmail string `db:"Email"` JoinTime int64 LeaveTime *int64 - - // these two fields are never set in the database - when we SELECT, we join on Users to get them - UserEmail string `db:"Email"` - Username string } |