From 6f1d2a43d57297a1cee35ea7f9bc87d8185c2901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicole=20Miko=C5=82ajczyk?= Date: Tue, 8 Apr 2025 18:03:57 +0200 Subject: [PATCH] pl-api: remove pointless feature gate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicole Mikołajczyk --- packages/pl-api/lib/features.ts | 3 - .../pl-fe/src/features/settings/index.tsx | 64 +++++++------------ packages/pl-fe/src/features/ui/index.tsx | 2 +- 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/packages/pl-api/lib/features.ts b/packages/pl-api/lib/features.ts index 59fae83bb..69d9561f9 100644 --- a/packages/pl-api/lib/features.ts +++ b/packages/pl-api/lib/features.ts @@ -618,9 +618,6 @@ const getFeatures = (instance: Instance) => { */ events: instance.api_versions['events.pleroma.pl-api'] >= 1, - /** Whether to allow exporting follows/blocks/mutes to CSV by paginating the API. */ - exportData: true, - /** * Export followers to CSV file * @see GET /api/v1/settings/export_followers diff --git a/packages/pl-fe/src/features/settings/index.tsx b/packages/pl-fe/src/features/settings/index.tsx index 69051197c..6abfbfc60 100644 --- a/packages/pl-fe/src/features/settings/index.tsx +++ b/packages/pl-fe/src/features/settings/index.tsx @@ -15,8 +15,6 @@ import Preferences from '../preferences'; import MessagesSettings from './components/messages-settings'; -const any = (arr: Array): boolean => arr.some(Boolean); - const messages = defineMessages({ accountAliases: { id: 'navigation_bar.account_aliases', defaultMessage: 'Account aliases' }, accountMigration: { id: 'settings.account_migration', defaultMessage: 'Move account' }, @@ -140,51 +138,35 @@ const Settings = () => { - {any([ - features.importBlocks, - features.importFollows, - features.importMutes, - features.exportData, - features.accountBackups, - features.federating && features.accountMoving, - features.federating && features.manageAccountAliases, - features.deleteAccount, - features.deleteAccountWithoutPassword, - ]) && ( - <> - - - + + + - - - {(features.importBlocks || features.importFollows || features.importMutes) && ( - - )} + + + {(features.importBlocks || features.importFollows || features.importMutes) && ( + + )} - {features.exportData && ( - - )} + - {features.accountBackups && ( - - )} + {features.accountBackups && ( + + )} - + - {features.federating && (features.accountMoving ? ( - - ) : features.manageAccountAliases && ( - - ))} + {features.federating && (features.accountMoving ? ( + + ) : features.manageAccountAliases && ( + + ))} - {features.deleteAccount || features.deleteAccountWithoutPassword && ( - {intl.formatMessage(messages.deleteAccount)}} to='/settings/account' /> - )} - - - - )} + {features.deleteAccount || features.deleteAccountWithoutPassword && ( + {intl.formatMessage(messages.deleteAccount)}} to='/settings/account' /> + )} + + ); diff --git a/packages/pl-fe/src/features/ui/index.tsx b/packages/pl-fe/src/features/ui/index.tsx index 4417efe25..bd92dcdad 100644 --- a/packages/pl-fe/src/features/ui/index.tsx +++ b/packages/pl-fe/src/features/ui/index.tsx @@ -299,7 +299,7 @@ const SwitchingColumnsArea: React.FC = React.memo(({ chil - {features.exportData && } + {(features.importBlocks || features.importFollows || features.importMutes) && } {features.manageAccountAliases && } {features.accountMoving && }