Merge branch 'account-moving' into 'develop'
Account moving API is not part of Pleroma yet See merge request soapbox-pub/soapbox-fe!1338
This commit is contained in:
commit
7b727e8449
|
@ -32,6 +32,7 @@ const messages = defineMessages({
|
|||
soapboxConfig: { id: 'navigation_bar.soapbox_config', defaultMessage: 'Soapbox config' },
|
||||
importData: { id: 'navigation_bar.import_data', defaultMessage: 'Import data' },
|
||||
accountMigration: { id: 'navigation_bar.account_migration', defaultMessage: 'Move account' },
|
||||
accountAliases: { id: 'navigation_bar.account_aliases', defaultMessage: 'Account aliases' },
|
||||
logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
|
||||
bookmarks: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },
|
||||
lists: { id: 'column.lists', defaultMessage: 'Lists' },
|
||||
|
@ -322,14 +323,21 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
|
|||
/>
|
||||
)}
|
||||
|
||||
{(features.federating && features.accountMoving) && (
|
||||
{features.federating && (features.accountMoving ? (
|
||||
<SidebarLink
|
||||
to='/settings/migration'
|
||||
icon={require('@tabler/icons/icons/briefcase.svg')}
|
||||
text={intl.formatMessage(messages.accountMigration)}
|
||||
onClick={onClose}
|
||||
/>
|
||||
)}
|
||||
) : features.accountAliasesAPI && (
|
||||
<SidebarLink
|
||||
to='/settings/aliases'
|
||||
icon={require('@tabler/icons/icons/briefcase.svg')}
|
||||
text={intl.formatMessage(messages.accountAliases)}
|
||||
onClick={onClose}
|
||||
/>
|
||||
))}
|
||||
|
||||
<hr />
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@ const getInstanceFeatures = (instance: Instance) => {
|
|||
* Move followers to a different ActivityPub account.
|
||||
* @see POST /api/pleroma/move_account
|
||||
*/
|
||||
accountMoving: v.software === PLEROMA && gte(v.version, '2.4.50'),
|
||||
accountMoving: v.software === PLEROMA && v.build === SOAPBOX && gte(v.version, '2.4.50'),
|
||||
|
||||
/**
|
||||
* Ability to subscribe to notifications every time an account posts.
|
||||
|
|
Loading…
Reference in New Issue