From ba5e018e3ccbd28afa1e6c81793db49d5e6869e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 22 Oct 2023 00:14:23 +0200
Subject: [PATCH] Add 'local' to account schema
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 src/actions/moderation.tsx                                | 3 +--
 src/components/profile-hover-card.tsx                     | 3 +--
 src/components/status-action-bar.tsx                      | 5 ++---
 src/components/translate-button.tsx                       | 5 ++---
 src/features/account/components/header.tsx                | 8 ++++----
 src/features/event/components/event-header.tsx            | 3 +--
 .../account-moderation-modal/account-moderation-modal.tsx | 3 +--
 .../modals/report-modal/steps/other-actions-step.tsx      | 4 ++--
 src/features/ui/components/profile-info-panel.tsx         | 3 +--
 src/pages/profile-page.tsx                                | 4 ++--
 src/schemas/account.ts                                    | 3 +++
 src/utils/accounts.ts                                     | 7 -------
 12 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/src/actions/moderation.tsx b/src/actions/moderation.tsx
index bdaebba5c..52b418b11 100644
--- a/src/actions/moderation.tsx
+++ b/src/actions/moderation.tsx
@@ -9,7 +9,6 @@ import { Stack, Text } from 'soapbox/components/ui';
 import AccountContainer from 'soapbox/containers/account-container';
 import { selectAccount } from 'soapbox/selectors';
 import toast from 'soapbox/toast';
-import { isLocal } from 'soapbox/utils/accounts';
 
 import type { AppDispatch, RootState } from 'soapbox/store';
 
