From 5bc8108e26327d3505b30034e81dc3b1bed83ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 5 Jun 2022 08:45:51 +0200
Subject: [PATCH] Move account migration to settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/actions/admin.js                  | Bin 20050 -> 20031 bytes
 app/soapbox/components/sidebar_menu.tsx       |  18 +----
 app/soapbox/features/settings/index.tsx       |  73 ++++++++++++------
 .../features/ui/components/action-button.tsx  |   2 +-
 .../features/ui/components/link_footer.tsx    |   5 +-
 .../ui/components/unauthorized_modal.tsx      |   2 +-
 app/soapbox/features/ui/index.tsx             |   2 +-
 app/soapbox/utils/features.ts                 |  14 ++--
 8 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/app/soapbox/actions/admin.js b/app/soapbox/actions/admin.js
index ad56f1fbb135a9d41dd749fe9f5164becf2171de..b3e382352aab81734453c9ffdbcb061dc9d3d1bc 100644
GIT binary patch
delta 54
zcmcaKhjITL#tok&CnuOmZ5EJ9VFfcL$~$p_7?TC0csKvkI0X@XrdP(kIl=6cH~>5N
B6psJ^

delta 85
zcmdl#hw;)J#tok&ne!YAHh+|?XJv9MnEX*vdUKb&6DLRz$kCV_tDwDEPIEphR6u&N
bmOj_ynVQO*S@b>G;eu<;*f-~yT@(iZWse@v

diff --git a/app/soapbox/components/sidebar_menu.tsx b/app/soapbox/components/sidebar_menu.tsx
index 2f8be96b1f..7d47baa470 100644
--- a/app/soapbox/components/sidebar_menu.tsx
+++ b/app/soapbox/components/sidebar_menu.tsx
@@ -311,7 +311,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                   />
                 )}
 
