diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
| commit | 69304fb54da5300941a49364e4344c2c65e654d6 (patch) | |
| tree | de20c2e8a479ae3d13bcd21abc3dff067afa602e /model/channel.go | |
| parent | e46b94fa66c029b9a493fdc6ff7bcb98e9651568 (diff) | |
| parent | 47f3c064db885c2cb2e75c195ea24e2ef687891d (diff) | |
| download | chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.gz chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.bz2 chat-69304fb54da5300941a49364e4344c2c65e654d6.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'model/channel.go')
| -rw-r--r-- | model/channel.go | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/model/channel.go b/model/channel.go index 5e5c741f3..950e910dd 100644 --- a/model/channel.go +++ b/model/channel.go @@ -32,21 +32,20 @@ const ( ) type Channel struct { - Id string `json:"id"` - CreateAt int64 `json:"create_at"` - UpdateAt int64 `json:"update_at"` - DeleteAt int64 `json:"delete_at"` - TeamId string `json:"team_id"` - Type string `json:"type"` - DisplayName string `json:"display_name"` - Name string `json:"name"` - Header string `json:"header"` - Purpose string `json:"purpose"` - LastPostAt int64 `json:"last_post_at"` - TotalMsgCount int64 `json:"total_msg_count"` - ExtraUpdateAt int64 `json:"extra_update_at"` - CreatorId string `json:"creator_id"` - SchemeId *string `json:"scheme_id"` + Id string `json:"id"` + CreateAt int64 `json:"create_at"` + UpdateAt int64 `json:"update_at"` + DeleteAt int64 `json:"delete_at"` + TeamId string `json:"team_id"` + Type string `json:"type"` + DisplayName string `json:"display_name"` + Name string `json:"name"` + Header string `json:"header"` + Purpose string `json:"purpose"` + LastPostAt int64 `json:"last_post_at"` + TotalMsgCount int64 `json:"total_msg_count"` + ExtraUpdateAt int64 `json:"extra_update_at"` + CreatorId string `json:"creator_id"` } type ChannelPatch struct { @@ -134,6 +133,7 @@ func (o *Channel) PreSave() { o.CreateAt = GetMillis() o.UpdateAt = o.CreateAt + o.ExtraUpdateAt = 0 } func (o *Channel) PreUpdate() { |