matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pl-api: remove pointless feature gate

Browse Source 
Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
This commit is contained in:
Nicole Mikołajczyk
2025-04-08 18:03:57 +02:00
parent 5f8859a950
commit 6f1d2a43d5
3 changed files with 24 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/pl-api/lib/features.ts
View File

@ -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

64
packages/pl-fe/src/features/settings/index.tsx
View File

@ -15,8 +15,6 @@ import Preferences from '../preferences';
import MessagesSettings from './components/messages-settings';
const any = (arr: Array<any>): 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 = () => {
<Preferences />
</CardBody>
{any([
features.importBlocks,
features.importFollows,
features.importMutes,
features.exportData,
features.accountBackups,
features.federating && features.accountMoving,
features.federating && features.manageAccountAliases,
features.deleteAccount,
features.deleteAccountWithoutPassword,
]) && (
<>
<CardHeader>
<CardTitle title={intl.formatMessage(messages.other)} />
</CardHeader>
<CardHeader>
<CardTitle title={intl.formatMessage(messages.other)} />
</CardHeader>
<CardBody>
<List>
{(features.importBlocks || features.importFollows || features.importMutes) && (
<ListItem label={intl.formatMessage(messages.importData)} to='/settings/import' />
)}
<CardBody>
<List>
{(features.importBlocks || features.importFollows || features.importMutes) && (
<ListItem label={intl.formatMessage(messages.importData)} to='/settings/import' />
)}
{features.exportData && (
<ListItem label={intl.formatMessage(messages.exportData)} to='/settings/export' />
)}
<ListItem label={intl.formatMessage(messages.exportData)} to='/settings/export' />
{features.accountBackups && (
<ListItem label={intl.formatMessage(messages.backups)} to='/settings/backups' />
)}
{features.accountBackups && (
<ListItem label={intl.formatMessage(messages.backups)} to='/settings/backups' />
)}
<ListItem label={intl.formatMessage(messages.developers)} to='/developers' />
<ListItem label={intl.formatMessage(messages.developers)} to='/developers' />
{features.federating && (features.accountMoving ? (
<ListItem label={intl.formatMessage(messages.accountMigration)} to='/settings/migration' />
) : features.manageAccountAliases && (
<ListItem label={intl.formatMessage(messages.accountAliases)} to='/settings/aliases' />
))}
{features.federating && (features.accountMoving ? (
<ListItem label={intl.formatMessage(messages.accountMigration)} to='/settings/migration' />
) : features.manageAccountAliases && (
<ListItem label={intl.formatMessage(messages.accountAliases)} to='/settings/aliases' />
))}
{features.deleteAccount || features.deleteAccountWithoutPassword && (
<ListItem label={<Text theme='danger'>{intl.formatMessage(messages.deleteAccount)}</Text>} to='/settings/account' />
)}
</List>
</CardBody>
</>
)}
{features.deleteAccount || features.deleteAccountWithoutPassword && (
<ListItem label={<Text theme='danger'>{intl.formatMessage(messages.deleteAccount)}</Text>} to='/settings/account' />
)}
</List>
</CardBody>
</Card>
</Column>
);

2
packages/pl-fe/src/features/ui/index.tsx
View File

@ -299,7 +299,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = React.memo(({ chil
<WrappedRoute path='/circle' layout={DefaultLayout} component={Circle} content={children} />
<WrappedRoute path='/settings/profile' layout={DefaultLayout} component={EditProfile} content={children} />
{features.exportData && <WrappedRoute path='/settings/export' layout={DefaultLayout} component={ExportData} content={children} />}
<WrappedRoute path='/settings/export' layout={DefaultLayout} component={ExportData} content={children} />
{(features.importBlocks || features.importFollows || features.importMutes) && <WrappedRoute path='/settings/import' layout={DefaultLayout} component={ImportData} content={children} />}
{features.manageAccountAliases && <WrappedRoute path='/settings/aliases' layout={DefaultLayout} component={Aliases} content={children} />}
{features.accountMoving && <WrappedRoute path='/settings/migration' layout={DefaultLayout} component={Migration} content={children} />}