diff --git a/server/channels/app/post_metadata.go b/server/channels/app/post_metadata.go index 8ad5887ca5..06d1123db6 100644 --- a/server/channels/app/post_metadata.go +++ b/server/channels/app/post_metadata.go @@ -292,7 +292,7 @@ func (a *App) getEmbedForPost(c request.CTX, post *model.Post, firstLink string, return nil, err } - if !*a.Config().ServiceSettings.EnablePermalinkPreviews || !a.Config().FeatureFlags.PermalinkPreviews { + if !*a.Config().ServiceSettings.EnablePermalinkPreviews { permalink = nil } @@ -582,7 +582,7 @@ func (a *App) getLinkMetadata(c request.CTX, requestURL string, timestamp int64, // Check cache og, image, permalink, ok := getLinkMetadataFromCache(requestURL, timestamp) - if !*a.Config().ServiceSettings.EnablePermalinkPreviews || !a.Config().FeatureFlags.PermalinkPreviews { + if !*a.Config().ServiceSettings.EnablePermalinkPreviews { permalink = nil } @@ -600,7 +600,7 @@ func (a *App) getLinkMetadata(c request.CTX, requestURL string, timestamp int64, } var err error - if looksLikeAPermalink(requestURL, a.GetSiteURL()) && *a.Config().ServiceSettings.EnablePermalinkPreviews && a.Config().FeatureFlags.PermalinkPreviews { + if looksLikeAPermalink(requestURL, a.GetSiteURL()) && *a.Config().ServiceSettings.EnablePermalinkPreviews { referencedPostID := requestURL[len(requestURL)-26:] referencedPost, appErr := a.GetSinglePost(referencedPostID, false) diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go index d9952bd8ed..e0b87daa49 100644 --- a/server/channels/app/post_metadata_test.go +++ b/server/channels/app/post_metadata_test.go @@ -2505,7 +2505,6 @@ func TestGetLinkMetadata(t *testing.T) { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnablePermalinkPreviews = true *cfg.ServiceSettings.SiteURL = server.URL - cfg.FeatureFlags.PermalinkPreviews = true }) requestURL := server.URL + "/pl/5rpoy4o3nbgwjm7gs4cm71h6ho" diff --git a/server/public/model/feature_flags.go b/server/public/model/feature_flags.go index 89cddd2333..f2d11fa729 100644 --- a/server/public/model/feature_flags.go +++ b/server/public/model/feature_flags.go @@ -73,7 +73,6 @@ func (f *FeatureFlags) SetDefaults() { f.AppsEnabled = true f.PluginApps = "" f.PluginFocalboard = "" - f.PermalinkPreviews = true f.BoardsFeatureFlags = "" f.BoardsDataRetention = false f.NormalizeLdapDNs = false