@@ -79,7 +78,7 @@ const deleteUserModal = (intl: IntlShape, accountId: string, afterConfirm = () =
     const account = selectAccount(state, accountId)!;
     const acct = account.acct;
     const name = account.username;
-    const local = isLocal(account);
+    const local = account.local;
 
     const message = (
       <Stack space={4}>
diff --git a/src/components/profile-hover-card.tsx b/src/components/profile-hover-card.tsx
index 9c06dd92c..0def77693 100644
--- a/src/components/profile-hover-card.tsx
+++ b/src/components/profile-hover-card.tsx
@@ -14,7 +14,6 @@ import Badge from 'soapbox/components/badge';
 import ActionButton from 'soapbox/features/ui/components/action-button';
 import { UserPanel } from 'soapbox/features/ui/util/async-components';
 import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
-import { isLocal } from 'soapbox/utils/accounts';
 
 import { showProfileHoverCard } from './hover-ref-wrapper';
 import { dateFormatOptions } from './relative-timestamp';
@@ -117,7 +116,7 @@ export const ProfileHoverCard: React.FC<IProfileHoverCard> = ({ visible = true }
               badges={badges}
             />
 
-            {isLocal(account) ? (
+            {account.local ? (
               <HStack alignItems='center' space={0.5}>
                 <Icon
                   src={require('@tabler/icons/calendar.svg')}
diff --git a/src/components/status-action-bar.tsx b/src/components/status-action-bar.tsx
index d16df70cc..1708a9b64 100644
--- a/src/components/status-action-bar.tsx
+++ b/src/components/status-action-bar.tsx
@@ -23,7 +23,6 @@ import { HStack } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
-import { isLocal, isRemote } from 'soapbox/utils/accounts';
 import copy from 'soapbox/utils/copy';
 import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji-reacts';
 
@@ -415,7 +414,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
         icon: require('@tabler/icons/clipboard-copy.svg'),
       });
 
-      if (features.embeds && isLocal(account)) {
+      if (features.embeds && account.local) {
         menu.push({
           text: intl.formatMessage(messages.embed),
           action: handleEmbed,
@@ -449,7 +448,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
       });
     }
 
-    if (features.federating && isRemote(account)) {
+    if (features.federating && !account.local) {
       menu.push({
         text: intl.formatMessage(messages.external, { domain }),
         action: handleExternalClick,
diff --git a/src/components/translate-button.tsx b/src/components/translate-button.tsx
index e74b9b82a..7a9c31976 100644
--- a/src/components/translate-button.tsx
+++ b/src/components/translate-button.tsx
@@ -3,11 +3,10 @@ import { FormattedMessage, useIntl } from 'react-intl';
 
 import { translateStatus, undoStatusTranslation } from 'soapbox/actions/statuses';
 import { useAppDispatch, useAppSelector, useFeatures, useInstance } from 'soapbox/hooks';
-import { isLocal } from 'soapbox/utils/accounts';
 
 import { Stack, Button, Text } from './ui';
 
-import type { Account, Status } from 'soapbox/types/entities';
+import type { Status } from 'soapbox/types/entities';
 
 interface ITranslateButton {
   status: Status;
@@ -28,7 +27,7 @@ const TranslateButton: React.FC<ITranslateButton> = ({ status }) => {
     target_languages: targetLanguages,
   } = instance.pleroma.metadata.translation;
 
-  const renderTranslate = (me || allowUnauthenticated) && (allowRemote || isLocal(status.account as Account)) && ['public', 'unlisted'].includes(status.visibility) && status.contentHtml.length > 0 && status.language !== null && intl.locale !== status.language;
+  const renderTranslate = (me || allowUnauthenticated) && (allowRemote || status.account.local) && ['public', 'unlisted'].includes(status.visibility) && status.contentHtml.length > 0 && status.language !== null && intl.locale !== status.language;
 
   const supportsLanguages = (!sourceLanguages || sourceLanguages.includes(status.language!)) && (!targetLanguages || targetLanguages.includes(intl.locale));
 
diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx
index 21c4b51d0..a8ac8440d 100644
--- a/src/features/account/components/header.tsx
+++ b/src/features/account/components/header.tsx
@@ -28,7 +28,7 @@ import { ChatKeys, useChats } from 'soapbox/queries/chats';
 import { queryClient } from 'soapbox/queries/client';
 import { Account } from 'soapbox/schemas';
 import toast from 'soapbox/toast';
-import { isDefaultHeader, isLocal, isRemote } from 'soapbox/utils/accounts';
+import { isDefaultHeader } from 'soapbox/utils/accounts';
 import copy from 'soapbox/utils/copy';
 import { MASTODON, parseVersion } from 'soapbox/utils/features';
 
@@ -287,7 +287,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
       return [];
     }
 
-    if (features.rssFeeds && isLocal(account)) {
+    if (features.rssFeeds && account.local) {
       menu.push({
         text: intl.formatMessage(messages.subscribeFeed),
         action: handleRssFeedClick,
@@ -303,7 +303,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
       });
     }
 
-    if (features.federating && isRemote(account)) {
+    if (features.federating && !account.local) {
       const domain = account.fqn.split('@')[1];
 
       menu.push({
@@ -453,7 +453,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
       });
     }
 
-    if (isRemote(account)) {
+    if (!account.local) {
       const domain = account.fqn.split('@')[1];
 
       menu.push(null);
diff --git a/src/features/event/components/event-header.tsx b/src/features/event/components/event-header.tsx
index bca538ad9..fd569acc8 100644
--- a/src/features/event/components/event-header.tsx
+++ b/src/features/event/components/event-header.tsx
@@ -19,7 +19,6 @@ import { Button, HStack, IconButton, Menu, MenuButton, MenuDivider, MenuItem, Me
 import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
 import VerificationBadge from 'soapbox/components/verification-badge';
 import { useAppDispatch, useFeatures, useOwnAccount, useSettings } from 'soapbox/hooks';
-import { isRemote } from 'soapbox/utils/accounts';
 import copy from 'soapbox/utils/copy';
 import { download } from 'soapbox/utils/download';
 import { shortNumberFormat } from 'soapbox/utils/numbers';
@@ -217,7 +216,7 @@ const EventHeader: React.FC<IEventHeader> = ({ status }) => {
       },
     ];
 
-    if (features.federating && isRemote(account)) {
+    if (features.federating && !account.local) {
       menu.push({
         text: intl.formatMessage(messages.external, { domain }),
         action: handleExternalClick,
diff --git a/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx b/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx
index dcb96c69d..2e7bcdb7e 100644
--- a/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx
+++ b/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx
@@ -12,7 +12,6 @@ import OutlineBox from 'soapbox/components/outline-box';
 import { Button, Text, HStack, Modal, Stack, Toggle } from 'soapbox/components/ui';
 import { useAppDispatch, useFeatures, useOwnAccount } from 'soapbox/hooks';
 import toast from 'soapbox/toast';
-import { isLocal } from 'soapbox/utils/accounts';
 import { getBadges } from 'soapbox/utils/badges';
 
 import BadgeInput from './badge-input';
@@ -115,7 +114,7 @@ const AccountModerationModal: React.FC<IAccountModerationModal> = ({ onClose, ac
         </OutlineBox>
 
         <List>
-          {(ownAccount.admin && isLocal(account)) && (
+          {(ownAccount.admin && account.local) && (
             <ListItem label={<FormattedMessage id='account_moderation_modal.fields.account_role' defaultMessage='Staff level' />}>
               <div className='w-auto'>
                 <StaffRolePicker account={account} />
diff --git a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
index a67439241..31b7f4879 100644
--- a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
+++ b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
@@ -7,7 +7,7 @@ import { fetchRules } from 'soapbox/actions/rules';
 import { Button, FormGroup, HStack, Stack, Text, Toggle } from 'soapbox/components/ui';
 import StatusCheckBox from 'soapbox/features/report/components/status-check-box';
 import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
-import { isRemote, getDomain } from 'soapbox/utils/accounts';
+import { getDomain } from 'soapbox/utils/accounts';
 
 import type { Account } from 'soapbox/schemas';
 
@@ -31,7 +31,7 @@ const OtherActionsStep = ({ account }: IOtherActionsStep) => {
   const statusIds = useAppSelector((state) => OrderedSet(state.timelines.get(`account:${account.id}:with_replies`)!.items).union(state.reports.new.status_ids) as OrderedSet<string>);
   const isBlocked = useAppSelector((state) => state.reports.new.block);
   const isForward = useAppSelector((state) => state.reports.new.forward);
-  const canForward = isRemote(account) && features.federating;
+  const canForward = !account.local && features.federating;
   const isSubmitting = useAppSelector((state) => state.reports.new.isSubmitting);
 
   const [showAdditionalStatuses, setShowAdditionalStatuses] = useState<boolean>(false);
diff --git a/src/features/ui/components/profile-info-panel.tsx b/src/features/ui/components/profile-info-panel.tsx
index 244434b8b..f3556cf7f 100644
--- a/src/features/ui/components/profile-info-panel.tsx
+++ b/src/features/ui/components/profile-info-panel.tsx
@@ -7,7 +7,6 @@ import Markup from 'soapbox/components/markup';
 import { dateFormatOptions } from 'soapbox/components/relative-timestamp';
 import { Icon, HStack, Stack, Text } from 'soapbox/components/ui';
 import { useAppSelector, useSoapboxConfig } from 'soapbox/hooks';
-import { isLocal } from 'soapbox/utils/accounts';
 import { badgeToTag, getBadges as getAccountBadges } from 'soapbox/utils/badges';
 import { capitalize } from 'soapbox/utils/strings';
 
@@ -176,7 +175,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
         )}
 
         <div className='flex flex-col items-start gap-2 md:flex-row md:flex-wrap md:items-center'>
-          {isLocal(account) ? (
+          {account.local ? (
             <HStack alignItems='center' space={0.5}>
               <Icon
                 src={require('@tabler/icons/calendar.svg')}
diff --git a/src/pages/profile-page.tsx b/src/pages/profile-page.tsx
index 4f0531dd7..5a0001e69 100644
--- a/src/pages/profile-page.tsx
+++ b/src/pages/profile-page.tsx
@@ -17,7 +17,7 @@ import {
   AccountNotePanel,
 } from 'soapbox/features/ui/util/async-components';
 import { useAppSelector, useFeatures, useSoapboxConfig } from 'soapbox/hooks';
-import { getAcct, isLocal } from 'soapbox/utils/accounts';
+import { getAcct } from 'soapbox/utils/accounts';
 
 interface IProfilePage {
   params?: {
@@ -118,7 +118,7 @@ const ProfilePage: React.FC<IProfilePage> = ({ params, children }) => {
         {(account && account.fields.length > 0) && (
           <ProfileFieldsPanel account={account} />
         )}
-        {(features.accountEndorsements && account && isLocal(account)) ? (
+        {(features.accountEndorsements && account && account.local) ? (
           <PinnedAccountsPanel account={account} limit={5} />
         ) : me && features.suggestions && (
           <WhoToFollowPanel limit={3} />
diff --git a/src/schemas/account.ts b/src/schemas/account.ts
index 88128c35e..fec6c18b2 100644
--- a/src/schemas/account.ts
+++ b/src/schemas/account.ts
@@ -38,6 +38,7 @@ const baseAccountSchema = z.object({
   header_static: z.string().url().optional().catch(undefined),
   id: z.string(),
   last_status_at: z.string().datetime().optional().catch(undefined),
+  local: z.boolean().catch(false),
   location: z.string().optional().catch(undefined),
   locked: z.boolean().catch(false),
   moved: z.literal(null).catch(null),
@@ -65,6 +66,7 @@ const baseAccountSchema = z.object({
     hide_follows: z.boolean().catch(false),
     hide_follows_count: z.boolean().catch(false),
     is_admin: z.boolean().catch(false),
+    is_local: z.boolean().optional().catch(undefined),
     is_moderator: z.boolean().catch(false),
     is_suggested: z.boolean().catch(false),
     location: z.string().optional().catch(undefined),
@@ -134,6 +136,7 @@ const transformAccount = <T extends TransformableAccount>({ pleroma, other_setti
     fqn: account.fqn || (account.acct.includes('@') ? account.acct : `${account.acct}@${domain}`),
     header_static: account.header_static || account.header,
     moderator: pleroma?.is_moderator || false,
+    local: pleroma?.is_local !== undefined ? pleroma.is_local : account.acct.split('@')[1] === undefined,
     location: account.location || pleroma?.location || other_settings?.location || '',
     note_emojified: emojify(account.note, customEmojiMap),
     pleroma: (() => {
diff --git a/src/utils/accounts.ts b/src/utils/accounts.ts
index 51122dfc5..c23344e87 100644
--- a/src/utils/accounts.ts
+++ b/src/utils/accounts.ts
@@ -26,13 +26,6 @@ export const getAcct = (account: Pick<Account, 'fqn' | 'acct'>, displayFqn: bool
   displayFqn === true ? account.fqn : account.acct
 );
 
-export const isLocal = (account: Pick<Account, 'acct'>): boolean => {
-  const domain: string = account.acct.split('@')[1];
-  return domain === undefined ? true : false;
-};
-
-export const isRemote = (account: Pick<Account, 'acct'>): boolean => !isLocal(account);
-
 /** Default header filenames from various backends */
 const DEFAULT_HEADERS: string[] = [
   '/headers/original/missing.png', // Mastodon