diff options
| author | Jonathan <jonfritz@gmail.com> | 2018-02-07 09:02:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 09:02:46 -0500 |
| commit | d3e934d07ac0a58a24a435ea7c5b3bd222ef509a (patch) | |
| tree | b356b134878ee8686326475b04c90317e195bf86 /model/channel_member_history.go | |
| parent | b2ee5077931013d308aaf60d790d341e2cb0c3e3 (diff) | |
| download | chat-d3e934d07ac0a58a24a435ea7c5b3bd222ef509a.tar.gz chat-d3e934d07ac0a58a24a435ea7c5b3bd222ef509a.tar.bz2 chat-d3e934d07ac0a58a24a435ea7c5b3bd222ef509a.zip | |
XYZ-35: Added Support for GlobalRelay Compliance Export Format
* Added username to ChannelMemberHistory struct in anticipation of supporting GlobalRelay in Compliance Export
* Removed translation from debug output - this makes it complicated to use utils functions from tests in the enterprise repo
* Added an advanced email function that allows for greater control over message details. Updated MessageExport config to support GlobalRelay. Added attachment support to InBucket unit tests
* Moving templates in from enterprise to solve test issues
* Added export format to diagnostics
* Changed email attachment code to use FileBackend so that S3 storage is properly supported
Diffstat (limited to 'model/channel_member_history.go')
| -rw-r--r-- | model/channel_member_history.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/model/channel_member_history.go b/model/channel_member_history.go index bc71b580a..47c59d54e 100644 --- a/model/channel_member_history.go +++ b/model/channel_member_history.go @@ -6,7 +6,10 @@ 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 } |