diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-28 18:01:10 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-28 18:01:10 +0500 |
commit | 5d77ff4bcde3496554551701438c1f42550e58b3 (patch) | |
tree | b5ae06798661167b07286d381199c5de2004f300 /model | |
parent | 3dd541d3e09b99c60b892c37419dfa30b10700c7 (diff) | |
parent | 3a297135372c288b11c75acf6100d97c35c9dae3 (diff) | |
download | chat-5d77ff4bcde3496554551701438c1f42550e58b3.tar.gz chat-5d77ff4bcde3496554551701438c1f42550e58b3.tar.bz2 chat-5d77ff4bcde3496554551701438c1f42550e58b3.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'model')
-rw-r--r-- | model/message.go | 1 | ||||
-rw-r--r-- | model/session.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/model/message.go b/model/message.go index 52ee69e8f..ec4817b2a 100644 --- a/model/message.go +++ b/model/message.go @@ -16,6 +16,7 @@ const ( ACTION_VIEWED = "viewed" ACTION_NEW_USER = "new_user" ACTION_USER_ADDED = "user_added" + ACTION_USER_REMOVED = "user_removed" ) type Message struct { diff --git a/model/session.go b/model/session.go index 9fd3b9ec3..c812f83e2 100644 --- a/model/session.go +++ b/model/session.go @@ -10,9 +10,9 @@ import ( const ( SESSION_TOKEN = "MMSID" - SESSION_TIME_WEB_IN_DAYS = 365 + SESSION_TIME_WEB_IN_DAYS = 30 SESSION_TIME_WEB_IN_SECS = 60 * 60 * 24 * SESSION_TIME_WEB_IN_DAYS - SESSION_TIME_MOBILE_IN_DAYS = 365 + SESSION_TIME_MOBILE_IN_DAYS = 30 SESSION_TIME_MOBILE_IN_SECS = 60 * 60 * 24 * SESSION_TIME_MOBILE_IN_DAYS SESSION_CACHE_IN_SECS = 60 * 10 SESSION_CACHE_SIZE = 10000 |