From 3e94d9dd538ea54644e3a5478ab84e4d8442faf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sat, 5 Oct 2024 23:49:21 +0200
Subject: [PATCH] pl-fe: Prefer using ids directly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 packages/pl-fe/src/components/status-action-bar.tsx         | 4 ++--
 packages/pl-fe/src/components/status.tsx                    | 4 ++--
 .../src/features/compose/components/reply-indicator.tsx     | 6 +++---
 .../src/features/notifications/components/notification.tsx  | 2 +-
 .../features/ui/components/modals/reply-mentions-modal.tsx  | 2 +-
 packages/pl-fe/src/reducers/timelines.ts                    | 4 ++--
 packages/pl-fe/src/selectors/index.ts                       | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/pl-fe/src/components/status-action-bar.tsx b/packages/pl-fe/src/components/status-action-bar.tsx
index 1b478cce0..ced526f48 100644
--- a/packages/pl-fe/src/components/status-action-bar.tsx
+++ b/packages/pl-fe/src/components/status-action-bar.tsx
@@ -372,7 +372,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
       message: intl.formatMessage(messages.groupBlockFromGroupMessage, { name: status.account.username }),
       confirm: intl.formatMessage(messages.groupBlockConfirm),
       onConfirm: () => {
-        blockGroupMember([status.account.id], {
+        blockGroupMember([status.account_id], {
           onSuccess() {
             toast.success(intl.formatMessage(messages.blocked, { name: account?.acct }));
           },
@@ -395,7 +395,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
   const _makeMenu = (publicStatus: boolean) => {
     const mutingConversation = status.muted;
-    const ownAccount = status.account.id === me;
+    const ownAccount = status.account_id === me;
     const username = status.account.username;
     const account = status.account;
 
diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx
index 916982fb8..65ed106b0 100644
--- a/packages/pl-fe/src/components/status.tsx
+++ b/packages/pl-fe/src/components/status.tsx
@@ -396,8 +396,8 @@ const Status: React.FC<IStatus> = (props) => {
           {renderStatusInfo()}
 
           <AccountContainer
-            key={actualStatus.account.id}
-            id={actualStatus.account.id}
+            key={actualStatus.account_id}
+            id={actualStatus.account_id}
             timestamp={actualStatus.created_at}
             timestampUrl={statusUrl}
             action={accountAction}
diff --git a/packages/pl-fe/src/features/compose/components/reply-indicator.tsx b/packages/pl-fe/src/features/compose/components/reply-indicator.tsx
index 18195ec44..0ca76374c 100644
--- a/packages/pl-fe/src/features/compose/components/reply-indicator.tsx
+++ b/packages/pl-fe/src/features/compose/components/reply-indicator.tsx
@@ -8,11 +8,11 @@ import { Stack } from 'pl-fe/components/ui';
 import AccountContainer from 'pl-fe/containers/account-container';
 import { getTextDirection } from 'pl-fe/utils/rtl';
 
-import type { Account, Status } from 'pl-fe/normalizers';
+import type { Status } from 'pl-fe/normalizers';
 
 interface IReplyIndicator {
   className?: string;
-  status?: Pick<Status, | 'contentHtml' | 'created_at' | 'hidden' | 'media_attachments' | 'mentions' | 'search_index' | 'sensitive' | 'spoiler_text' | 'quote_id'> & { account: Pick<Account, 'id'> };
+  status?: Pick<Status, 'account_id' | 'contentHtml' | 'created_at' | 'hidden' | 'media_attachments' | 'mentions' | 'search_index' | 'sensitive' | 'spoiler_text' | 'quote_id'>;
   onCancel?: () => void;
   hideActions: boolean;
 }
@@ -40,7 +40,7 @@ const ReplyIndicator: React.FC<IReplyIndicator> = ({ className, status, hideActi
     <Stack space={2} className={clsx('max-h-72 overflow-y-auto rounded-lg bg-gray-100 p-4 black:bg-gray-900 dark:bg-gray-800', className)}>
       <AccountContainer
         {...actions}
-        id={status.account.id}
+        id={status.account_id}
         timestamp={status.created_at}
         showAccountHoverCard={false}
         withLinkToProfile={false}
diff --git a/packages/pl-fe/src/features/notifications/components/notification.tsx b/packages/pl-fe/src/features/notifications/components/notification.tsx
index ddc2cac3e..33beeb5cb 100644
--- a/packages/pl-fe/src/features/notifications/components/notification.tsx
+++ b/packages/pl-fe/src/features/notifications/components/notification.tsx
@@ -339,7 +339,7 @@ const Notification: React.FC<INotification> = (props) => {
       case 'move':
         return account && typeof account === 'object' && notification.target && typeof notification.target === 'object' ? (
           <AccountContainer
-            id={notification.target.id}
+            id={notification.target_id}
             hidden={hidden}
             avatarSize={avatarSize}
             withRelationship
diff --git a/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx b/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx
index bb79d323b..b7d999869 100644
--- a/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx
+++ b/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx
@@ -21,7 +21,7 @@ const ReplyMentionsModal: React.FC<BaseModalProps & ReplyMentionsModalProps> = (
   const { account } = useOwnAccount();
 
   const mentions = statusToMentionsAccountIdsArray(status!, account!, compose.parent_reblogged_by);
-  const author = status?.account.id;
+  const author = status?.account_id;
 
   const onClickClose = () => {
     onClose('REPLY_MENTIONS');
diff --git a/packages/pl-fe/src/reducers/timelines.ts b/packages/pl-fe/src/reducers/timelines.ts
index 86360e2dc..dc4588a08 100644
--- a/packages/pl-fe/src/reducers/timelines.ts
+++ b/packages/pl-fe/src/reducers/timelines.ts
@@ -197,10 +197,10 @@ const buildReferencesTo = (
 //       statuses.getIn([statusId, 'account']) === relationship.id,
 //     ));
 
-const filterTimelines = (state: State, relationship: Relationship, statuses: ImmutableMap<string, Pick<Status, 'id' | 'account' | 'reblog_id'>>) =>
+const filterTimelines = (state: State, relationship: Relationship, statuses: ImmutableMap<string, Pick<Status, 'id' | 'account' | 'account_id' | 'reblog_id'>>) =>
   state.withMutations(state => {
     statuses.forEach(status => {
-      if (status.account.id !== relationship.id) return;
+      if (status.account_id !== relationship.id) return;
       const references = buildReferencesTo(statuses, status);
       deleteStatus(state, status.id, references, relationship.id);
     });
diff --git a/packages/pl-fe/src/selectors/index.ts b/packages/pl-fe/src/selectors/index.ts
index 3b54990a4..5f12bf473 100644
--- a/packages/pl-fe/src/selectors/index.ts
+++ b/packages/pl-fe/src/selectors/index.ts
@@ -183,7 +183,7 @@ const makeGetNotification = () => createSelector([
   // @ts-ignore
   (state: RootState, notification: MinifiedNotification) => state.statuses.get(notification.status_id),
   (state: RootState, notification: MinifiedNotification) => notification.account_ids ? selectAccounts(state, notification.account_ids) : null,
-], (notification, account, target, status, accounts): Notification => ({
+], (notification, account, target, status, accounts): MinifiedNotification & Notification => ({
   ...notification,
   // @ts-ignore
   account: account || null,