From ee9395f1b6a70cc9d34bf116de38da4b70153158 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 31 Jan 2019 14:57:50 -0500 Subject: [PATCH] MM-13917 Enable post metadata by default (#10210) --- app/diagnostics.go | 2 +- app/post_metadata.go | 2 +- app/post_metadata_test.go | 8 ++++---- app/post_test.go | 6 +++--- config/default.json | 2 +- model/config.go | 6 +++--- utils/config.go | 4 +++- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/diagnostics.go b/app/diagnostics.go index 1a9d0dc937..76161ae899 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -514,7 +514,7 @@ func (a *App) trackConfig() { a.SendDiagnostic(TRACK_CONFIG_EXPERIMENTAL, map[string]interface{}{ "client_side_cert_enable": *cfg.ExperimentalSettings.ClientSideCertEnable, "isdefault_client_side_cert_check": isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.CLIENT_SIDE_CERT_CHECK_PRIMARY_AUTH), - "enable_post_metadata": *cfg.ExperimentalSettings.EnablePostMetadata, + "enable_post_metadata": !*cfg.ExperimentalSettings.DisablePostMetadata, "link_metadata_timeout_milliseconds": *cfg.ExperimentalSettings.LinkMetadataTimeoutMilliseconds, }) diff --git a/app/post_metadata.go b/app/post_metadata.go index d166af94c0..f27c7e821f 100644 --- a/app/post_metadata.go +++ b/app/post_metadata.go @@ -56,7 +56,7 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool) *mo // Proxy image links before constructing metadata so that requests go through the proxy post = a.PostWithProxyAddedToImageURLs(post) - if !*a.Config().ExperimentalSettings.EnablePostMetadata { + if *a.Config().ExperimentalSettings.DisablePostMetadata { return post } diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go index 4987a06100..1d40df4d7e 100644 --- a/app/post_metadata_test.go +++ b/app/post_metadata_test.go @@ -31,7 +31,7 @@ func TestPreparePostListForClient(t *testing.T) { defer th.TearDown() th.App.UpdateConfig(func(cfg *model.Config) { - *cfg.ExperimentalSettings.EnablePostMetadata = true + *cfg.ExperimentalSettings.DisablePostMetadata = false }) postList := model.NewPostList() @@ -65,7 +65,7 @@ func TestPreparePostForClient(t *testing.T) { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ImageProxySettings.Enable = false - *cfg.ExperimentalSettings.EnablePostMetadata = true + *cfg.ExperimentalSettings.DisablePostMetadata = false }) return th @@ -399,7 +399,7 @@ func TestPreparePostForClient(t *testing.T) { defer th.TearDown() th.App.UpdateConfig(func(cfg *model.Config) { - *cfg.ExperimentalSettings.EnablePostMetadata = false + *cfg.ExperimentalSettings.DisablePostMetadata = true }) post := th.CreatePost(th.BasicChannel) @@ -423,7 +423,7 @@ func TestPreparePostForClientWithImageProxy(t *testing.T) { *cfg.ImageProxySettings.ImageProxyType = "atmos/camo" *cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1" *cfg.ImageProxySettings.RemoteImageProxyOptions = "foo" - *cfg.ExperimentalSettings.EnablePostMetadata = true + *cfg.ExperimentalSettings.DisablePostMetadata = false }) return th diff --git a/app/post_test.go b/app/post_test.go index d45a46845a..4585f030d1 100644 --- a/app/post_test.go +++ b/app/post_test.go @@ -594,7 +594,7 @@ func TestCreatePost(t *testing.T) { defer th.TearDown() th.App.UpdateConfig(func(cfg *model.Config) { - *cfg.ExperimentalSettings.EnablePostMetadata = false + *cfg.ExperimentalSettings.DisablePostMetadata = true *cfg.ImageProxySettings.Enable = true *cfg.ImageProxySettings.ImageProxyType = "atmos/camo" *cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1" @@ -622,7 +622,7 @@ func TestPatchPost(t *testing.T) { defer th.TearDown() th.App.UpdateConfig(func(cfg *model.Config) { - *cfg.ExperimentalSettings.EnablePostMetadata = false + *cfg.ExperimentalSettings.DisablePostMetadata = true *cfg.ImageProxySettings.Enable = true *cfg.ImageProxySettings.ImageProxyType = "atmos/camo" *cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1" @@ -658,7 +658,7 @@ func TestUpdatePost(t *testing.T) { defer th.TearDown() th.App.UpdateConfig(func(cfg *model.Config) { - *cfg.ExperimentalSettings.EnablePostMetadata = false + *cfg.ExperimentalSettings.DisablePostMetadata = true *cfg.ImageProxySettings.Enable = true *cfg.ImageProxySettings.ImageProxyType = "atmos/camo" *cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1" diff --git a/config/default.json b/config/default.json index 0a010016e3..6c1df5d085 100644 --- a/config/default.json +++ b/config/default.json @@ -359,7 +359,7 @@ "ExperimentalSettings": { "ClientSideCertEnable": false, "ClientSideCertCheck": "secondary", - "EnablePostMetadata": false, + "DisablePostMetadata": false, "LinkMetadataTimeoutMilliseconds": 5000 }, "AnalyticsSettings": { diff --git a/model/config.go b/model/config.go index d7b30a9aa4..1832f91ded 100644 --- a/model/config.go +++ b/model/config.go @@ -701,7 +701,7 @@ func (s *MetricsSettings) SetDefaults() { type ExperimentalSettings struct { ClientSideCertEnable *bool ClientSideCertCheck *string - EnablePostMetadata *bool + DisablePostMetadata *bool LinkMetadataTimeoutMilliseconds *int64 } @@ -714,8 +714,8 @@ func (s *ExperimentalSettings) SetDefaults() { s.ClientSideCertCheck = NewString(CLIENT_SIDE_CERT_CHECK_SECONDARY_AUTH) } - if s.EnablePostMetadata == nil { - s.EnablePostMetadata = NewBool(false) + if s.DisablePostMetadata == nil { + s.DisablePostMetadata = NewBool(false) } if s.LinkMetadataTimeoutMilliseconds == nil { diff --git a/utils/config.go b/utils/config.go index 3646a2e0a6..df838e3cbf 100644 --- a/utils/config.go +++ b/utils/config.go @@ -454,7 +454,9 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["EnableTutorial"] = strconv.FormatBool(*c.ServiceSettings.EnableTutorial) props["ExperimentalEnableDefaultChannelLeaveJoinMessages"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages) props["ExperimentalGroupUnreadChannels"] = *c.ServiceSettings.ExperimentalGroupUnreadChannels - props["ExperimentalEnablePostMetadata"] = strconv.FormatBool(*c.ExperimentalSettings.EnablePostMetadata) + + // This setting is only temporary, so keep using the old setting name for the mobile and web apps + props["ExperimentalEnablePostMetadata"] = strconv.FormatBool(!*c.ExperimentalSettings.DisablePostMetadata) if *c.ServiceSettings.ExperimentalChannelOrganization || *c.ServiceSettings.ExperimentalGroupUnreadChannels != model.GROUP_UNREAD_CHANNELS_DISABLED { props["ExperimentalChannelOrganization"] = strconv.FormatBool(true)