Merge branch 'account-local' into 'main'

Add 'local' to account schema

See merge request soapbox-pub/soapbox!2835

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);

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';
@@ -29,7 +28,7 @@ import EventActionButton from '../components/event-action-button';
 import EventDate from '../components/event-date';
 
 import type { Menu as MenuType } from 'soapbox/components/dropdown-menu';
-import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities';
+import type { Status as StatusEntity } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   bannerHeader: { id: 'event.banner', defaultMessage: 'Event banner' },
@@ -89,7 +88,7 @@ const EventHeader: React.FC<IEventHeader> = ({ status }) => {
     );
   }
 
-  const account = status.account as AccountEntity;
+  const account = status.account;
   const event = status.event;
   const banner = event.banner;
 
@@ -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,

src/features/scheduled-statuses/components/scheduled-status.tsx

@@ -13,7 +13,7 @@ import { buildStatus } from '../builder';
 
 import ScheduledStatusActionBar from './scheduled-status-action-bar';
 
-import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities';
+import type { Status as StatusEntity } from 'soapbox/types/entities';
 
 interface IScheduledStatus {
   statusId: string;
@@ -28,7 +28,7 @@ const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) =>
 
   if (!status) return null;
 
-  const account = status.account as AccountEntity;
+  const account = status.account;
 
   return (
     <div className={clsx('status__wrapper', `status__wrapper-${status.visibility}`, { 'status__wrapper-reply': !!status.in_reply_to_id })} tabIndex={0}>

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} />

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);

src/features/ui/components/pending-status.tsx

@@ -14,7 +14,7 @@ import { buildStatus } from '../util/pending-status-builder';
 
 import PollPreview from './poll-preview';
 
-import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities';
+import type { Status as StatusEntity } from 'soapbox/types/entities';
 
 const shouldHaveCard = (pendingStatus: StatusEntity) => {
   return Boolean(pendingStatus.content.match(/https?:\/\/\S*/));
@@ -54,7 +54,7 @@ const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, mu
   if (!status) return null;
   if (!status.account) return null;
 
-  const account = status.account as AccountEntity;
+  const account = status.account;
 
   return (
     <div className={clsx('opacity-50', className)}>

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')}