From e07412f87215ec0d2bc44ff6fea87cbf3ef7b393 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 26 Jun 2023 11:59:01 -0500
Subject: [PATCH] Remove getIn calls in status and status-action-bar components

---
 app/soapbox/components/status-action-bar.tsx | 10 ++++----
 app/soapbox/components/status.tsx            | 27 ++++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx
index 0d1602405..0e6a9b894 100644
--- a/app/soapbox/components/status-action-bar.tsx
+++ b/app/soapbox/components/status-action-bar.tsx
@@ -282,7 +282,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
   };
 
   const handleOpen: React.EventHandler<React.MouseEvent> = (e) => {
-    history.push(`/@${status.getIn(['account', 'acct'])}/posts/${status.id}`);
+    history.push(`/@${status.account.acct}/posts/${status.id}`);
   };
 
   const handleEmbed = () => {
@@ -338,9 +338,9 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
   const _makeMenu = (publicStatus: boolean) => {
     const mutingConversation = status.muted;
-    const ownAccount = status.getIn(['account', 'id']) === me;
-    const username = String(status.getIn(['account', 'username']));
-    const account = status.account as Account;
+    const ownAccount = status.account.id === me;
+    const username = status.account.username;
+    const account = status.account;
     const domain = account.fqn.split('@')[1];
 
     const menu: Menu = [];
@@ -456,7 +456,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
         icon: require('@tabler/icons/at.svg'),
       });
 
-      if (status.getIn(['account', 'pleroma', 'accepts_chat_messages']) === true) {
+      if (status.account.pleroma?.accepts_chat_messages === true) {
         menu.push({
           text: intl.formatMessage(messages.chat, { name: username }),
           action: handleChatClick,
diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 0c1a7be59..46a37b21e 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -26,7 +26,6 @@ import { Card, Icon, Stack, Text } from './ui';
 
 import type {
   Account as AccountEntity,
-  Group as GroupEntity,
   Status as StatusEntity,
 } from 'soapbox/types/entities';
 
@@ -90,8 +89,8 @@ const Status: React.FC<IStatus> = (props) => {
 
   const actualStatus = getActualStatus(status);
   const isReblog = status.reblog && typeof status.reblog === 'object';
-  const statusUrl = `/@${actualStatus.getIn(['account', 'acct'])}/posts/${actualStatus.id}`;
-  const group = actualStatus.group as GroupEntity | null;
+  const statusUrl = `/@${actualStatus.account.acct}/posts/${actualStatus.id}`;
+  const group = actualStatus.group;
 
   const filtered = (status.filtered.size || actualStatus.filtered.size) > 0;
 
@@ -177,7 +176,7 @@ const Status: React.FC<IStatus> = (props) => {
   };
 
   const handleHotkeyOpenProfile = (): void => {
-    history.push(`/@${actualStatus.getIn(['account', 'acct'])}`);
+    history.push(`/@${actualStatus.account.acct}`);
   };
 
   const handleHotkeyMoveUp = (e?: KeyboardEvent): void => {
@@ -224,25 +223,25 @@ const Status: React.FC<IStatus> = (props) => {
               values={{
                 name: (
                   <Link
-                    to={`/@${status.getIn(['account', 'acct'])}`}
+                    to={`/@${status.account.acct}`}
                     className='hover:underline'
                   >
                     <bdi className='truncate'>
                       <strong
                         className='text-gray-800 dark:text-gray-200'
                         dangerouslySetInnerHTML={{
-                          __html: String(status.getIn(['account', 'display_name_html'])),
+                          __html: status.account.display_name_html,
                         }}
                       />
                     </bdi>
                   </Link>
                 ),
                 group: (
-                  <Link to={`/group/${(status.group as GroupEntity).slug}`} className='hover:underline'>
+                  <Link to={`/group/${group.slug}`} className='hover:underline'>
                     <strong
                       className='text-gray-800 dark:text-gray-200'
                       dangerouslySetInnerHTML={{
-                        __html: (status.group as GroupEntity).display_name_html,
+                        __html: group.display_name_html,
                       }}
                     />
                   </Link>
@@ -263,12 +262,12 @@ const Status: React.FC<IStatus> = (props) => {
               defaultMessage='{name} reposted'
               values={{
                 name: (
-                  <Link to={`/@${status.getIn(['account', 'acct'])}`} className='hover:underline'>
+                  <Link to={`/@${status.account.acct}`} className='hover:underline'>
                     <bdi className='truncate'>
                       <strong
                         className='text-gray-800 dark:text-gray-200'
                         dangerouslySetInnerHTML={{
-                          __html: String(status.getIn(['account', 'display_name_html'])),
+                          __html: status.account.display_name_html,
                         }}
                       />
                     </bdi>
@@ -322,7 +321,7 @@ const Status: React.FC<IStatus> = (props) => {
     return (
       <div ref={node}>
         <>
-          {actualStatus.getIn(['account', 'display_name']) || actualStatus.getIn(['account', 'username'])}
+          {actualStatus.account.display_name || actualStatus.account.username}
           {actualStatus.content}
         </>
       </div>
@@ -354,7 +353,7 @@ const Status: React.FC<IStatus> = (props) => {
   if (status.reblog && typeof status.reblog === 'object') {
     rebloggedByText = intl.formatMessage(
       messages.reblogged_by,
-      { name: String(status.getIn(['account', 'acct'])) },
+      { name: status.account.acct },
     );
   }
 
@@ -425,8 +424,8 @@ const Status: React.FC<IStatus> = (props) => {
           {renderStatusInfo()}
 
           <AccountContainer
-            key={String(actualStatus.getIn(['account', 'id']))}
-            id={String(actualStatus.getIn(['account', 'id']))}
+            key={actualStatus.account.id}
+            id={actualStatus.account.id}
             timestamp={actualStatus.created_at}
             timestampUrl={statusUrl}
             action={accountAction}