summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-04-28 10:10:58 -0400
committerChristopher Speller <crspeller@gmail.com>2017-04-28 10:10:58 -0400
commit1b82d98cdbb4e02d7de36c842efd858daaa69406 (patch)
tree02c8a0565e4687984dc088d950fb62ed4a0cb085 /model
parenta8cf08d6ef2fc0e08592e1466abaf3e3c9c35953 (diff)
downloadchat-1b82d98cdbb4e02d7de36c842efd858daaa69406.tar.gz
chat-1b82d98cdbb4e02d7de36c842efd858daaa69406.tar.bz2
chat-1b82d98cdbb4e02d7de36c842efd858daaa69406.zip
Add config setting to disable statuses (#6254)
Diffstat (limited to 'model')
-rw-r--r--model/config.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go
index 0c3307a06..d9910addb 100644
--- a/model/config.go
+++ b/model/config.go
@@ -153,6 +153,7 @@ type ServiceSettings struct {
TimeBetweenUserTypingUpdatesMilliseconds *int64
EnablePostSearch *bool
EnableUserTypingMessages *bool
+ EnableUserStatuses *bool
ClusterLogTimeoutMilliseconds *int
}
@@ -1163,6 +1164,11 @@ func (o *Config) SetDefaults() {
*o.ServiceSettings.EnableUserTypingMessages = true
}
+ if o.ServiceSettings.EnableUserStatuses == nil {
+ o.ServiceSettings.EnableUserStatuses = new(bool)
+ *o.ServiceSettings.EnableUserStatuses = true
+ }
+
if o.ServiceSettings.ClusterLogTimeoutMilliseconds == nil {
o.ServiceSettings.ClusterLogTimeoutMilliseconds = new(int)
*o.ServiceSettings.ClusterLogTimeoutMilliseconds = 2000