summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-07-07 22:57:57 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-07-07 22:57:57 +0500
commit69e5898f4b48660a8eb5736eb23f9f63d464a90f (patch)
tree07cace5f0f5eca1858222b3aab96add2e865b8ca /model
parent14f02b770b5b5ea65003ae6e885d52d619a3f836 (diff)
parent4e856c29b20270997ef54bdcc4260ff28390873f (diff)
downloadchat-69e5898f4b48660a8eb5736eb23f9f63d464a90f.tar.gz
chat-69e5898f4b48660a8eb5736eb23f9f63d464a90f.tar.bz2
chat-69e5898f4b48660a8eb5736eb23f9f63d464a90f.zip
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'model')
-rw-r--r--model/post.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/model/post.go b/model/post.go
index d10a9f9fc..f6f33b1e8 100644
--- a/model/post.go
+++ b/model/post.go
@@ -9,7 +9,8 @@ import (
)
const (
- POST_DEFAULT = ""
+ POST_DEFAULT = ""
+ POST_JOIN_LEAVE = "join_leave"
)
type Post struct {
@@ -100,7 +101,7 @@ func (o *Post) IsValid() *AppError {
return NewAppError("Post.IsValid", "Invalid hashtags", "id="+o.Id)
}
- if !(o.Type == POST_DEFAULT) {
+ if !(o.Type == POST_DEFAULT || o.Type == POST_JOIN_LEAVE) {
return NewAppError("Post.IsValid", "Invalid type", "id="+o.Type)
}