diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-02-14 08:53:25 -0500 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-02-14 08:53:25 -0500 |
commit | 642d78173af8cf600cdf81a341d87e75e7854172 (patch) | |
tree | f02ffb39d35c76319607b1b96e896a3db35ee746 /model | |
parent | bfb2e85bf6d31a0b2b35a9b4369a94c479b371d9 (diff) | |
parent | bf1fdf92c71df29ddb7b0e31a00e218863c1158c (diff) | |
download | chat-642d78173af8cf600cdf81a341d87e75e7854172.tar.gz chat-642d78173af8cf600cdf81a341d87e75e7854172.tar.bz2 chat-642d78173af8cf600cdf81a341d87e75e7854172.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'model')
-rw-r--r-- | model/channel_member_history.go | 4 | ||||
-rw-r--r-- | model/channel_member_history_result.go | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/model/channel_member_history.go b/model/channel_member_history.go index 47c59d54e..55435c320 100644 --- a/model/channel_member_history.go +++ b/model/channel_member_history.go @@ -8,8 +8,4 @@ type ChannelMemberHistory struct { UserId string 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 } diff --git a/model/channel_member_history_result.go b/model/channel_member_history_result.go new file mode 100644 index 000000000..ed3e79639 --- /dev/null +++ b/model/channel_member_history_result.go @@ -0,0 +1,15 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package model + +type ChannelMemberHistoryResult struct { + ChannelId string + UserId string + 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 +} |