Merge remote-tracking branch 'origin/main' into frontend-rw

Signed-off-by: Marcin Mikołajczak <git@mkljczk.pl>

src/actions/emoji-reacts.ts

@@ -1,4 +1,4 @@
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { List as ImmutableList } from 'immutable';
 
 import { isLoggedIn } from 'soapbox/utils/auth';
 
@@ -8,7 +8,7 @@ import { importFetchedAccounts, importFetchedStatus } from './importer';
 import { favourite, unfavourite } from './interactions';
 
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { APIEntity, Status } from 'soapbox/types/entities';
+import type { APIEntity, EmojiReaction, Status } from 'soapbox/types/entities';
 
 const EMOJI_REACT_REQUEST = 'EMOJI_REACT_REQUEST';
 const EMOJI_REACT_SUCCESS = 'EMOJI_REACT_SUCCESS';
@@ -26,17 +26,17 @@ const noOp = () => () => new Promise(f => f(undefined));
 
 const simpleEmojiReact = (status: Status, emoji: string, custom?: string) =>
   (dispatch: AppDispatch) => {
-    const emojiReacts: ImmutableList<ImmutableMap<string, any>> = status.pleroma.get('emoji_reactions') || ImmutableList();
+    const emojiReacts: ImmutableList<EmojiReaction> = status.reactions || ImmutableList();
 
     if (emoji === '👍' && status.favourited) return dispatch(unfavourite(status));
 
-    const undo = emojiReacts.filter(e => e.get('me') === true && e.get('name') === emoji).count() > 0;
+    const undo = emojiReacts.filter(e => e.me === true && e.name === emoji).count() > 0;
     if (undo) return dispatch(unEmojiReact(status, emoji));
 
     return Promise.all([
       ...emojiReacts
-        .filter((emojiReact) => emojiReact.get('me') === true)
+        .filter((emojiReact) => emojiReact.me === true)
-        .map(emojiReact => dispatch(unEmojiReact(status, emojiReact.get('name')))).toArray(),
+        .map(emojiReact => dispatch(unEmojiReact(status, emojiReact.name))).toArray(),
       status.favourited && dispatch(unfavourite(status)),
     ]).then(() => {
       if (emoji === '👍') {

src/actions/mrf.ts

@@ -1,4 +1,4 @@
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
+import { Set as ImmutableSet } from 'immutable';
 
 import ConfigDB from 'soapbox/utils/config-db';
 
@@ -7,9 +7,9 @@ import { fetchConfig, updateConfig } from './admin';
 import type { MRFSimple } from 'soapbox/schemas/pleroma';
 import type { AppDispatch, RootState } from 'soapbox/store';
 
-const simplePolicyMerge = (simplePolicy: MRFSimple, host: string, restrictions: ImmutableMap<string, any>) => {
+const simplePolicyMerge = (simplePolicy: MRFSimple, host: string, restrictions: Record<string, any>) => {
   const entries = Object.entries(simplePolicy).map(([key, hosts]) => {
-    const isRestricted = restrictions.get(key);
+    const isRestricted = restrictions[key];
 
     if (isRestricted) {
       return [key, ImmutableSet(hosts).add(host).toJS()];
@@ -21,7 +21,7 @@ const simplePolicyMerge = (simplePolicy: MRFSimple, host: string, restrictions:
   return Object.fromEntries(entries);
 };
 
-const updateMrf = (host: string, restrictions: ImmutableMap<string, any>) =>
+const updateMrf = (host: string, restrictions: Record<string, any>) =>
   (dispatch: AppDispatch, getState: () => RootState) =>
     dispatch(fetchConfig())
       .then(() => {

src/components/polls/poll-option.tsx

@@ -122,7 +122,7 @@ const PollOption: React.FC<IPollOption> = (props): JSX.Element | null => {
   return (
     <div key={option.title}>
       {showResults ? (
-        <div title={voted ? message : undefined}>
+        <div title={message}>
           <HStack
             justifyContent='between'
             alignItems='center'

src/components/sidebar-menu.tsx

@@ -35,6 +35,7 @@ const messages = defineMessages({
   invites: { id: 'navigation_bar.invites', defaultMessage: 'Invites' },
   developers: { id: 'navigation.developers', defaultMessage: 'Developers' },
   addAccount: { id: 'profile_dropdown.add_account', defaultMessage: 'Add an existing account' },
+  addExternalAccount: { id: 'profile_dropdown.add_external_account', defaultMessage: 'Add account from external instance' },
   followRequests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
 });
@@ -331,6 +332,11 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                           <Icon className='h-4 w-4 text-primary-500' src={require('@tabler/icons/plus.svg')} />
                           <Text size='sm' weight='medium'>{intl.formatMessage(messages.addAccount)}</Text>
                         </NavLink>
+
+                        <NavLink className='flex items-center space-x-1 py-2' to='/login/external' onClick={handleClose}>
+                          <Icon className='h-4 w-4 text-primary-500' src={require('@tabler/icons/plus.svg')} />
+                          <Text size='sm' weight='medium'>{intl.formatMessage(messages.addExternalAccount)}</Text>
+                        </NavLink>
                       </div>
                     )}
                   </Stack>

src/components/status-action-bar.tsx

@@ -1,4 +1,3 @@
-import { List as ImmutableList } from 'immutable';
 import React, { useMemo } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { useHistory, useRouteMatch } from 'react-router-dom';
@@ -659,15 +658,15 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
   const reblogCount = status.reblogs_count;
   const favouriteCount = status.favourites_count;
 
-  const emojiReactCount = reduceEmoji(
+  const emojiReactCount = status.reactions ? reduceEmoji(
-    (status.pleroma.get('emoji_reactions') || ImmutableList()) as ImmutableList<any>,
+    status.reactions,
     favouriteCount,
     status.favourited,
     allowedEmoji,
-  ).reduce((acc, cur) => acc + cur.get('count'), 0);
+  ).reduce((acc, cur) => acc + (cur.count || 0), 0) : undefined;
 
   const meEmojiReact = getReactForStatus(status, allowedEmoji);
-  const meEmojiName = meEmojiReact?.get('name') as keyof typeof reactMessages | undefined;
+  const meEmojiName = meEmojiReact?.name as keyof typeof reactMessages | undefined;
 
   const reactMessages = {
     '👍': messages.reactionLike,

src/components/status-action-button.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 import { Text, Icon, Emoji } from 'soapbox/components/ui';
 import { shortNumberFormat } from 'soapbox/utils/numbers';
 
-import type { Map as ImmutableMap } from 'immutable';
+import type { EmojiReaction } from 'soapbox/schemas';
 
 const COLORS = {
   accent: 'accent',
@@ -33,7 +33,7 @@ interface IStatusActionButton extends React.ButtonHTMLAttributes<HTMLButtonEleme
   active?: boolean;
   color?: Color;
   filled?: boolean;
-  emoji?: ImmutableMap<string, any>;
+  emoji?: EmojiReaction;
   text?: React.ReactNode;
   theme?: 'default' | 'inverse';
 }
@@ -45,7 +45,7 @@ const StatusActionButton = React.forwardRef<HTMLButtonElement, IStatusActionButt
     if (emoji) {
       return (
         <span className='flex h-6 w-6 items-center justify-center'>
-          <Emoji className='h-full w-full p-0.5' emoji={emoji.get('name')} src={emoji.get('url')} />
+          <Emoji className='h-full w-full p-0.5' emoji={emoji.name} src={emoji.url} />
         </span>
       );
     } else {

src/components/status-reaction-wrapper.tsx

@@ -71,7 +71,7 @@ const StatusReactionWrapper: React.FC<IStatusReactionWrapper> = ({ statusId, chi
   };
 
   const handleClick: React.EventHandler<React.MouseEvent> = e => {
-    const meEmojiReact = getReactForStatus(status, soapboxConfig.allowedEmoji)?.get('name') || '👍';
+    const meEmojiReact = getReactForStatus(status, soapboxConfig.allowedEmoji)?.name || '👍';
 
     if (isUserTouching()) {
       if (ownAccount) {

src/features/hashtag-timeline/index.tsx

@@ -7,7 +7,7 @@ import { useHashtagStream } from 'soapbox/api/hooks';
 import List, { ListItem } from 'soapbox/components/list';
 import { Column, Toggle } from 'soapbox/components/ui';
 import Timeline from 'soapbox/features/ui/components/timeline';
-import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector, useFeatures, useLoggedIn } from 'soapbox/hooks';
 
 interface IHashtagTimeline {
   params?: {
@@ -23,6 +23,7 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   const intl = useIntl();
   const tag = useAppSelector((state) => state.tags.get(id));
   const next = useAppSelector(state => state.timelines.get(`hashtag:${id}`)?.next);
+  const { isLoggedIn } = useLoggedIn();
 
   const handleLoadMore = (maxId: string) => {
     dispatch(expandHashtagTimeline(id, { url: next, maxId }, intl));
@@ -50,7 +51,7 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
 
   return (
     <Column label={`#${id}`} transparent>
-      {features.followHashtags && (
+      {features.followHashtags && isLoggedIn && (
         <List>
           <ListItem
             label={<FormattedMessage id='hashtag.follow' defaultMessage='Follow hashtag' />}

src/features/status/components/status-interaction-bar.tsx

@@ -1,6 +1,4 @@
-import clsx from 'clsx';
+import clsx from 'clsx';import React from 'react';
-import { List as ImmutableList } from 'immutable';
-import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Link } from 'react-router-dom';
 
@@ -59,7 +57,7 @@ const StatusInteractionBar: React.FC<IStatusInteractionBar> = ({ status }): JSX.
 
   const getNormalizedReacts = () => {
     return reduceEmoji(
-      ImmutableList(status.pleroma.get('emoji_reactions') as any),
+      status.reactions,
       status.favourites_count,
       status.favourited,
       allowedEmoji,
@@ -164,20 +162,22 @@ const StatusInteractionBar: React.FC<IStatusInteractionBar> = ({ status }): JSX.
   const getEmojiReacts = () => {
     const emojiReacts = getNormalizedReacts();
     const count = emojiReacts.reduce((acc, cur) => (
-      acc + cur.get('count')
+      acc + (cur.count || 0)
     ), 0);
 
+    const handleClick = features.emojiReacts ? handleOpenReactionsModal : handleOpenFavouritesModal;
+
     if (count) {
       return (
-        <InteractionCounter count={count} onClick={features.exposableReactions ? handleOpenReactionsModal : undefined}>
+        <InteractionCounter count={count} onClick={features.exposableReactions ? handleClick : undefined}>
           <HStack space={0.5} alignItems='center'>
             {emojiReacts.take(3).map((e, i) => {
               return (
                 <Emoji
                   key={i}
                   className='h-4.5 w-4.5 flex-none'
-                  emoji={e.get('name')}
+                  emoji={e.name}
-                  src={e.get('url')}
+                  src={e.url}
                 />
               );
             })}
@@ -193,7 +193,7 @@ const StatusInteractionBar: React.FC<IStatusInteractionBar> = ({ status }): JSX.
     <HStack space={3}>
       {getReposts()}
       {getQuotes()}
-      {features.emojiReacts ? getEmojiReacts() : getFavourites()}
+      {(features.emojiReacts || features.emojiReactsMastodon) ? getEmojiReacts() : getFavourites()}
       {getDislikes()}
     </HStack>
   );

src/features/ui/components/modals/edit-federation-modal.tsx

@@ -30,24 +30,25 @@ const EditFederationModal: React.FC<IEditFederationModal> = ({ host, onClose })
   const getRemoteInstance = useCallback(makeGetRemoteInstance(), []);
   const remoteInstance = useAppSelector(state => getRemoteInstance(state, host));
 
-  const [data, setData] = useState({} as any);
+  const [data, setData] = useState<Record<string, any>>({});
 
   useEffect(() => {
-    setData(remoteInstance.get('federation'));
+    setData(remoteInstance.get('federation') as Record<string, any>);
   }, [remoteInstance]);
 
   const handleDataChange = (key: string): React.ChangeEventHandler<HTMLInputElement> => {
     return ({ target }) => {
-      setData(data.set(key, target.checked));
+      setData({ ...data, [key]: target.checked });
     };
   };
 
   const handleMediaRemoval: React.ChangeEventHandler<HTMLInputElement> = ({ target: { checked } }) => {
-    const newData = data.merge({
+    const newData = {
+      ...data,
       avatar_removal: checked,
       banner_removal: checked,
       media_removal: checked,
-    });
+    };
 
     setData(newData);
   };

src/features/ui/components/profile-dropdown.tsx

@@ -17,6 +17,7 @@ import type { Account as AccountEntity } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   add: { id: 'profile_dropdown.add_account', defaultMessage: 'Add an existing account' },
+  addExternal: { id: 'profile_dropdown.add_external_account', defaultMessage: 'Add account from external instance' },
   theme: { id: 'profile_dropdown.theme', defaultMessage: 'Theme' },
   logout: { id: 'profile_dropdown.logout', defaultMessage: 'Log out @{acct}' },
 });
@@ -90,6 +91,12 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
       icon: require('@tabler/icons/plus.svg'),
     });
 
+    menu.push({
+      text: intl.formatMessage(messages.addExternal),
+      to: '/login/external',
+      icon: require('@tabler/icons/plus.svg'),
+    });
+
     menu.push({
       text: intl.formatMessage(messages.logout, { acct: account.acct }),
       to: '/logout',

src/normalizers/status.ts

@@ -13,10 +13,10 @@ import {
 import { normalizeAttachment } from 'soapbox/normalizers/attachment';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
 import { normalizeMention } from 'soapbox/normalizers/mention';
-import { accountSchema, cardSchema, groupSchema, pollSchema, tombstoneSchema } from 'soapbox/schemas';
+import { accountSchema, cardSchema, emojiReactionSchema, groupSchema, pollSchema, tombstoneSchema } from 'soapbox/schemas';
 import { maybeFromJS } from 'soapbox/utils/normalizers';
 
-import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity } from 'soapbox/types/entities';
+import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity, EmojiReaction } from 'soapbox/types/entities';
 
 export type StatusApprovalStatus = 'pending' | 'approval' | 'rejected';
 export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct' | 'self' | 'group';
@@ -69,6 +69,7 @@ export const StatusRecord = ImmutableRecord({
   poll: null as EmbeddedEntity<Poll>,
   quote: null as EmbeddedEntity<any>,
   quotes_count: 0,
+  reactions: null as ImmutableList<EmojiReaction> | null,
   reblog: null as EmbeddedEntity<any>,
   reblogged: false,
   reblogs_count: 0,
@@ -105,8 +106,8 @@ const normalizeMentions = (status: ImmutableMap<string, any>) => {
   });
 };
 
-// Normalize emojis
+// Normalize emoji reactions
-const normalizeEmojis = (entity: ImmutableMap<string, any>) => {
+const normalizeReactions = (entity: ImmutableMap<string, any>) => {
   return entity.update('emojis', ImmutableList(), emojis => {
     return emojis.map(normalizeEmoji);
   });
@@ -227,6 +228,14 @@ const normalizeEvent = (status: ImmutableMap<string, any>) => {
   }
 };
 
+// Normalize emojis
+const normalizeEmojis = (status: ImmutableMap<string, any>) => {
+  const reactions = status.getIn(['pleroma', 'emoji_reactions'], status.get('reactions')) as ImmutableList<ImmutableMap<string, any>>;
+  if (reactions) {
+    status.set('reactions', ImmutableList(reactions.map(((reaction: ImmutableMap<string, any>) => emojiReactionSchema.parse(reaction.toJS())))));
+  }
+};
+
 /** Rewrite `<p></p>` to empty string. */
 const fixContent = (status: ImmutableMap<string, any>) => {
   if (status.get('content') === '<p></p>') {
@@ -285,6 +294,7 @@ export const normalizeStatus = (status: Record<string, any>) => {
       fixTranslation(status);
       fixSensitivity(status);
       normalizeEvent(status);
+      normalizeReactions(status);
       fixContent(status);
       normalizeFilterResults(status);
       normalizeDislikes(status);

src/reducers/statuses.ts

@@ -281,13 +281,13 @@ export default function statuses(state = initialState, action: AnyAction): State
     case EMOJI_REACT_REQUEST:
       return state
         .updateIn(
-          [action.status.id, 'pleroma', 'emoji_reactions'],
+          [action.status.id, 'reactions'],
           emojiReacts => simulateEmojiReact(emojiReacts as any, action.emoji, action.custom),
         );
     case UNEMOJI_REACT_REQUEST:
       return state
         .updateIn(
-          [action.status.id, 'pleroma', 'emoji_reactions'],
+          [action.status.id, 'reactions'],
           emojiReacts => simulateUnEmojiReact(emojiReacts as any, action.emoji),
         );
     case FAVOURITE_FAIL:

src/schemas/instance.ts

@@ -49,6 +49,9 @@ const configurationSchema = coerceObject({
     max_options: z.number().optional().catch(undefined),
     min_expiration: z.number().optional().catch(undefined),
   }),
+  reactions: coerceObject({
+    max_reactions: z.number().catch(0),
+  }),
   statuses: coerceObject({
     max_characters: z.number().optional().catch(undefined),
     max_media_attachments: z.number().optional().catch(undefined),

src/schemas/status.ts

@@ -19,7 +19,6 @@ import { contentSchema, dateSchema, filteredArray, makeCustomEmojiMap } from './
 import type { Resolve } from 'soapbox/utils/types';
 
 const statusPleromaSchema = z.object({
-  emoji_reactions: filteredArray(emojiReactionSchema),
   event: eventSchema.nullish().catch(undefined),
   quote: z.literal(null).catch(null),
   quote_visible: z.boolean().catch(true),
@@ -51,6 +50,7 @@ const baseStatusSchema = z.object({
   muted: z.coerce.boolean(),
   pinned: z.coerce.boolean(),
   pleroma: statusPleromaSchema.optional().catch(undefined),
+  reactions: filteredArray(emojiReactionSchema),
   poll: pollSchema.nullable().catch(null),
   quote: z.literal(null).catch(null),
   quotes_count: z.number().catch(0),
@@ -131,16 +131,18 @@ const statusSchema = baseStatusSchema.extend({
   reblog: embeddedStatusSchema,
   pleroma: statusPleromaSchema.extend({
     quote: embeddedStatusSchema,
+    emoji_reactions: filteredArray(emojiReactionSchema),
   }).optional().catch(undefined),
 }).transform(({ pleroma, ...status }) => {
   return {
     ...status,
     event: pleroma?.event,
     quote: pleroma?.quote || status.quote || null,
+    reactions: pleroma?.emoji_reactions || status.reactions || null,
     // There's apparently no better way to do this...
     // Just trying to remove the `event` and `quote` keys from the object.
     pleroma: pleroma ? (() => {
-      const { event, quote, ...rest } = pleroma;
+      const { event, quote, emoji_reactions, ...rest } = pleroma;
       return rest;
     })() : undefined,
   };

src/utils/config-db.ts

@@ -9,7 +9,7 @@ import trimStart from 'lodash/trimStart';
 import { type MRFSimple, mrfSimpleSchema } from 'soapbox/schemas/pleroma';
 
 export type Config = ImmutableMap<string, any>;
-export type Policy = ImmutableMap<string, any>;
+export type Policy = Record<string, any>;
 
 const find = (
   configs: ImmutableList<Config>,
@@ -40,15 +40,15 @@ const toSimplePolicy = (configs: ImmutableList<Config>): MRFSimple => {
 };
 
 const fromSimplePolicy = (simplePolicy: Policy): ImmutableList<Config> => {
-  const mapper = (hosts: ImmutableList<string>, key: string) => fromJS({ tuple: [`:${key}`, hosts.toJS()] });
+  const mapper = ([key, hosts]: [key: string, hosts: ImmutableList<string>]) => fromJS({ tuple: [`:${key}`, hosts] });
 
-  const value = simplePolicy.map(mapper).toList();
+  const value = Object.entries(simplePolicy).map(mapper);
 
   return ImmutableList([
     ImmutableMap({
       group: ':pleroma',
       key: ':mrf_simple',
-      value,
+      value: ImmutableList(value),
     }),
   ]);
 };

src/utils/emoji-reacts.test.ts

@@ -1,11 +1,11 @@
-import { List as ImmutableList, Map as ImmutableMap, fromJS } from 'immutable';
+import { List as ImmutableList, fromJS } from 'immutable';
 
 import { normalizeStatus } from 'soapbox/normalizers';
+import { emojiReactionSchema } from 'soapbox/schemas';
 
 import {
   sortEmoji,
   mergeEmojiFavourites,
-  oneEmojiPerAccount,
   reduceEmoji,
   getReactForStatus,
   simulateEmojiReact,
@@ -23,7 +23,7 @@ const ALLOWED_EMOJI = ImmutableList([
 
 describe('sortEmoji', () => {
   describe('with an unsorted list of emoji', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 7,  'me': true, 'name': '😃' },
       { 'count': 7,  'me': true, 'name': '😯' },
       { 'count': 3,  'me': true, 'name': '😢' },
@@ -31,7 +31,7 @@ describe('sortEmoji', () => {
       { 'count': 20, 'me': true, 'name': '👍' },
       { 'count': 7,  'me': true, 'name': '😂' },
       { 'count': 15, 'me': true, 'name': '❤' },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     it('sorts the emoji by count', () => {
       expect(sortEmoji(emojiReacts, ALLOWED_EMOJI)).toEqual(fromJS([
         { 'count': 20, 'me': true, 'name': '👍' },
@@ -51,11 +51,11 @@ describe('mergeEmojiFavourites', () => {
   const favourited = true;
 
   describe('with existing 👍 reacts', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 20, 'me': false, 'name': '👍', 'url': undefined },
       { 'count': 15, 'me': false, 'name': '❤', 'url': undefined },
       { 'count': 7,  'me': false, 'name': '😯', 'url': undefined },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     it('combines 👍 reacts with favourites', () => {
       expect(mergeEmojiFavourites(emojiReacts, favouritesCount, favourited)).toEqual(fromJS([
         { 'count': 32, 'me': true,  'name': '👍', 'url': undefined },
@@ -66,10 +66,10 @@ describe('mergeEmojiFavourites', () => {
   });
 
   describe('without existing 👍 reacts', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 15, 'me': false, 'name': '❤' },
       { 'count': 7,  'me': false, 'name': '😯' },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     it('adds 👍 reacts to the map equaling favourite count', () => {
       expect(mergeEmojiFavourites(emojiReacts, favouritesCount, favourited)).toEqual(fromJS([
         { 'count': 15, 'me': false, 'name': '❤' },
@@ -88,7 +88,7 @@ describe('mergeEmojiFavourites', () => {
 
 describe('reduceEmoji', () => {
   describe('with a clusterfuck of emoji', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 1,  'me': false, 'name': '😡' },
       { 'count': 1,  'me': true,  'name': '🔪' },
       { 'count': 7,  'me': true,  'name': '😯' },
@@ -99,7 +99,7 @@ describe('reduceEmoji', () => {
       { 'count': 15, 'me': true,  'name': '❤' },
       { 'count': 1,  'me': false, 'name': '👀' },
       { 'count': 1,  'me': false, 'name': '🍩' },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     it('sorts, filters, and combines emoji and favourites', () => {
       expect(reduceEmoji(emojiReacts, 7, true, ALLOWED_EMOJI)).toEqual(fromJS([
         { 'count': 27, 'me': true,  'name': '👍' },
@@ -117,22 +117,6 @@ describe('reduceEmoji', () => {
   });
 });
 
-describe('oneEmojiPerAccount', () => {
-  it('reduces to one react per account', () => {
-    const emojiReacts = fromJS([
-      // Sorted
-      { 'count': 2, 'me': true,  'name': '👍', accounts: [{ id: '1' }, { id: '2' }] },
-      { 'count': 2, 'me': true,  'name': '❤', accounts: [{ id: '1' }, { id: '2' }] },
-      { 'count': 1, 'me': true,  'name': '😯', accounts: [{ id: '1' }] },
-      { 'count': 1, 'me': false, 'name': '😂', accounts: [{ id: '3' }] },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
-    expect(oneEmojiPerAccount(emojiReacts, '1')).toEqual(fromJS([
-      { 'count': 2, 'me': true,  'name': '👍', accounts: [{ id: '1' }, { id: '2' }] },
-      { 'count': 1, 'me': false, 'name': '😂', accounts: [{ id: '3' }] },
-    ]));
-  });
-});
-
 describe('getReactForStatus', () => {
   it('returns a single owned react (including favourite) for the status', () => {
     const status = normalizeStatus(fromJS({
@@ -146,12 +130,12 @@ describe('getReactForStatus', () => {
         ],
       },
     }));
-    expect(getReactForStatus(status, ALLOWED_EMOJI)?.get('name')).toEqual('❤');
+    expect(getReactForStatus(status, ALLOWED_EMOJI)?.name).toEqual('❤');
   });
 
   it('returns a thumbs-up for a favourite', () => {
     const status = normalizeStatus(fromJS({ favourites_count: 1, favourited: true }));
-    expect(getReactForStatus(status)?.get('name')).toEqual('👍');
+    expect(getReactForStatus(status)?.name).toEqual('👍');
   });
 
   it('returns undefined when a status has no reacts (or favourites)', () => {
@@ -172,10 +156,10 @@ describe('getReactForStatus', () => {
 
 describe('simulateEmojiReact', () => {
   it('adds the emoji to the list', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 2, 'me': false, 'name': '👍', 'url': undefined },
       { 'count': 2, 'me': false, 'name': '❤', 'url': undefined },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     expect(simulateEmojiReact(emojiReacts, '❤')).toEqual(fromJS([
       { 'count': 2, 'me': false, 'name': '👍', 'url': undefined },
       { 'count': 3, 'me': true,  'name': '❤', 'url': undefined },
@@ -183,10 +167,10 @@ describe('simulateEmojiReact', () => {
   });
 
   it('creates the emoji if it didn\'t already exist', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 2, 'me': false, 'name': '👍', 'url': undefined },
       { 'count': 2, 'me': false, 'name': '❤', 'url': undefined },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     expect(simulateEmojiReact(emojiReacts, '😯')).toEqual(fromJS([
       { 'count': 2, 'me': false, 'name': '👍', 'url': undefined },
       { 'count': 2, 'me': false, 'name': '❤', 'url': undefined },
@@ -195,10 +179,10 @@ describe('simulateEmojiReact', () => {
   });
 
   it('adds a custom emoji to the list', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 2, 'me': false, 'name': '👍', 'url': undefined },
       { 'count': 2, 'me': false, 'name': '❤', 'url': undefined },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     expect(simulateEmojiReact(emojiReacts, 'soapbox', 'https://gleasonator.com/emoji/Gleasonator/soapbox.png')).toEqual(fromJS([
       { 'count': 2, 'me': false, 'name': '👍', 'url': undefined },
       { 'count': 2, 'me': false,  'name': '❤', 'url': undefined },
@@ -209,10 +193,10 @@ describe('simulateEmojiReact', () => {
 
 describe('simulateUnEmojiReact', () => {
   it('removes the emoji from the list', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 2, 'me': false, 'name': '👍' },
       { 'count': 3, 'me': true, 'name': '❤' },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     expect(simulateUnEmojiReact(emojiReacts, '❤')).toEqual(fromJS([
       { 'count': 2, 'me': false, 'name': '👍' },
       { 'count': 2, 'me': false,  'name': '❤' },
@@ -220,11 +204,11 @@ describe('simulateUnEmojiReact', () => {
   });
 
   it('removes the emoji if it\'s the last one in the list', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 2, 'me': false, 'name': '👍' },
       { 'count': 2, 'me': false, 'name': '❤' },
       { 'count': 1, 'me': true,  'name': '😯' },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     expect(simulateUnEmojiReact(emojiReacts, '😯')).toEqual(fromJS([
       { 'count': 2, 'me': false, 'name': '👍' },
       { 'count': 2, 'me': false, 'name': '❤' },
@@ -232,11 +216,11 @@ describe('simulateUnEmojiReact', () => {
   });
 
   it ('removes custom emoji from the list', () => {
-    const emojiReacts = fromJS([
+    const emojiReacts = ImmutableList([
       { 'count': 2, 'me': false, 'name': '👍' },
       { 'count': 2, 'me': false, 'name': '❤' },
       { 'count': 1, 'me': true,  'name': 'soapbox', 'url': 'https://gleasonator.com/emoji/Gleasonator/soapbox.png' },
-    ]) as ImmutableList<ImmutableMap<string, any>>;
+    ].map((react) => emojiReactionSchema.parse(react)));
     expect(simulateUnEmojiReact(emojiReacts, 'soapbox')).toEqual(fromJS([
       { 'count': 2, 'me': false, 'name': '👍' },
       { 'count': 2, 'me': false, 'name': '❤' },

src/utils/emoji-reacts.ts

@@ -1,9 +1,6 @@
-import {
+import { List as ImmutableList } from 'immutable';
-  Map as ImmutableMap,
-  List as ImmutableList,
-} from 'immutable';
 
-import type { Me } from 'soapbox/types/soapbox';
+import { EmojiReaction, emojiReactionSchema } from 'soapbox/schemas';
 
 // https://emojipedia.org/facebook
 // I've customized them.
@@ -16,18 +13,16 @@ export const ALLOWED_EMOJI = ImmutableList([
   '😩',
 ]);
 
-type Account = ImmutableMap<string, any>;
+export const sortEmoji = (emojiReacts: ImmutableList<EmojiReaction>, allowedEmoji: ImmutableList<string>): ImmutableList<EmojiReaction> => (
-type EmojiReact = ImmutableMap<string, any>;
-
-export const sortEmoji = (emojiReacts: ImmutableList<EmojiReact>, allowedEmoji: ImmutableList<string>): ImmutableList<EmojiReact> => (
   emojiReacts
     .sortBy(emojiReact =>
-      -(emojiReact.get('count') + Number(allowedEmoji.includes(emojiReact.get('name')))))
+      -((emojiReact.count || 0) + Number(allowedEmoji.includes(emojiReact.name))))
 );
 
-export const mergeEmojiFavourites = (emojiReacts = ImmutableList<EmojiReact>(), favouritesCount: number, favourited: boolean) => {
+export const mergeEmojiFavourites = (emojiReacts: ImmutableList<EmojiReaction> | null, favouritesCount: number, favourited: boolean) => {
+  if (!emojiReacts) return ImmutableList([emojiReactionSchema.parse({ count: favouritesCount, me: favourited, name: '👍' })]);
   if (!favouritesCount) return emojiReacts;
-  const likeIndex = emojiReacts.findIndex(emojiReact => emojiReact.get('name') === '👍');
+  const likeIndex = emojiReacts.findIndex(emojiReact => emojiReact.name === '👍');
   if (likeIndex > -1) {
     const likeCount = Number(emojiReacts.getIn([likeIndex, 'count']));
     favourited = favourited || Boolean(emojiReacts.getIn([likeIndex, 'me'], false));
@@ -35,69 +30,43 @@ export const mergeEmojiFavourites = (emojiReacts = ImmutableList<EmojiReact>(),
       .setIn([likeIndex, 'count'], likeCount + favouritesCount)
       .setIn([likeIndex, 'me'], favourited);
   } else {
-    return emojiReacts.push(ImmutableMap({ count: favouritesCount, me: favourited, name: '👍' }));
+    return emojiReacts.push(emojiReactionSchema.parse({ count: favouritesCount, me: favourited, name: '👍' }));
   }
 };
 
-const hasMultiReactions = (emojiReacts: ImmutableList<EmojiReact>, account: Account): boolean => (
+export const reduceEmoji = (emojiReacts: ImmutableList<EmojiReaction> | null, favouritesCount: number, favourited: boolean, allowedEmoji = ALLOWED_EMOJI): ImmutableList<EmojiReaction> => (
-  emojiReacts.filter(
-    e => e.get('accounts').filter(
-      (a: Account) => a.get('id') === account.get('id'),
-    ).count() > 0,
-  ).count() > 1
-);
-
-const inAccounts = (accounts: ImmutableList<Account>, id: string): boolean => (
-  accounts.filter(a => a.get('id') === id).count() > 0
-);
-
-export const oneEmojiPerAccount = (emojiReacts: ImmutableList<EmojiReact>, me: Me) => {
-  emojiReacts = emojiReacts.reverse();
-
-  return emojiReacts.reduce((acc, cur, idx) => {
-    const accounts = cur.get('accounts', ImmutableList())
-      .filter((a: Account) => !hasMultiReactions(acc, a));
-
-    return acc.set(idx, cur.merge({
-      accounts: accounts,
-      count: accounts.count(),
-      me: me ? inAccounts(accounts, me) : false,
-    }));
-  }, emojiReacts)
-    .filter(e => e.get('count') > 0)
-    .reverse();
-};
-
-export const reduceEmoji = (emojiReacts: ImmutableList<EmojiReact>, favouritesCount: number, favourited: boolean, allowedEmoji = ALLOWED_EMOJI): ImmutableList<EmojiReact> => (
   sortEmoji(
     mergeEmojiFavourites(emojiReacts, favouritesCount, favourited),
     allowedEmoji,
   ));
 
-export const getReactForStatus = (status: any, allowedEmoji = ALLOWED_EMOJI): EmojiReact | undefined => {
+export const getReactForStatus = (status: any, allowedEmoji = ALLOWED_EMOJI): EmojiReaction | undefined => {
+  if (!status.reactions) return;
+
   const result = reduceEmoji(
-    status.pleroma.get('emoji_reactions', ImmutableList()),
+    status.reactions,
     status.favourites_count || 0,
     status.favourited,
     allowedEmoji,
-  ).filter(e => e.get('me') === true)
+  ).filter(e => e.me === true)
     .get(0);
 
-  return typeof result?.get('name') === 'string' ? result : undefined;
+  return typeof result?.name === 'string' ? result : undefined;
 };
 
-export const simulateEmojiReact = (emojiReacts: ImmutableList<EmojiReact>, emoji: string, url?: string) => {
+export const simulateEmojiReact = (emojiReacts: ImmutableList<EmojiReaction>, emoji: string, url?: string) => {
-  const idx = emojiReacts.findIndex(e => e.get('name') === emoji);
+  const idx = emojiReacts.findIndex(e => e.name === emoji);
   const emojiReact = emojiReacts.get(idx);
 
   if (idx > -1 && emojiReact) {
-    return emojiReacts.set(idx, emojiReact.merge({
+    return emojiReacts.set(idx, emojiReactionSchema.parse({
-      count: emojiReact.get('count') + 1,
+      ...emojiReact,
+      count: (emojiReact.count || 0) + 1,
       me: true,
       url,
     }));
   } else {
-    return emojiReacts.push(ImmutableMap({
+    return emojiReacts.push(emojiReactionSchema.parse({
       count: 1,
       me: true,
       name: emoji,
@@ -106,17 +75,17 @@ export const simulateEmojiReact = (emojiReacts: ImmutableList<EmojiReact>, emoji
   }
 };
 
-export const simulateUnEmojiReact = (emojiReacts: ImmutableList<EmojiReact>, emoji: string) => {
+export const simulateUnEmojiReact = (emojiReacts: ImmutableList<EmojiReaction>, emoji: string) => {
   const idx = emojiReacts.findIndex(e =>
-    e.get('name') === emoji && e.get('me') === true);
+    e.name === emoji && e.me === true);
 
   const emojiReact = emojiReacts.get(idx);
 
   if (emojiReact) {
-    const newCount = emojiReact.get('count') - 1;
+    const newCount = (emojiReact.count || 1) - 1;
     if (newCount < 1) return emojiReacts.delete(idx);
-    return emojiReacts.set(idx, emojiReact.merge({
+    return emojiReacts.set(idx, emojiReactionSchema.parse({
-      count: emojiReact.get('count') - 1,
+      count: (emojiReact.count || 1) - 1,
       me: false,
     }));
   } else {

src/utils/features.ts

@@ -14,24 +14,30 @@ const overrides = custom('features');
 /** Truthy array convenience function */
 const any = (arr: Array<any>): boolean => arr.some(Boolean);
 
-/**
- * Firefish, a fork of Misskey. Formerly known as Calckey.
- * @see {@link https://joinfirefish.org/}
- */
-export const FIREFISH = 'Firefish';
-
 /**
  * Ditto, a Nostr server with Mastodon API.
  * @see {@link https://gitlab.com/soapbox-pub/ditto}
  */
 export const DITTO = 'Ditto';
 
+/**
+ * Firefish, a fork of Misskey. Formerly known as Calckey.
+ * @see {@link https://joinfirefish.org/}
+ */
+export const FIREFISH = 'Firefish';
+
 /**
  * Friendica, decentralized social platform implementing multiple federation protocols.
  * @see {@link https://friendi.ca/}
  */
 export const FRIENDICA = 'Friendica';
 
+/**
+ * Iceshrimp, yet another Misskey fork.
+ * @see {@link https://iceshrimp.dev/}
+ */
+export const ICESHRIMP = 'Iceshrimp';
+
 /**
  * Mastodon, the software upon which this is all based.
  * @see {@link https://joinmastodon.org/}
@@ -143,6 +149,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     accountLookup: any([
       v.software === FIREFISH,
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.compatVersion, '3.4.0'),
       v.software === PLEROMA && gte(v.version, '2.4.50'),
       v.software === TAKAHE && gte(v.version, '0.6.1'),
@@ -192,6 +199,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see {@link https://docs.joinmastodon.org/methods/announcements/}
      */
     announcements: any([
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.compatVersion, '3.1.0'),
       v.software === PLEROMA && gte(v.version, '2.2.49'),
       v.software === TAKAHE && gte(v.version, '0.7.0'),
@@ -230,6 +238,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     bookmarks: any([
       v.software === FIREFISH,
+      v.software === ICESHRIMP,
       v.software === FRIENDICA,
       v.software === MASTODON && gte(v.compatVersion, '3.1.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),
@@ -319,6 +328,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     conversations: any([
       v.software === FIREFISH,
+      v.software === ICESHRIMP,
       v.software === FRIENDICA,
       v.software === MASTODON && gte(v.compatVersion, '2.6.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),
@@ -359,6 +369,7 @@ const getInstanceFeatures = (instance: Instance) => {
     editProfile: any([
       v.software === FIREFISH,
       v.software === FRIENDICA,
+      v.software === ICESHRIMP,
       v.software === MASTODON,
       v.software === MITRA,
       v.software === PIXELFED,
@@ -374,6 +385,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     editStatuses: any([
       v.software === FRIENDICA && gte(v.version, '2022.12.0'),
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.version, '3.5.0'),
       v.software === TAKAHE && gte(v.version, '0.8.0'),
       features.includes('editing'),
@@ -406,6 +418,13 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     emojiReacts: v.software === PLEROMA && gte(v.version, '2.0.0'),
 
+    /**
+     * Ability to add emoji reactions to a status available in Mastodon forks.
+     * @see POST /v1/statuses/:id/react/:emoji
+     * @see POST /v1/statuses/:id/unreact/:emoji
+     */
+    emojiReactsMastodon: instance.configuration.reactions.max_reactions > 0,
+
     /**
      * The backend allows only non-RGI ("Recommended for General Interchange") emoji reactions.
      * @see PUT /api/v1/pleroma/statuses/:id/reactions/:emoji
@@ -444,6 +463,7 @@ const getInstanceFeatures = (instance: Instance) => {
     exposableReactions: any([
       v.software === FIREFISH,
       v.software === FRIENDICA,
+      v.software === ICESHRIMP,
       v.software === MASTODON,
       v.software === TAKAHE && gte(v.version, '0.6.1'),
       v.software === TRUTHSOCIAL,
@@ -634,6 +654,7 @@ const getInstanceFeatures = (instance: Instance) => {
     lists: any([
       v.software === FIREFISH,
       v.software === FRIENDICA,
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.compatVersion, '2.1.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),
     ]),
@@ -689,6 +710,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see PUT /api/v1/accounts/:id/mute
      */
     mutesDuration: any([
+      v.software === ICESHRIMP,
       v.software === PLEROMA && gte(v.version, '2.3.0'),
       v.software === MASTODON && gte(v.compatVersion, '3.3.0'),
       v.software === TAKAHE,
@@ -721,6 +743,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/v1/notifications
      */
     notificationsIncludeTypes: any([
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.compatVersion, '3.5.0'),
       v.software === PLEROMA && gte(v.version, '2.4.50'),
       v.software === TAKAHE && gte(v.version, '0.6.2'),
@@ -745,6 +768,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     polls: any([
       v.software === FIREFISH,
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.version, '2.8.0'),
       v.software === PLEROMA,
       v.software === TAKAHE && gte(v.version, '0.8.0'),
@@ -785,6 +809,7 @@ const getInstanceFeatures = (instance: Instance) => {
     publicTimeline: any([
       v.software === FIREFISH,
       v.software === FRIENDICA,
+      v.software === ICESHRIMP,
       v.software === MASTODON,
       v.software === PLEROMA,
       v.software === TAKAHE,
@@ -870,6 +895,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see POST /api/v2/search
      */
     searchFromAccount: any([
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.version, '2.8.0'),
       v.software === PLEROMA && gte(v.version, '1.0.0'),
     ]),
@@ -923,6 +949,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     suggestionsV2: any([
       v.software === FRIENDICA,
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.compatVersion, '3.4.0'),
       v.software === TRUTHSOCIAL,
       features.includes('v2_suggestions'),
@@ -939,6 +966,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/v1/trends/statuses
      */
     trendingStatuses: any([
+      v.software === ICESHRIMP,
       v.software === FRIENDICA && gte(v.version, '2022.12.0'),
       v.software === MASTODON && gte(v.compatVersion, '3.5.0'),
     ]),
@@ -949,6 +977,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     trends: any([
       v.software === FRIENDICA && gte(v.version, '2022.12.0'),
+      v.software === ICESHRIMP,
       v.software === MASTODON && gte(v.compatVersion, '3.0.0'),
       v.software === TRUTHSOCIAL,
       v.software === DITTO,