IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix EnablChannelViewedMessages typo (#6822)

Browse Source 
* Update config.json

* Update config.go

* Update config.go

* Update channel.go

* Update post.go

* Update diagnostics.go

* Update config.go
This commit is contained in:
Jason Blais
2017-07-03 09:01:14 -04:00
committed by Joram Wilander
parent a6e9a7a38f
commit ac2c91c507
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/channel.go
View File

@@ -1091,7 +1091,7 @@ func UpdateChannelLastViewedAt(channelIds []string, userId string) *model.AppErr
return result.Err
}
if *utils.Cfg.ServiceSettings.EnablChannelViewedMessages {
if *utils.Cfg.ServiceSettings.EnableChannelViewedMessages {
for _, channelId := range channelIds {
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, "", "", userId, nil)
message.Add("channel_id", channelId)
@@ -1158,7 +1158,7 @@ func ViewChannel(view *model.ChannelView, userId string, clearPushNotifications
return result.Err
}
if *utils.Cfg.ServiceSettings.EnablChannelViewedMessages {
if *utils.Cfg.ServiceSettings.EnableChannelViewedMessages {
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, "", "", userId, nil)
message.Add("channel_id", view.ChannelId)
go Publish(message)

2
app/diagnostics.go
View File

@@ -189,7 +189,7 @@ func trackConfig() {
"allow_edit_post": *utils.Cfg.ServiceSettings.AllowEditPost,
"post_edit_time_limit": *utils.Cfg.ServiceSettings.PostEditTimeLimit,
"enable_user_typing_messages": *utils.Cfg.ServiceSettings.EnableUserTypingMessages,
"enable_channel_viewed_messages": *utils.Cfg.ServiceSettings.EnablChannelViewedMessages,
"enable_channel_viewed_messages": *utils.Cfg.ServiceSettings.EnableChannelViewedMessages,
"time_between_user_typing_updates_milliseconds": *utils.Cfg.ServiceSettings.TimeBetweenUserTypingUpdatesMilliseconds,
"cluster_log_timeout_milliseconds": *utils.Cfg.ServiceSettings.ClusterLogTimeoutMilliseconds,
"enable_post_search": *utils.Cfg.ServiceSettings.EnablePostSearch,

2
app/post.go
View File

@@ -49,7 +49,7 @@ func CreatePostAsUser(post *model.Post) (*model.Post, *model.AppError) {
l4g.Error(utils.T("api.post.create_post.last_viewed.error"), post.ChannelId, post.UserId, result.Err)
}
if *utils.Cfg.ServiceSettings.EnablChannelViewedMessages {
if *utils.Cfg.ServiceSettings.EnableChannelViewedMessages {
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, "", "", post.UserId, nil)
message.Add("channel_id", post.ChannelId)
go Publish(message)

4
config/config.json
View File

@@ -45,7 +45,7 @@
"EnablePostSearch": true,
"EnableUserTypingMessages": true,
"EnableUserStatuses": true,
"EnablChannelViewedMessages": true,
"EnableChannelViewedMessages": true,
"ClusterLogTimeoutMilliseconds": 2000
},
"ElasticSearchSettings": {
@@ -287,4 +287,4 @@
"DataRetentionSettings": {
"Enable": false
}
}
}

8
model/config.go
View File

@@ -165,7 +165,7 @@ type ServiceSettings struct {
TimeBetweenUserTypingUpdatesMilliseconds *int64
EnablePostSearch *bool
EnableUserTypingMessages *bool
EnablChannelViewedMessages *bool
EnableChannelViewedMessages *bool
EnableUserStatuses *bool
ClusterLogTimeoutMilliseconds *int
}
@@ -1314,9 +1314,9 @@ func (o *Config) SetDefaults() {
*o.ServiceSettings.EnableUserTypingMessages = true
}
if o.ServiceSettings.EnablChannelViewedMessages == nil {
o.ServiceSettings.EnablChannelViewedMessages = new(bool)
*o.ServiceSettings.EnablChannelViewedMessages = true
if o.ServiceSettings.EnableChannelViewedMessages == nil {
o.ServiceSettings.EnableChannelViewedMessages = new(bool)
*o.ServiceSettings.EnableChannelViewedMessages = true
}
if o.ServiceSettings.EnableUserStatuses == nil {

2
utils/config.go
View File

@@ -474,7 +474,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["MaxNotificationsPerChannel"] = strconv.FormatInt(*c.TeamSettings.MaxNotificationsPerChannel, 10)
props["TimeBetweenUserTypingUpdatesMilliseconds"] = strconv.FormatInt(*c.ServiceSettings.TimeBetweenUserTypingUpdatesMilliseconds, 10)
props["EnableUserTypingMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableUserTypingMessages)
props["EnablChannelViewedMessages"] = strconv.FormatBool(*c.ServiceSettings.EnablChannelViewedMessages)
props["EnableChannelViewedMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableChannelViewedMessages)
props["DiagnosticId"] = CfgDiagnosticId
props["DiagnosticsEnabled"] = strconv.FormatBool(*c.LogSettings.EnableDiagnostics)