-                {features.importAPI && (
+                {features.import && (
                   <SidebarLink
                     to='/settings/import'
                     icon={require('@tabler/icons/icons/cloud-upload.svg')}
@@ -320,22 +320,6 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                   />
                 )}
 
-                {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 />
 
                 <SidebarLink
diff --git a/app/soapbox/features/settings/index.tsx b/app/soapbox/features/settings/index.tsx
index c1386c2884..1c82912f65 100644
--- a/app/soapbox/features/settings/index.tsx
+++ b/app/soapbox/features/settings/index.tsx
@@ -22,6 +22,8 @@ const messages = defineMessages({
   configureMfa: { id: 'settings.configure_mfa', defaultMessage: 'Configure MFA' },
   sessions: { id: 'settings.sessions', defaultMessage: 'Active sessions' },
   deleteAccount: { id: 'settings.delete_account', defaultMessage: 'Delete Account' },
+  accountMigration: { id: 'settings.account_migration', defaultMessage: 'Move Account' },
+  accountAliases: { id: 'navigation_bar.account_aliases', defaultMessage: 'Account aliases' },
   other: { id: 'settings.other', defaultMessage: 'Other options' },
   mfaEnabled: { id: 'mfa.enabled', defaultMessage: 'Enabled' },
   mfaDisabled: { id: 'mfa.disabled', defaultMessage: 'Disabled' },
@@ -43,6 +45,8 @@ const Settings = () => {
   const navigateToSessions = () => history.push('/settings/tokens');
   const navigateToEditProfile = () => history.push('/settings/profile');
   const navigateToDeleteAccount = () => history.push('/settings/account');
+  const navigateToMoveAccount = () => history.push('/settings/migration');
+  const navigateToAliases = () => history.push('/settings/aliases');
 
   const isMfaEnabled = mfa.getIn(['settings', 'totp']);
 
@@ -69,24 +73,32 @@ const Settings = () => {
           </List>
         </CardBody>
 
-        <CardHeader>
-          <CardTitle title={intl.formatMessage(messages.security)} />
-        </CardHeader>
+        {features.security || features.sessions && (
+          <>
+            <CardHeader>
+              <CardTitle title={intl.formatMessage(messages.security)} />
+            </CardHeader>
 
-        <CardBody>
-          <List>
-            <ListItem label={intl.formatMessage(messages.changeEmail)} onClick={navigateToChangeEmail} />
-            <ListItem label={intl.formatMessage(messages.changePassword)} onClick={navigateToChangePassword} />
-            <ListItem label={intl.formatMessage(messages.configureMfa)} onClick={navigateToMfa}>
-              {isMfaEnabled ?
-                intl.formatMessage(messages.mfaEnabled) :
-                intl.formatMessage(messages.mfaDisabled)}
-            </ListItem>
-            {features.sessionsAPI && (
-              <ListItem label={intl.formatMessage(messages.sessions)} onClick={navigateToSessions} />
-            )}
-          </List>
-        </CardBody>
+            <CardBody>
+              <List>
+                {features.security && (
+                  <>
+                    <ListItem label={intl.formatMessage(messages.changeEmail)} onClick={navigateToChangeEmail} />
+                    <ListItem label={intl.formatMessage(messages.changePassword)} onClick={navigateToChangePassword} />
+                    <ListItem label={intl.formatMessage(messages.configureMfa)} onClick={navigateToMfa}>
+                      {isMfaEnabled ?
+                        intl.formatMessage(messages.mfaEnabled) :
+                        intl.formatMessage(messages.mfaDisabled)}
+                    </ListItem>
+                  </>
+                )}
+                {features.sessions && (
+                  <ListItem label={intl.formatMessage(messages.sessions)} onClick={navigateToSessions} />
+                )}
+              </List>
+            </CardBody>
+          </>
+        )}
 
         <CardHeader>
           <CardTitle title={intl.formatMessage(messages.preferences)} />
@@ -96,15 +108,26 @@ const Settings = () => {
           <Preferences />
         </CardBody>
 
-        <CardHeader>
-          <CardTitle title={intl.formatMessage(messages.other)} />
-        </CardHeader>
+        {features.security || features.accountAliases && (
+          <>
+            <CardHeader>
+              <CardTitle title={intl.formatMessage(messages.other)} />
+            </CardHeader>
 
-        <CardBody>
-          <List>
-            <ListItem label={intl.formatMessage(messages.deleteAccount)} onClick={navigateToDeleteAccount} />
-          </List>
-        </CardBody>
+            <CardBody>
+              <List>
+                {features.security && (
+                  <ListItem label={intl.formatMessage(messages.deleteAccount)} onClick={navigateToDeleteAccount} />
+                )}
+                {features.federating && (features.accountMoving ? (
+                  <ListItem label={intl.formatMessage(messages.accountMigration)} onClick={navigateToMoveAccount} />
+                ) : features.accountAliases && (
+                  <ListItem label={intl.formatMessage(messages.accountAliases)} onClick={navigateToAliases} />
+                ))}
+              </List>
+            </CardBody>
+          </>
+        )}
       </Card>
     </Column>
   );
diff --git a/app/soapbox/features/ui/components/action-button.tsx b/app/soapbox/features/ui/components/action-button.tsx
index 51348ee1de..205aed90fb 100644
--- a/app/soapbox/features/ui/components/action-button.tsx
+++ b/app/soapbox/features/ui/components/action-button.tsx
@@ -118,7 +118,7 @@ const ActionButton: React.FC<IActionButton> = ({ account, actionType, small }) =
   /** Render a remote follow button, depending on features. */
   const renderRemoteFollow = () => {
     // Remote follow through the API.
-    if (features.remoteInteractionsAPI) {
+    if (features.remoteInteractions) {
       return (
         <Button
           onClick={handleRemoteFollow}
diff --git a/app/soapbox/features/ui/components/link_footer.tsx b/app/soapbox/features/ui/components/link_footer.tsx
index a8444d046d..b87ddaad6c 100644
--- a/app/soapbox/features/ui/components/link_footer.tsx
+++ b/app/soapbox/features/ui/components/link_footer.tsx
@@ -56,12 +56,9 @@ const LinkFooter: React.FC = (): JSX.Element => {
           {account.locked && (
             <FooterLink to='/follow_requests'><FormattedMessage id='navigation_bar.follow_requests' defaultMessage='Follow requests' /></FooterLink>
           )}
-          {features.importAPI && (
+          {features.import && (
             <FooterLink to='/settings/import'><FormattedMessage id='navigation_bar.import_data' defaultMessage='Import data' /></FooterLink>
           )}
-          {(features.federating && features.accountMoving) && (
-            <FooterLink to='/settings/migration'><FormattedMessage id='navigation_bar.account_migration' defaultMessage='Move account' /></FooterLink>
-          )}
           <FooterLink to='/logout' onClick={onClickLogOut}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></FooterLink>
         </>}
       </div>
diff --git a/app/soapbox/features/ui/components/unauthorized_modal.tsx b/app/soapbox/features/ui/components/unauthorized_modal.tsx
index 7fc30b235d..9913844aa1 100644
--- a/app/soapbox/features/ui/components/unauthorized_modal.tsx
+++ b/app/soapbox/features/ui/components/unauthorized_modal.tsx
@@ -129,7 +129,7 @@ const UnauthorizedModal: React.FC<IUnauthorizedModal> = ({ action, onClose, acco
     );
   };
 
-  if (action && features.remoteInteractionsAPI && features.federating) {
+  if (action && features.remoteInteractions && features.federating) {
     return renderRemoteInteractions();
   }
 
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 06591af829..55151ca98a 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -288,7 +288,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       {/* FIXME: this could DDoS our API? :\ */}
       {/* <WrappedRoute path='/settings/export' page={DefaultPage} component={ExportData} content={children} /> */}
       {features.importData && <WrappedRoute path='/settings/import' page={DefaultPage} component={ImportData} content={children} />}
-      {features.accountAliasesAPI && <WrappedRoute path='/settings/aliases' page={DefaultPage} component={Aliases} content={children} />}
+      {features.accountAliases && <WrappedRoute path='/settings/aliases' page={DefaultPage} component={Aliases} content={children} />}
       {features.accountMoving && <WrappedRoute path='/settings/migration' page={DefaultPage} component={Migration} content={children} />}
       <WrappedRoute path='/settings/email' page={DefaultPage} component={EditEmail} content={children} />
       <WrappedRoute path='/settings/password' page={DefaultPage} component={EditPassword} content={children} />
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 0a466fecd3..891cdd621b 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -69,7 +69,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/pleroma/aliases
      * @see PATCH /api/v1/accounts/update_credentials
      */
-    accountAliasesAPI: v.software === PLEROMA,
+    accountAliases: v.software === PLEROMA,
 
     /**
      * The accounts API allows an acct instead of an ID.
@@ -306,7 +306,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see POST /api/pleroma/blocks_import
      * @see POST /api/pleroma/mutes_import
      */
-    importAPI: v.software === PLEROMA,
+    import: v.software === PLEROMA,
 
     /**
      * Pleroma import endpoints.
@@ -335,7 +335,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see POST /api/v1/admin/accounts/:account_id/action
      * @see POST /api/v1/admin/accounts/:account_id/approve
      */
-    mastodonAdminApi: any([
+    mastodonAdmin: any([
       v.software === MASTODON && gte(v.compatVersion, '2.9.1'),
       v.software === PLEROMA && v.build === SOAPBOX && gte(v.version, '2.4.50'),
     ]),
@@ -442,7 +442,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * Interact with statuses from another instance while logged-out.
      * @see POST /api/v1/pleroma/remote_interaction
      */
-    remoteInteractionsAPI: v.software === PLEROMA && gte(v.version, '2.4.50'),
+    remoteInteractions: v.software === PLEROMA && gte(v.version, '2.4.50'),
 
     /**
      * Ability to remove an account from your followers.
@@ -462,7 +462,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * Can request a password reset email through the API.
      * @see POST /auth/password
      */
-    resetPasswordAPI: v.software === PLEROMA,
+    resetPassword: v.software === PLEROMA,
 
     /**
      * Ability to post statuses in Markdown, BBCode, and HTML.
@@ -496,7 +496,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see POST /api/pleroma/change_email
      * @see POST /api/pleroma/delete_account
      */
-    securityAPI: any([
+    security: any([
       v.software === PLEROMA,
       v.software === TRUTHSOCIAL,
     ]),
@@ -506,7 +506,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/oauth_tokens.json
      * @see DELETE /api/oauth_tokens/:id
      */
-    sessionsAPI: v.software === PLEROMA,
+    sessions: v.software === PLEROMA,
 
     /**
      * Can store client settings in the database.