Add EnableDefaultChannelLeaveJoinMessages config setting (#7961)

1 files changed, 48 insertions, 47 deletions

diff --git a/app/diagnostics.go b/app/diagnostics.go
index 8fd7f9c85..2ef608ee3 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -190,53 +190,54 @@ func (a *App) trackActivity() {
 func (a *App) trackConfig() {
 	cfg := a.Config()
 	a.SendDiagnostic(TRACK_CONFIG_SERVICE, map[string]interface{}{
-		"web_server_mode":                                  *cfg.ServiceSettings.WebserverMode,
-		"enable_security_fix_alert":                        *cfg.ServiceSettings.EnableSecurityFixAlert,
-		"enable_insecure_outgoing_connections":             *cfg.ServiceSettings.EnableInsecureOutgoingConnections,
-		"enable_incoming_webhooks":                         cfg.ServiceSettings.EnableIncomingWebhooks,
-		"enable_outgoing_webhooks":                         cfg.ServiceSettings.EnableOutgoingWebhooks,
-		"enable_commands":                                  *cfg.ServiceSettings.EnableCommands,
-		"enable_only_admin_integrations":                   *cfg.ServiceSettings.EnableOnlyAdminIntegrations,
-		"enable_post_username_override":                    cfg.ServiceSettings.EnablePostUsernameOverride,
-		"enable_post_icon_override":                        cfg.ServiceSettings.EnablePostIconOverride,
-		"enable_apiv3":                                     *cfg.ServiceSettings.EnableAPIv3,
-		"enable_user_access_tokens":                        *cfg.ServiceSettings.EnableUserAccessTokens,
-		"enable_custom_emoji":                              *cfg.ServiceSettings.EnableCustomEmoji,
-		"enable_emoji_picker":                              *cfg.ServiceSettings.EnableEmojiPicker,
-		"experimental_enable_authentication_transfer":      *cfg.ServiceSettings.ExperimentalEnableAuthenticationTransfer,
-		"restrict_custom_emoji_creation":                   *cfg.ServiceSettings.RestrictCustomEmojiCreation,
-		"enable_testing":                                   cfg.ServiceSettings.EnableTesting,
-		"enable_developer":                                 *cfg.ServiceSettings.EnableDeveloper,
-		"enable_multifactor_authentication":                *cfg.ServiceSettings.EnableMultifactorAuthentication,
-		"enforce_multifactor_authentication":               *cfg.ServiceSettings.EnforceMultifactorAuthentication,
-		"enable_oauth_service_provider":                    cfg.ServiceSettings.EnableOAuthServiceProvider,
-		"connection_security":                              *cfg.ServiceSettings.ConnectionSecurity,
-		"uses_letsencrypt":                                 *cfg.ServiceSettings.UseLetsEncrypt,
-		"forward_80_to_443":                                *cfg.ServiceSettings.Forward80To443,
-		"maximum_login_attempts":                           *cfg.ServiceSettings.MaximumLoginAttempts,
-		"session_length_web_in_days":                       *cfg.ServiceSettings.SessionLengthWebInDays,
-		"session_length_mobile_in_days":                    *cfg.ServiceSettings.SessionLengthMobileInDays,
-		"session_length_sso_in_days":                       *cfg.ServiceSettings.SessionLengthSSOInDays,
-		"session_cache_in_minutes":                         *cfg.ServiceSettings.SessionCacheInMinutes,
-		"session_idle_timeout_in_minutes":                  *cfg.ServiceSettings.SessionIdleTimeoutInMinutes,
-		"isdefault_site_url":                               isDefault(*cfg.ServiceSettings.SiteURL, model.SERVICE_SETTINGS_DEFAULT_SITE_URL),
-		"isdefault_tls_cert_file":                          isDefault(*cfg.ServiceSettings.TLSCertFile, model.SERVICE_SETTINGS_DEFAULT_TLS_CERT_FILE),
-		"isdefault_tls_key_file":                           isDefault(*cfg.ServiceSettings.TLSKeyFile, model.SERVICE_SETTINGS_DEFAULT_TLS_KEY_FILE),
-		"isdefault_read_timeout":                           isDefault(*cfg.ServiceSettings.ReadTimeout, model.SERVICE_SETTINGS_DEFAULT_READ_TIMEOUT),
-		"isdefault_write_timeout":                          isDefault(*cfg.ServiceSettings.WriteTimeout, model.SERVICE_SETTINGS_DEFAULT_WRITE_TIMEOUT),
-		"isdefault_google_developer_key":                   isDefault(cfg.ServiceSettings.GoogleDeveloperKey, ""),
-		"isdefault_allow_cors_from":                        isDefault(*cfg.ServiceSettings.AllowCorsFrom, model.SERVICE_SETTINGS_DEFAULT_ALLOW_CORS_FROM),
-		"isdefault_allowed_untrusted_internal_connections": isDefault(*cfg.ServiceSettings.AllowedUntrustedInternalConnections, ""),
-		"restrict_post_delete":                             *cfg.ServiceSettings.RestrictPostDelete,
-		"allow_edit_post":                                  *cfg.ServiceSettings.AllowEditPost,
-		"post_edit_time_limit":                             *cfg.ServiceSettings.PostEditTimeLimit,
-		"enable_user_typing_messages":                      *cfg.ServiceSettings.EnableUserTypingMessages,
-		"enable_channel_viewed_messages":                   *cfg.ServiceSettings.EnableChannelViewedMessages,
-		"time_between_user_typing_updates_milliseconds":    *cfg.ServiceSettings.TimeBetweenUserTypingUpdatesMilliseconds,
-		"cluster_log_timeout_milliseconds":                 *cfg.ServiceSettings.ClusterLogTimeoutMilliseconds,
-		"enable_post_search":                               *cfg.ServiceSettings.EnablePostSearch,
-		"enable_user_statuses":                             *cfg.ServiceSettings.EnableUserStatuses,
-		"close_unused_direct_messages":                     *cfg.ServiceSettings.CloseUnusedDirectMessages,
+		"web_server_mode":                                         *cfg.ServiceSettings.WebserverMode,
+		"enable_security_fix_alert":                               *cfg.ServiceSettings.EnableSecurityFixAlert,
+		"enable_insecure_outgoing_connections":                    *cfg.ServiceSettings.EnableInsecureOutgoingConnections,
+		"enable_incoming_webhooks":                                cfg.ServiceSettings.EnableIncomingWebhooks,
+		"enable_outgoing_webhooks":                                cfg.ServiceSettings.EnableOutgoingWebhooks,
+		"enable_commands":                                         *cfg.ServiceSettings.EnableCommands,
+		"enable_only_admin_integrations":                          *cfg.ServiceSettings.EnableOnlyAdminIntegrations,
+		"enable_post_username_override":                           cfg.ServiceSettings.EnablePostUsernameOverride,
+		"enable_post_icon_override":                               cfg.ServiceSettings.EnablePostIconOverride,
+		"enable_apiv3":                                            *cfg.ServiceSettings.EnableAPIv3,
+		"enable_user_access_tokens":                               *cfg.ServiceSettings.EnableUserAccessTokens,
+		"enable_custom_emoji":                                     *cfg.ServiceSettings.EnableCustomEmoji,
+		"enable_emoji_picker":                                     *cfg.ServiceSettings.EnableEmojiPicker,
+		"experimental_enable_authentication_transfer":             *cfg.ServiceSettings.ExperimentalEnableAuthenticationTransfer,
+		"restrict_custom_emoji_creation":                          *cfg.ServiceSettings.RestrictCustomEmojiCreation,
+		"enable_testing":                                          cfg.ServiceSettings.EnableTesting,
+		"enable_developer":                                        *cfg.ServiceSettings.EnableDeveloper,
+		"enable_multifactor_authentication":                       *cfg.ServiceSettings.EnableMultifactorAuthentication,
+		"enforce_multifactor_authentication":                      *cfg.ServiceSettings.EnforceMultifactorAuthentication,
+		"enable_oauth_service_provider":                           cfg.ServiceSettings.EnableOAuthServiceProvider,
+		"connection_security":                                     *cfg.ServiceSettings.ConnectionSecurity,
+		"uses_letsencrypt":                                        *cfg.ServiceSettings.UseLetsEncrypt,
+		"forward_80_to_443":                                       *cfg.ServiceSettings.Forward80To443,
+		"maximum_login_attempts":                                  *cfg.ServiceSettings.MaximumLoginAttempts,
+		"session_length_web_in_days":                              *cfg.ServiceSettings.SessionLengthWebInDays,
+		"session_length_mobile_in_days":                           *cfg.ServiceSettings.SessionLengthMobileInDays,
+		"session_length_sso_in_days":                              *cfg.ServiceSettings.SessionLengthSSOInDays,
+		"session_cache_in_minutes":                                *cfg.ServiceSettings.SessionCacheInMinutes,
+		"session_idle_timeout_in_minutes":                         *cfg.ServiceSettings.SessionIdleTimeoutInMinutes,
+		"isdefault_site_url":                                      isDefault(*cfg.ServiceSettings.SiteURL, model.SERVICE_SETTINGS_DEFAULT_SITE_URL),
+		"isdefault_tls_cert_file":                                 isDefault(*cfg.ServiceSettings.TLSCertFile, model.SERVICE_SETTINGS_DEFAULT_TLS_CERT_FILE),
+		"isdefault_tls_key_file":                                  isDefault(*cfg.ServiceSettings.TLSKeyFile, model.SERVICE_SETTINGS_DEFAULT_TLS_KEY_FILE),
+		"isdefault_read_timeout":                                  isDefault(*cfg.ServiceSettings.ReadTimeout, model.SERVICE_SETTINGS_DEFAULT_READ_TIMEOUT),
+		"isdefault_write_timeout":                                 isDefault(*cfg.ServiceSettings.WriteTimeout, model.SERVICE_SETTINGS_DEFAULT_WRITE_TIMEOUT),
+		"isdefault_google_developer_key":                          isDefault(cfg.ServiceSettings.GoogleDeveloperKey, ""),
+		"isdefault_allow_cors_from":                               isDefault(*cfg.ServiceSettings.AllowCorsFrom, model.SERVICE_SETTINGS_DEFAULT_ALLOW_CORS_FROM),
+		"isdefault_allowed_untrusted_internal_connections":        isDefault(*cfg.ServiceSettings.AllowedUntrustedInternalConnections, ""),
+		"restrict_post_delete":                                    *cfg.ServiceSettings.RestrictPostDelete,
+		"allow_edit_post":                                         *cfg.ServiceSettings.AllowEditPost,
+		"post_edit_time_limit":                                    *cfg.ServiceSettings.PostEditTimeLimit,
+		"enable_user_typing_messages":                             *cfg.ServiceSettings.EnableUserTypingMessages,
+		"enable_channel_viewed_messages":                          *cfg.ServiceSettings.EnableChannelViewedMessages,
+		"time_between_user_typing_updates_milliseconds":           *cfg.ServiceSettings.TimeBetweenUserTypingUpdatesMilliseconds,
+		"cluster_log_timeout_milliseconds":                        *cfg.ServiceSettings.ClusterLogTimeoutMilliseconds,
+		"enable_post_search":                                      *cfg.ServiceSettings.EnablePostSearch,
+		"enable_user_statuses":                                    *cfg.ServiceSettings.EnableUserStatuses,
+		"close_unused_direct_messages":                            *cfg.ServiceSettings.CloseUnusedDirectMessages,
+		"experimental_enable_default_channel_leave_join_messages": *cfg.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages,
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{