From bf1fdf92c71df29ddb7b0e31a00e218863c1158c Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 13 Feb 2018 15:17:29 -0500 Subject: XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) * Cherry-picking 7b2861de3a09cf00d00b0872cc537d54302c4bfa to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master * Renamed file to match existing scheme (cherry picked from commit 8c22c5c6c6f835a6e73faf19036bad2a51bb9127) --- model/channel_member_history_result.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 model/channel_member_history_result.go (limited to 'model/channel_member_history_result.go') 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 +} -- cgit v1.2.3-1-g7c22