From ac0bacbcc06994b9b9eb5cd3c4112e4c2accb234 Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Fri, 29 May 2026 15:07:00 +0200
Subject: [PATCH] [Glitch] Remove frontend check for collections feature flag

Port 7fba458d9227bea224a6c779f895c4945005f074 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/empty_message.tsx              |  78 +++++--------
 .../features/account_featured/index.tsx       | 106 ++++++++----------
 .../collections/overview/created_by_you.tsx   |   3 +-
 .../collections/overview/featuring_you.tsx    |   3 +-
 .../glitch/features/collections/utils.ts      |   5 -
 .../features/navigation_panel/index.tsx       |  23 ++--
 .../features/ui/components/block_modal.jsx    |  11 +-
 .../flavours/glitch/features/ui/index.jsx     |  11 +-
 .../flavours/glitch/utils/environment.ts      |   2 +-
 9 files changed, 98 insertions(+), 144 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/account_featured/components/empty_message.tsx b/app/javascript/flavours/glitch/features/account_featured/components/empty_message.tsx
index 2b29bf4238..4eb367fb14 100644
--- a/app/javascript/flavours/glitch/features/account_featured/components/empty_message.tsx
+++ b/app/javascript/flavours/glitch/features/account_featured/components/empty_message.tsx
@@ -9,7 +9,6 @@ import { Button } from '@/flavours/glitch/components/button';
 import { DisplayName } from '@/flavours/glitch/components/display_name';
 import { EmptyState } from '@/flavours/glitch/components/empty_state';
 import { LimitedAccountHint } from '@/flavours/glitch/components/limited_account_hint';
-import { areCollectionsEnabled } from '@/flavours/glitch/features/collections/utils';
 import { useAccount } from '@/flavours/glitch/hooks/useAccount';
 import { useCurrentAccountId } from '@/flavours/glitch/hooks/useAccountId';
 import { useAppDispatch } from '@/flavours/glitch/store';
@@ -50,56 +49,39 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
   let title: React.ReactNode = null;
   let message: React.ReactNode = null;
 
-  const hasCollections = areCollectionsEnabled();
-
   if (me === accountId) {
-    if (hasCollections) {
-      // Return only here to insert the "Create a collection" button as the action for the empty state.
-      return (
-        <EmptyState
-          title={
+    // Return only here to insert the "Create a collection" button as the action for the empty state.
+    return (
+      <EmptyState
+        title={
+          <FormattedMessage
+            id='empty_column.account_featured_self.showcase_accounts'
+            defaultMessage='Showcase your favorite accounts'
+          />
+        }
+        message={
+          <FormattedMessage
+            id='empty_column.account_featured_self.showcase_accounts_desc'
+            defaultMessage='Collections are curated lists of accounts to help others discover more of the Fediverse.'
+          />
+        }
+      >
+        {!withoutAddCollectionButton && (
+          <Link to='/collections/new' className='button'>
             <FormattedMessage
-              id='empty_column.account_featured_self.showcase_accounts'
-              defaultMessage='Showcase your favorite accounts'
+              id='empty_column.account_featured_self.no_collections_button'
+              defaultMessage='Create a collection'
             />
-          }
-          message={
-            <FormattedMessage
-              id='empty_column.account_featured_self.showcase_accounts_desc'
-              defaultMessage='Collections are curated lists of accounts to help others discover more of the Fediverse.'
-            />
-          }
-        >
-          {!withoutAddCollectionButton && (
-            <Link to='/collections/new' className='button'>
-              <FormattedMessage
-                id='empty_column.account_featured_self.no_collections_button'
-                defaultMessage='Create a collection'
-              />
-            </Link>
-          )}
-          <Button secondary onClick={confirmHideFeaturedTab}>
-            <FormattedMessage
-              id='empty_column.account_featured_self.no_collections_hide_tab'
-              defaultMessage='Hide this tab instead'
-            />
-          </Button>
-        </EmptyState>
-      );
-    } else {
-      title = (
-        <FormattedMessage
-          id='empty_column.account_featured_self.pre_collections'
-          defaultMessage='Stay tuned for Collections'
-        />
-      );
-      message = (
-        <FormattedMessage
-          id='empty_column.account_featured_self.pre_collections_desc'
-          defaultMessage='Collections (coming in Mastodon 4.6) allow you to create your own curated lists of accounts to recommend to others.'
-        />
-      );
-    }
+          </Link>
+        )}
+        <Button secondary onClick={confirmHideFeaturedTab}>
+          <FormattedMessage
+            id='empty_column.account_featured_self.no_collections_hide_tab'
+            defaultMessage='Hide this tab instead'
+          />
+        </Button>
+      </EmptyState>
+    );
   } else if (suspended) {
     title = (
       <FormattedMessage
diff --git a/app/javascript/flavours/glitch/features/account_featured/index.tsx b/app/javascript/flavours/glitch/features/account_featured/index.tsx
index 5baec61f63..3a5d2a006e 100644
--- a/app/javascript/flavours/glitch/features/account_featured/index.tsx
+++ b/app/javascript/flavours/glitch/features/account_featured/index.tsx
@@ -30,13 +30,10 @@ import AddIcon from '@/material-icons/400-24px/add.svg?react';
 
 import { CollectionListItem } from '../collections/components/collection_list_item';
 import { useCollectionsCreatedBy } from '../collections/overview/created_by_you';
-import { areCollectionsEnabled } from '../collections/utils';
 
 import { EmptyMessage } from './components/empty_message';
 import { Subheading, SubheadingLink } from './components/subheading';
 
-const collectionsEnabled = areCollectionsEnabled();
-
 const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
   multiColumn,
 }) => {
@@ -98,14 +95,11 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
   );
 
   const hasCollections =
