diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2015-09-30 12:28:28 -0400 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2015-10-01 08:31:17 -0400 |
| commit | c9a0030551f289241407743fbd21080cd8a358a4 (patch) | |
| tree | 03019a8ad970ebd66d7f5bd1a84d11fcdb76f1ff /model/channel_member.go | |
| parent | c16b9de8dc4924cf2fb243579284e67f55cf3a47 (diff) | |
| download | chat-c9a0030551f289241407743fbd21080cd8a358a4.tar.gz chat-c9a0030551f289241407743fbd21080cd8a358a4.tar.bz2 chat-c9a0030551f289241407743fbd21080cd8a358a4.zip | |
Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps
Diffstat (limited to 'model/channel_member.go')
| -rw-r--r-- | model/channel_member.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/model/channel_member.go b/model/channel_member.go index f4a9a9836..3ae612700 100644 --- a/model/channel_member.go +++ b/model/channel_member.go @@ -27,7 +27,6 @@ type ChannelMember struct { MsgCount int64 `json:"msg_count"` MentionCount int64 `json:"mention_count"` NotifyProps StringMap `json:"notify_props"` - NotifyLevel string `json:"notify_level"` LastUpdateAt int64 `json:"last_update_at"` } @@ -67,8 +66,9 @@ func (o *ChannelMember) IsValid() *AppError { } } - if len(o.NotifyLevel) > 20 || !IsChannelNotifyLevelValid(o.NotifyLevel) { - return NewAppError("ChannelMember.IsValid", "Invalid notify level", "notify_level="+o.NotifyLevel) + notifyLevel := o.NotifyProps["desktop"] + if len(notifyLevel) > 20 || !IsChannelNotifyLevelValid(notifyLevel) { + return NewAppError("ChannelMember.IsValid", "Invalid notify level", "notify_level="+notifyLevel) } markUnreadLevel := o.NotifyProps["mark_unread"] |