From f90f1e3b75f5bb53716bf264a5957eab9e85f1d0 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 2 Apr 2026 15:53:47 +0200 Subject: [PATCH] Remove collections client-side feature flag (#38540) --- app/javascript/mastodon/features/collections/utils.ts | 10 ++-------- app/javascript/mastodon/utils/environment.ts | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/javascript/mastodon/features/collections/utils.ts b/app/javascript/mastodon/features/collections/utils.ts index 616d0297a7..60eb5133cb 100644 --- a/app/javascript/mastodon/features/collections/utils.ts +++ b/app/javascript/mastodon/features/collections/utils.ts @@ -1,11 +1,5 @@ -import { - isClientFeatureEnabled, - isServerFeatureEnabled, -} from '@/mastodon/utils/environment'; +import { isServerFeatureEnabled } from '@/mastodon/utils/environment'; export function areCollectionsEnabled() { - return ( - isClientFeatureEnabled('collections') && - isServerFeatureEnabled('collections') - ); + return isServerFeatureEnabled('collections'); } diff --git a/app/javascript/mastodon/utils/environment.ts b/app/javascript/mastodon/utils/environment.ts index ded0fe05bb..cdcb88d68b 100644 --- a/app/javascript/mastodon/utils/environment.ts +++ b/app/javascript/mastodon/utils/environment.ts @@ -18,7 +18,7 @@ export function isServerFeatureEnabled(feature: ServerFeatures) { return initialState?.features.includes(feature) ?? false; } -type ClientFeatures = 'collections'; +type ClientFeatures = never; export function isClientFeatureEnabled(feature: ClientFeatures) { try {