-    collectionsEnabled &&
-    collectionsLoadStatus === 'idle' &&
-    listedCollections.length > 0;
+    collectionsLoadStatus === 'idle' && listedCollections.length > 0;
 
   const hasFeaturedAccounts = !featuredAccountIds.isEmpty();
 
-  const isLoading =
-    !accountId || (collectionsEnabled && collectionsLoadStatus !== 'idle');
+  const isLoading = !accountId || collectionsLoadStatus !== 'idle';
 
   if (accountId === null) {
     return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;
@@ -165,57 +159,53 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
             </ItemList>
           </>
         )}
-        {collectionsEnabled && (
-          <>
-            <Subheading as='header'>
-              <h2>
-                <FormattedMessage
-                  id='account.featured.collections'
-                  defaultMessage='Collections'
-                />
-              </h2>
-              {accountId === me && (
-                <SubheadingLink to='/collections/new' icon={AddIcon}>
-                  <FormattedMessage
-                    id='account.featured.new_collection'
-                    defaultMessage='New collection'
-                  />
-                </SubheadingLink>
-              )}
-            </Subheading>
-            {hasCollections ? (
-              <ItemList>
-                <TruncatedListItems
-                  visibleItems={listedCollections}
-                  truncatedItems={unlistedCollections}
-                  toggleButton={{
-                    title: (
-                      <FormattedMessage
-                        id='collections.unlisted_collections_with_count'
-                        defaultMessage='Unlisted collections ({count})'
-                        values={{ count: unlistedCollections.length }}
-                      />
-                    ),
-                    subtitle: (
-                      <FormattedMessage
-                        id='collections.unlisted_collections_description'
-                        defaultMessage='These don’t appear on your profile to others. Anyone with the link can discover them.'
-                      />
-                    ),
-                  }}
-                  renderListItem={renderListItem}
-                />
-              </ItemList>
-            ) : (
-              <EmptyMessage
-                withoutAddCollectionButton
-                blockedBy={blockedBy}
-                hidden={hidden}
-                suspended={suspended}
-                accountId={accountId}
+        <Subheading as='header'>
+          <h2>
+            <FormattedMessage
+              id='account.featured.collections'
+              defaultMessage='Collections'
+            />
+          </h2>
+          {accountId === me && (
+            <SubheadingLink to='/collections/new' icon={AddIcon}>
+              <FormattedMessage
+                id='account.featured.new_collection'
+                defaultMessage='New collection'
               />
-            )}
-          </>
+            </SubheadingLink>
+          )}
+        </Subheading>
+        {hasCollections ? (
+          <ItemList>
+            <TruncatedListItems
+              visibleItems={listedCollections}
+              truncatedItems={unlistedCollections}
+              toggleButton={{
+                title: (
+                  <FormattedMessage
+                    id='collections.unlisted_collections_with_count'
+                    defaultMessage='Unlisted collections ({count})'
+                    values={{ count: unlistedCollections.length }}
+                  />
+                ),
+                subtitle: (
+                  <FormattedMessage
+                    id='collections.unlisted_collections_description'
+                    defaultMessage='These don’t appear on your profile to others. Anyone with the link can discover them.'
+                  />
+                ),
+              }}
+              renderListItem={renderListItem}
+            />
+          </ItemList>
+        ) : (
+          <EmptyMessage
+            withoutAddCollectionButton
+            blockedBy={blockedBy}
+            hidden={hidden}
+            suspended={suspended}
+            accountId={accountId}
+          />
         )}
         <RemoteHint accountId={accountId} />
       </Scrollable>
diff --git a/app/javascript/flavours/glitch/features/collections/overview/created_by_you.tsx b/app/javascript/flavours/glitch/features/collections/overview/created_by_you.tsx
index d7372dbff9..9f6d5f4b98 100644
--- a/app/javascript/flavours/glitch/features/collections/overview/created_by_you.tsx
+++ b/app/javascript/flavours/glitch/features/collections/overview/created_by_you.tsx
@@ -26,7 +26,6 @@ import {
   userCollectionLimit,
 } from '../editor';
 import classes from '../styles.module.scss';
-import { areCollectionsEnabled } from '../utils';
 
 const CreateButton: React.FC = () => (
   <Link to='/collections/new' className='button button--compact'>
@@ -52,7 +51,7 @@ export function useCollectionsCreatedBy(accountId: string | null | undefined) {
   const dispatch = useAppDispatch();
 
   useEffect(() => {
-    if (accountId && areCollectionsEnabled()) {
+    if (accountId) {
       void dispatch(fetchCollectionsCreatedByAccount({ accountId }));
     }
   }, [dispatch, accountId]);
diff --git a/app/javascript/flavours/glitch/features/collections/overview/featuring_you.tsx b/app/javascript/flavours/glitch/features/collections/overview/featuring_you.tsx
index 99ddab114f..718c820bdc 100644
--- a/app/javascript/flavours/glitch/features/collections/overview/featuring_you.tsx
+++ b/app/javascript/flavours/glitch/features/collections/overview/featuring_you.tsx
@@ -15,7 +15,6 @@ import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 import { CollectionListItem } from '../components/collection_list_item';
 import classes from '../styles.module.scss';
-import { areCollectionsEnabled } from '../utils';
 
 import { CollectionListError } from './created_by_you';
 
@@ -23,7 +22,7 @@ function useCollectionsFeaturing(accountId: string | null | undefined) {
   const dispatch = useAppDispatch();
 
   useEffect(() => {
-    if (accountId && areCollectionsEnabled()) {
+    if (accountId) {
       void dispatch(fetchCollectionsFeaturingAccount({ accountId }));
     }
   }, [dispatch, accountId]);
diff --git a/app/javascript/flavours/glitch/features/collections/utils.ts b/app/javascript/flavours/glitch/features/collections/utils.ts
index 7a5e48c722..7a50d4c6c4 100644
--- a/app/javascript/flavours/glitch/features/collections/utils.ts
+++ b/app/javascript/flavours/glitch/features/collections/utils.ts
@@ -1,10 +1,5 @@
 import type { ApiAccountJSON } from '@/flavours/glitch/api_types/accounts';
 import type { Account } from '@/flavours/glitch/models/account';
-import { isServerFeatureEnabled } from '@/flavours/glitch/utils/environment';
-
-export function areCollectionsEnabled() {
-  return isServerFeatureEnabled('collections');
-}
 
 export const getCollectionPath = (id: string) => `/collections/${id}`;
 
diff --git a/app/javascript/flavours/glitch/features/navigation_panel/index.tsx b/app/javascript/flavours/glitch/features/navigation_panel/index.tsx
index dfd65ffa0c..e83a96dfd2 100644
--- a/app/javascript/flavours/glitch/features/navigation_panel/index.tsx
+++ b/app/javascript/flavours/glitch/features/navigation_panel/index.tsx
@@ -56,7 +56,6 @@ import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/n
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 import { AnnualReportNavItem } from '../annual_report/nav_item';
-import { areCollectionsEnabled } from '../collections/utils';
 
 import { DisabledAccountBanner } from './components/disabled_account_banner';
 import { FollowedTagsPanel } from './components/followed_tags_panel';
@@ -387,18 +386,16 @@ export const NavigationPanel: React.FC<{ multiColumn?: boolean }> = ({
                 text={intl.formatMessage(messages.bookmarks)}
               />
             </li>
-            {areCollectionsEnabled() && (
-              <li>
-                <ColumnLink
-                  transparent
-                  to={`/@${account?.acct}/collections`}
-                  icon='collections'
-                  iconComponent={CollectionsIcon}
-                  activeIconComponent={CollectionsActiveIcon}
-                  text={intl.formatMessage(messages.collections)}
-                />
-              </li>
-            )}
+            <li>
+              <ColumnLink
+                transparent
+                to={`/@${account?.acct}/collections`}
+                icon='collections'
+                iconComponent={CollectionsIcon}
+                activeIconComponent={CollectionsActiveIcon}
+                text={intl.formatMessage(messages.collections)}
+              />
+            </li>
             <li>
               <ColumnLink
                 transparent
diff --git a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
index ecb9846df1..7e58bea2ce 100644
--- a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
@@ -17,7 +17,6 @@ import { blockAccount } from 'flavours/glitch/actions/accounts';
 import { closeModal } from 'flavours/glitch/actions/modal';
 import { Button } from 'flavours/glitch/components/button';
 import { Icon } from 'flavours/glitch/components/icon';
-import { areCollectionsEnabled } from '../../collections/utils';
 
 export const BlockModal = ({ accountId, acct }) => {
   const dispatch = useDispatch();
@@ -73,12 +72,10 @@ export const BlockModal = ({ accountId, acct }) => {
             <div><FormattedMessage id='block_modal.they_cant_mention' defaultMessage="You can't mention, follow, or quote each other." /></div>
           </li>
 
-          {areCollectionsEnabled() && 
-            <li>
-              <div className='safety-action-modal__bullet-points__icon'><Icon icon={CollectionsIcon} /></div>
-              <div><FormattedMessage id='block_modal.no_collections' defaultMessage="Neither of you can add each other to collections. You'll be automatically removed from each others' existing collections, if applicable." /></div>
-            </li>
-          }
+          <li>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CollectionsIcon} /></div>
+            <div><FormattedMessage id='block_modal.no_collections' defaultMessage="Neither of you can add each other to collections. You'll be automatically removed from each others' existing collections, if applicable." /></div>
+          </li>
         </ul>
       </div>
 
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 41329d3196..e973167880 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -96,7 +96,6 @@ import { CustomHomepage } from 'flavours/glitch/features/custom_homepage';
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
 import '../../components/status';
-import { areCollectionsEnabled } from '../collections/utils';
 import { getNavigationSkipLinkId, SkipLinks } from './components/skip_links';
 
 const messages = defineMessages({
@@ -243,13 +242,9 @@ class SwitchingColumnsArea extends PureComponent {
 
             <WrappedRoute path={['/@:acct', '/accounts/:id']} exact component={AccountTimeline} content={children} />
             <WrappedRoute path={['/@:acct/featured', '/accounts/:id/featured']} component={AccountFeatured} content={children} />
-            {areCollectionsEnabled() &&
-              [
-                <WrappedRoute path={['/@:acct/collections']} component={Collections} content={children} key='collections-list' />,
-                <WrappedRoute path={['/collections/new', '/collections/:id/edit']} component={CollectionsEditor} content={children} key='collections-editor' />,
-                <WrappedRoute path='/collections/:id' component={CollectionDetail} content={children} key='collections-detail' />,
-              ]
-            }
+            <WrappedRoute path={['/@:acct/collections']} component={Collections} content={children} key='collections-list' />
+            <WrappedRoute path={['/collections/new', '/collections/:id/edit']} component={CollectionsEditor} content={children} key='collections-editor' />
+            <WrappedRoute path='/collections/:id' component={CollectionDetail} content={children} key='collections-detail' />
             <WrappedRoute path='/@:acct/tagged/:tagged?' exact component={AccountTimeline} content={children} />
             <WrappedRoute path={['/@:acct/with_replies', '/accounts/:id/with_replies']} component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
             <WrappedRoute path={['/accounts/:id/followers', '/users/:acct/followers', '/@:acct/followers']} component={Followers} content={children} />
diff --git a/app/javascript/flavours/glitch/utils/environment.ts b/app/javascript/flavours/glitch/utils/environment.ts
index cdcb88d68b..e2936bd224 100644
--- a/app/javascript/flavours/glitch/utils/environment.ts
+++ b/app/javascript/flavours/glitch/utils/environment.ts
@@ -12,7 +12,7 @@ export function isProduction() {
   else return import.meta.env.PROD;
 }
 
-export type ServerFeatures = 'fasp' | 'collections';
+export type ServerFeatures = 'fasp';
 
 export function isServerFeatureEnabled(feature: ServerFeatures) {
   return initialState?.features.includes(feature) ?? false;