diff --git a/server/channels/app/post_priority.go b/server/channels/app/post_priority.go index f43ce45cf3..8bd0f5fa9b 100644 --- a/server/channels/app/post_priority.go +++ b/server/channels/app/post_priority.go @@ -34,5 +34,5 @@ func (a *App) GetPriorityForPostList(list *model.PostList) (map[string]*model.Po } func (a *App) IsPostPriorityEnabled() bool { - return a.Config().FeatureFlags.PostPriority && *a.Config().ServiceSettings.PostPriority + return *a.Config().ServiceSettings.PostPriority } diff --git a/server/channels/app/post_test.go b/server/channels/app/post_test.go index 7389b4ce63..26d900287c 100644 --- a/server/channels/app/post_test.go +++ b/server/channels/app/post_test.go @@ -2214,7 +2214,6 @@ func TestCountMentionsFromPost(t *testing.T) { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.PostPriority = true - cfg.FeatureFlags.PostPriority = true }) user1 := th.BasicUser diff --git a/server/config/client.go b/server/config/client.go index 60593731b1..7ed39094ba 100644 --- a/server/config/client.go +++ b/server/config/client.go @@ -214,7 +214,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["EnableCustomGroups"] = strconv.FormatBool(*c.ServiceSettings.EnableCustomGroups) } - if (license.SkuShortName == model.LicenseShortSkuProfessional || license.SkuShortName == model.LicenseShortSkuEnterprise) && c.FeatureFlags.PostPriority { + if license.SkuShortName == model.LicenseShortSkuProfessional || license.SkuShortName == model.LicenseShortSkuEnterprise { props["PostAcknowledgements"] = "true" } } diff --git a/server/public/model/feature_flags.go b/server/public/model/feature_flags.go index ed1f9994a7..5f2411330c 100644 --- a/server/public/model/feature_flags.go +++ b/server/public/model/feature_flags.go @@ -78,7 +78,6 @@ func (f *FeatureFlags) SetDefaults() { f.InsightsEnabled = false f.CommandPalette = false f.CallsEnabled = true - f.PostPriority = true f.PeopleProduct = false f.DeprecateCloudFree = false f.WysiwygEditor = false diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts index b898cc9019..dda1fffebf 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts @@ -7,7 +7,7 @@ import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentUser} from 'mattermost-redux/selectors/entities/common'; import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences'; import {getUsers, getCurrentUserId, getUserStatuses} from 'mattermost-redux/selectors/entities/users'; -import {getConfig, getFeatureFlagValue} from 'mattermost-redux/selectors/entities/general'; +import {getConfig} from 'mattermost-redux/selectors/entities/general'; import {getChannel} from 'mattermost-redux/selectors/entities/channels'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; @@ -765,10 +765,7 @@ export function getLimitedViews(state: GlobalState): GlobalState['entities']['po } export function isPostPriorityEnabled(state: GlobalState) { - return ( - getFeatureFlagValue(state, 'PostPriority') === 'true' && - getConfig(state).PostPriority === 'true' - ); + return getConfig(state).PostPriority === 'true'; } export function isPostAcknowledgementsEnabled(state: GlobalState) {