From 19b697366746753ba186ce76a2ef66fe80db1520 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 13 Aug 2022 10:27:12 -0500
Subject: [PATCH 1/3] Notifications: StatusContainer --> Status, fix not being
 able to mute a conversation

---
 app/soapbox/components/status.tsx                |  4 +++-
 app/soapbox/containers/status_container.tsx      | 15 ++++++++++-----
 .../notifications/components/notification.tsx    | 16 ++++++----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 37cf7a24ba..04f42a546c 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -47,6 +47,7 @@ export interface IStatus {
   featured?: boolean,
   hideActionBar?: boolean,
   hoverable?: boolean,
+  withDismiss?: boolean,
 }
 
 const Status: React.FC<IStatus> = (props) => {
@@ -63,6 +64,7 @@ const Status: React.FC<IStatus> = (props) => {
     unread,
     group,
     hideActionBar,
+    withDismiss,
   } = props;
   const intl = useIntl();
   const history = useHistory();
@@ -374,7 +376,7 @@ const Status: React.FC<IStatus> = (props) => {
 
             {!hideActionBar && (
               <div className='pt-4'>
-                <StatusActionBar status={actualStatus} />
+                <StatusActionBar status={actualStatus} withDismiss={withDismiss} />
               </div>
             )}
           </div>
diff --git a/app/soapbox/containers/status_container.tsx b/app/soapbox/containers/status_container.tsx
index c6196638af..985251c655 100644
--- a/app/soapbox/containers/status_container.tsx
+++ b/app/soapbox/containers/status_container.tsx
@@ -4,15 +4,13 @@ import Status, { IStatus } from 'soapbox/components/status';
 import { useAppSelector } from 'soapbox/hooks';
 import { makeGetStatus } from 'soapbox/selectors';
 
-interface IStatusContainer extends Omit<IStatus, 'id'> {
+interface IStatusContainer extends Omit<IStatus, 'status'> {
   id: string,
   /** @deprecated Unused. */
   contextType?: any,
   /** @deprecated Unused. */
   otherAccounts?: any,
   /** @deprecated Unused. */
-  withDismiss?: any,
-  /** @deprecated Unused. */
   getScrollPosition?: any,
   /** @deprecated Unused. */
   updateScrollBottom?: any,
@@ -24,11 +22,18 @@ const getStatus = makeGetStatus();
  * Legacy Status wrapper accepting a status ID instead of the full entity.
  * @deprecated Use the Status component directly.
  */
-const StatusContainer: React.FC<IStatusContainer> = ({ id, onMoveUp, onMoveDown }) => {
+const StatusContainer: React.FC<IStatusContainer> = ({ id, onMoveUp, onMoveDown, withDismiss }) => {
   const status = useAppSelector(state => getStatus(state, { id }));
 
   if (status) {
-    return <Status status={status} onMoveUp={onMoveUp} onMoveDown={onMoveDown} />;
+    return (
+      <Status
+        status={status}
+        onMoveUp={onMoveUp}
+        onMoveDown={onMoveDown}
+        withDismiss={withDismiss}
+      />
+    );
   } else {
     return null;
   }
diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx
index cbf67c4dda..aa428c24ce 100644
--- a/app/soapbox/features/notifications/components/notification.tsx
+++ b/app/soapbox/features/notifications/components/notification.tsx
@@ -10,15 +10,15 @@ import { getSettings } from 'soapbox/actions/settings';
 import { hideStatus, revealStatus } from 'soapbox/actions/statuses';
 import Icon from 'soapbox/components/icon';
 import Permalink from 'soapbox/components/permalink';
+import Status from 'soapbox/components/status';
 import { HStack, Text, Emoji } from 'soapbox/components/ui';
 import AccountContainer from 'soapbox/containers/account_container';
-import StatusContainer from 'soapbox/containers/status_container';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 import { makeGetNotification } from 'soapbox/selectors';
 import { NotificationType, validType } from 'soapbox/utils/notification';
 
 import type { ScrollPosition } from 'soapbox/components/status';
-import type { Account, Status, Notification as NotificationEntity } from 'soapbox/types/entities';
+import type { Account, Status as StatusEntity, Notification as NotificationEntity } from 'soapbox/types/entities';
 
 const getNotification = makeGetNotification();
 
@@ -143,7 +143,7 @@ interface INotificaton {
   notification: NotificationEntity,
   onMoveUp?: (notificationId: string) => void,
   onMoveDown?: (notificationId: string) => void,
-  onReblog?: (status: Status, e?: KeyboardEvent) => void,
+  onReblog?: (status: StatusEntity, e?: KeyboardEvent) => void,
   getScrollPosition?: () => ScrollPosition | undefined,
   updateScrollBottom?: (bottom: number) => void,
 }
@@ -216,7 +216,7 @@ const Notification: React.FC<INotificaton> = (props) => {
           if (e?.shiftKey || !boostModal) {
             dispatch(reblog(status));
           } else {
-            dispatch(openModal('BOOST', { status, onReblog: (status: Status) => {
+            dispatch(openModal('BOOST', { status, onReblog: (status: StatusEntity) => {
               dispatch(reblog(status));
             } }));
           }
@@ -303,16 +303,12 @@ const Notification: React.FC<INotificaton> = (props) => {
       case 'update':
       case 'pleroma:emoji_reaction':
         return status && typeof status === 'object' ? (
-          // @ts-ignore
-          <StatusContainer
-            id={status.id}
+          <Status
+            status={status}
             withDismiss
             hidden={hidden}
             onMoveDown={handleMoveDown}
             onMoveUp={handleMoveUp}
-            contextType='notifications'
-            getScrollPosition={props.getScrollPosition}
-            updateScrollBottom={props.updateScrollBottom}
           />
         ) : null;
       default:

From a0e79bfe1012b2975b4363dae03176b8869d4bf5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 13 Aug 2022 10:33:58 -0500
Subject: [PATCH 2/3] StatusContainer: pass all props through, fix pinned posts
 not showing as pinned

---
 app/soapbox/components/status.tsx           | 28 +++++++++------------
 app/soapbox/components/status_list.tsx      |  2 --
 app/soapbox/containers/status_container.tsx | 12 +++------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 04f42a546c..020b0756a9 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -181,7 +181,7 @@ const Status: React.FC<IStatus> = (props) => {
   };
 
   if (!status) return null;
-  let prepend, rebloggedByText, reblogElement, reblogElementMobile;
+  let rebloggedByText, reblogElement, reblogElementMobile;
 
   if (hidden) {
     return (
@@ -207,20 +207,6 @@ const Status: React.FC<IStatus> = (props) => {
     );
   }
 
-  if (featured) {
-    prepend = (
-      <div className='pt-4 px-4'>
-        <HStack alignItems='center' space={1}>
-          <Icon src={require('@tabler/icons/pinned.svg')} className='text-gray-600 dark:text-gray-400' />
-
-          <Text size='sm' theme='muted' weight='medium'>
-            <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
-          </Text>
-        </HStack>
-      </div>
-    );
-  }
-
   if (status.reblog && typeof status.reblog === 'object') {
     const displayNameHtml = { __html: String(status.getIn(['account', 'display_name_html'])) };
 
@@ -318,7 +304,17 @@ const Status: React.FC<IStatus> = (props) => {
         onClick={() => history.push(statusUrl)}
         role='link'
       >
-        {prepend}
+        {featured && (
+          <div className='pt-4 px-4'>
+            <HStack alignItems='center' space={1}>
+              <Icon src={require('@tabler/icons/pinned.svg')} className='text-gray-600 dark:text-gray-400' />
+
+              <Text size='sm' theme='muted' weight='medium'>
+                <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
+              </Text>
+            </HStack>
+          </div>
+        )}
 
         <div
           className={classNames('status__wrapper', `status-${actualStatus.visibility}`, {
diff --git a/app/soapbox/components/status_list.tsx b/app/soapbox/components/status_list.tsx
index db9695b87e..c45216e035 100644
--- a/app/soapbox/components/status_list.tsx
+++ b/app/soapbox/components/status_list.tsx
@@ -122,7 +122,6 @@ const StatusList: React.FC<IStatusList> = ({
 
   const renderStatus = (statusId: string) => {
     return (
-      // @ts-ignore
       <StatusContainer
         key={statusId}
         id={statusId}
@@ -157,7 +156,6 @@ const StatusList: React.FC<IStatusList> = ({
     if (!featuredStatusIds) return [];
 
     return featuredStatusIds.toArray().map(statusId => (
-      // @ts-ignore
       <StatusContainer
         key={`f-${statusId}`}
         id={statusId}
diff --git a/app/soapbox/containers/status_container.tsx b/app/soapbox/containers/status_container.tsx
index 985251c655..3f7c1a34f7 100644
--- a/app/soapbox/containers/status_container.tsx
+++ b/app/soapbox/containers/status_container.tsx
@@ -22,18 +22,12 @@ const getStatus = makeGetStatus();
  * Legacy Status wrapper accepting a status ID instead of the full entity.
  * @deprecated Use the Status component directly.
  */
-const StatusContainer: React.FC<IStatusContainer> = ({ id, onMoveUp, onMoveDown, withDismiss }) => {
+const StatusContainer: React.FC<IStatusContainer> = (props) => {
+  const { id, ...rest } = props;
   const status = useAppSelector(state => getStatus(state, { id }));
 
   if (status) {
-    return (
-      <Status
-        status={status}
-        onMoveUp={onMoveUp}
-        onMoveDown={onMoveDown}
-        withDismiss={withDismiss}
-      />
-    );
+    return <Status status={status} {...rest} />;
   } else {
     return null;
   }

From 7b75faf74ce8137fcf05dc89ef0a6a81247c2a86 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 13 Aug 2022 10:40:56 -0500
Subject: [PATCH 3/3] Notifications: actually, do still use the legacy
 StatusContainer as it does a selector we need

---
 .../features/notifications/components/notification.tsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx
index aa428c24ce..b7e528ef5e 100644
--- a/app/soapbox/features/notifications/components/notification.tsx
+++ b/app/soapbox/features/notifications/components/notification.tsx
@@ -10,9 +10,9 @@ import { getSettings } from 'soapbox/actions/settings';
 import { hideStatus, revealStatus } from 'soapbox/actions/statuses';
 import Icon from 'soapbox/components/icon';
 import Permalink from 'soapbox/components/permalink';
-import Status from 'soapbox/components/status';
 import { HStack, Text, Emoji } from 'soapbox/components/ui';
 import AccountContainer from 'soapbox/containers/account_container';
+import StatusContainer from 'soapbox/containers/status_container';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 import { makeGetNotification } from 'soapbox/selectors';
 import { NotificationType, validType } from 'soapbox/utils/notification';
@@ -303,8 +303,8 @@ const Notification: React.FC<INotificaton> = (props) => {
       case 'update':
       case 'pleroma:emoji_reaction':
         return status && typeof status === 'object' ? (
-          <Status
-            status={status}
+          <StatusContainer
+            id={status.id}
             withDismiss
             hidden={hidden}
             onMoveDown={handleMoveDown}