From e45623eef62b7d66f58cb0339e03fe7504c623cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sat, 30 Jul 2022 23:31:38 +0200
Subject: [PATCH] Fix: Unable to approve follower requests from notifications
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/components/account.tsx            |  2 +-
 .../components/account_authorize.tsx          |  5 ++-
 .../notifications/components/notification.tsx |  8 ++++
 .../features/ui/components/action-button.tsx  | 39 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/components/account.tsx b/app/soapbox/components/account.tsx
index 5456ff6fb..fc4b290b6 100644
--- a/app/soapbox/components/account.tsx
+++ b/app/soapbox/components/account.tsx
@@ -47,7 +47,7 @@ interface IAccount {
   actionIcon?: string,
   actionTitle?: string,
   /** Override other actions for specificity like mute/unmute.  */
-  actionType?: 'muting' | 'blocking',
+  actionType?: 'muting' | 'blocking' | 'follow_request',
   avatarSize?: number,
   hidden?: boolean,
   hideActions?: boolean,
diff --git a/app/soapbox/features/follow_requests/components/account_authorize.tsx b/app/soapbox/features/follow_requests/components/account_authorize.tsx
index 4355b8f46..6573bbd55 100644
--- a/app/soapbox/features/follow_requests/components/account_authorize.tsx
+++ b/app/soapbox/features/follow_requests/components/account_authorize.tsx
@@ -7,6 +7,7 @@ import Avatar from 'soapbox/components/avatar';
 import DisplayName from 'soapbox/components/display-name';
 import IconButton from 'soapbox/components/icon_button';
 import Permalink from 'soapbox/components/permalink';
+import { Text } from 'soapbox/components/ui';
 import { useAppSelector } from 'soapbox/hooks';
 import { makeGetAccount } from 'soapbox/selectors';
 
@@ -42,12 +43,12 @@ const AccountAuthorize: React.FC<IAccountAuthorize> = ({ id }) => {
   return (
     <div className='account-authorize__wrapper'>
       <div className='account-authorize'>
-        <Permalink href={`/@${account.acct}`} to={`/@${account.acct}`} className='detailed-status__display-name'>
+        <Permalink href={`/@${account.acct}`} to={`/@${account.acct}`}>
           <div className='account-authorize__avatar'><Avatar account={account} size={48} /></div>
           <DisplayName account={account} />
         </Permalink>
 
-        <div className='account__header__content' dangerouslySetInnerHTML={content} />
+        <Text className='account__header__content' dangerouslySetInnerHTML={content} />
       </div>
 
       <div className='account--panel'>
diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx
index d8e02825b..f40b5e5fd 100644
--- a/app/soapbox/features/notifications/components/notification.tsx
+++ b/app/soapbox/features/notifications/components/notification.tsx
@@ -271,6 +271,14 @@ const Notification: React.FC<INotificaton> = (props) => {
     switch (type) {
       case 'follow':
       case 'follow_request':
+        return account && typeof account === 'object' ? (
+          <AccountContainer
+            id={account.id}
+            hidden={hidden}
+            avatarSize={48}
+            actionType='follow_request'
+          />
+        ) : null;
       case 'user_approved':
         return account && typeof account === 'object' ? (
           <AccountContainer
diff --git a/app/soapbox/features/ui/components/action-button.tsx b/app/soapbox/features/ui/components/action-button.tsx
index ae55174bc..c0308fb65 100644
--- a/app/soapbox/features/ui/components/action-button.tsx
+++ b/app/soapbox/features/ui/components/action-button.tsx
@@ -9,9 +9,11 @@ import {
   unblockAccount,
   muteAccount,
   unmuteAccount,
+  authorizeFollowRequest,
+  rejectFollowRequest,
 } from 'soapbox/actions/accounts';
 import { openModal } from 'soapbox/actions/modals';
-import { Button } from 'soapbox/components/ui';
+import { Button, HStack } from 'soapbox/components/ui';
 import { useAppSelector, useFeatures } from 'soapbox/hooks';
 
 import type { Account as AccountEntity } from 'soapbox/types/entities';
@@ -28,13 +30,15 @@ const messages = defineMessages({
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
+  authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
+  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
 });
 
 interface IActionButton {
   /** Target account for the action. */
   account: AccountEntity
   /** Type of action to prioritize, eg on Blocks and Mutes pages. */
-  actionType?: 'muting' | 'blocking'
+  actionType?: 'muting' | 'blocking' | 'follow_request'
   /** Displays shorter text on the "Awaiting approval" button. */
   small?: boolean
 }
@@ -75,6 +79,14 @@ const ActionButton: React.FC<IActionButton> = ({ account, actionType, small }) =
     }
   };
 
+  const handleAuthorize = () => {
+    dispatch(authorizeFollowRequest(account.id));
+  };
+
+  const handleReject = () => {
+    dispatch(rejectFollowRequest(account.id));
+  };
+
   const handleRemoteFollow = () => {
     dispatch(openModal('UNAUTHORIZED', {
       action: 'FOLLOW',
@@ -115,6 +127,27 @@ const ActionButton: React.FC<IActionButton> = ({ account, actionType, small }) =
     );
   };
 
+  const followRequestAction = () => {
+    if (account.relationship?.followed_by) return null;
+
+    return (
+      <HStack space={2}>
+        <Button
+          theme='secondary'
+          size='sm'
+          text={intl.formatMessage(messages.authorize)}
+          onClick={handleAuthorize}
+        />
+        <Button
+          theme='danger'
+          size='sm'
+          text={intl.formatMessage(messages.reject)}
+          onClick={handleReject}
+        />
+      </HStack>
+    );
+  };
+
   /** Render a remote follow button, depending on features. */
   const renderRemoteFollow = () => {
     // Remote follow through the API.
@@ -162,6 +195,8 @@ const ActionButton: React.FC<IActionButton> = ({ account, actionType, small }) =
         return mutingAction();
       } else if (actionType === 'blocking') {
         return blockingAction();
+      } else if (actionType === 'follow_request') {
+        return followRequestAction();
       }
     }