Merge branch 'vitest-fixes' into 'develop'

Vitest fixes

See merge request soapbox-pub/soapbox!2700

.eslintrc.cjs

@@ -19,8 +19,6 @@ module.exports = {
     ATTACHMENT_HOST: false,
   },
 
-  parser: '@babel/eslint-parser',
-
   plugins: [
     'react',
     'jsdoc',
@@ -56,6 +54,7 @@ module.exports = {
     },
     polyfills: [
       'es:all', // core-js
+      'fetch', // not polyfilled, but ignore it
       'IntersectionObserver', // npm:intersection-observer
       'Promise', // core-js
       'ResizeObserver', // npm:resize-observer-polyfill
@@ -78,6 +77,7 @@ module.exports = {
       },
     ],
     'comma-style': ['warn', 'last'],
+    'import/no-duplicates': 'error',
     'space-before-function-paren': ['error', 'never'],
     'space-infix-ops': 'error',
     'space-in-parens': ['error', 'never'],
@@ -259,13 +259,29 @@ module.exports = {
         alphabetize: { order: 'asc' },
       },
     ],
-    '@typescript-eslint/no-duplicate-imports': 'error',
+    '@typescript-eslint/member-delimiter-style': [
+      'error',
+      {
+        multiline: {
+          delimiter: 'none',
+        },
+        singleline: {
+          delimiter: 'comma',
+        },
+      },
+    ],
 
     'promise/catch-or-return': 'error',
 
     'react-hooks/rules-of-hooks': 'error',
 
-    'tailwindcss/classnames-order': 'error',
+    'tailwindcss/classnames-order': [
+      'error',
+      {
+        classRegex: '^(base|container|icon|item|list|outer|wrapper)?[c|C]lass(Name)?$',
+        config: 'tailwind.config.cjs',
+      },
+    ],
     'tailwindcss/migration-from-tailwind-2': 'error',
   },
   overrides: [

.gitignore

@@ -9,6 +9,7 @@
 /.vs/
 yarn-error.log*
 /junit.xml
+*.timestamp-*
 
 /static/
 /static-test/

.gitlab-ci.yml

@@ -1,7 +1,8 @@
-image: node:18
+image: node:20
 
 variables:
   NODE_ENV: test
+  DS_EXCLUDED_ANALYZERS: gemnasium-python
 
 default:
   interruptible: true
@@ -64,27 +65,27 @@ lint-sass:
       - "**/*.css"
       - ".stylelintrc.json"
 
-jest:
-  stage: test
-  script: yarn test:coverage --runInBand
-  only:
-    changes:
-      - "**/*.js"
-      - "**/*.json"
-      - "app/soapbox/**/*"
-      - "webpack/**/*"
-      - "custom/**/*"
-      - "jest.config.cjs"
-      - "package.json"
-      - "yarn.lock"
-      - ".gitlab-ci.yml"
-  coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
-  artifacts:
-    reports:
-      junit: junit.xml
-      coverage_report:
-        coverage_format: cobertura
-        path: .coverage/cobertura-coverage.xml
+# jest:
+#   stage: test
+#   script: yarn test:coverage --runInBand
+#   only:
+#     changes:
+#       - "**/*.js"
+#       - "**/*.json"
+#       - "app/soapbox/**/*"
+#       - "webpack/**/*"
+#       - "custom/**/*"
+#       - "jest.config.cjs"
+#       - "package.json"
+#       - "yarn.lock"
+#       - ".gitlab-ci.yml"
+#   coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
+#   artifacts:
+#     reports:
+#       junit: junit.xml
+#       coverage_report:
+#         coverage_format: cobertura
+#         path: .coverage/cobertura-coverage.xml
 
 nginx-test:
   stage: test
@@ -100,10 +101,11 @@ build-production:
   stage: test
   script:
     - yarn build
-    - yarn manage:translations en
-    # Fail if files got changed.
-    # https://stackoverflow.com/a/9066385
-    - git diff --quiet
+    # - yarn manage:translations en
+    # # Fail if files got changed.
+    # # https://stackoverflow.com/a/9066385
+    # - git diff --quiet
+    - cp static/index.html static/404.html
   variables:
     NODE_ENV: production
   artifacts:
@@ -149,19 +151,19 @@ pages:
 
 docker:
   stage: deploy
-  image: docker:23.0.0
+  image: docker:24.0.6
   services:
-    - docker:23.0.0-dind
+    - docker:24.0.6-dind
   tags:
     - dind
   # https://medium.com/devops-with-valentine/how-to-build-a-docker-image-and-push-it-to-the-gitlab-container-registry-from-a-gitlab-ci-pipeline-acac0d1f26df
   script:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
-    - docker build -t $CI_REGISTRY_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE
-  only:
-    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
+  rules:
+    - if: $CI_COMMIT_TAG
+  interruptible: false
 
 release:
   stage: release
@@ -173,4 +175,3 @@ release:
 
 include:
   - template: Jobs/Dependency-Scanning.gitlab-ci.yml
-  - template: Security/License-Scanning.gitlab-ci.yml

.storybook/main.ts

@@ -1,43 +0,0 @@
-import sharedConfig from '../webpack/shared';
-
-import type { StorybookConfig } from '@storybook/core-common';
-
-const config: StorybookConfig = {
-  stories: [
-    '../stories/**/*.stories.mdx',
-    '../stories/**/*.stories.@(js|jsx|ts|tsx)'
-  ],
-  addons: [
-    '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@storybook/addon-interactions',
-    'storybook-react-intl',
-    {
-      name: '@storybook/addon-postcss',
-      options: {
-        postcssLoaderOptions: {
-          implementation: require('postcss'),
-        },
-      },
-    },
-  ],
-  framework: '@storybook/react',
-  core: {
-    builder: '@storybook/builder-webpack5',
-  },
-  webpackFinal: async (config) => {
-    config.resolve!.alias = {
-      ...sharedConfig.resolve!.alias,
-      ...config.resolve!.alias,
-    };
-
-    config.resolve!.modules = [
-      ...sharedConfig.resolve!.modules!,
-      ...config.resolve!.modules!,
-    ];
-
-    return config;
-  },
-};
-
-export default config;

.storybook/preview.tsx

@@ -1,22 +0,0 @@
-import '../app/styles/tailwind.css';
-import '../stories/theme.css';
-
-import { addDecorator, Story } from '@storybook/react';
-import { IntlProvider } from 'react-intl';
-import React from 'react';
-
-const withProvider = (Story: Story) => (
-  <IntlProvider locale='en'><Story /></IntlProvider>
-);
-
-addDecorator(withProvider);
-
-export const parameters = {
-  actions: { argTypesRegex: '^on[A-Z].*' },
-  controls: {
-    matchers: {
-      color: /(background|color)$/i,
-      date: /Date$/,
-    },
-  },
-};

.stylelintrc.json

@@ -16,7 +16,6 @@
     "no-invalid-position-at-import-rule": null,
     "scss/at-rule-no-unknown": [true, { "ignoreAtRules": ["tailwind", "apply", "layer", "config"]}],
     "scss/operator-no-unspaced": null,
-    "selector-class-pattern": null,
-    "string-quotes": "single"
+    "selector-class-pattern": null
   }
 }

.tool-versions

@@ -1 +1 @@
-nodejs 18.14.0
+nodejs 20.0.0

CHANGELOG.md

@@ -4,6 +4,45 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+- Hashtags: let users follow hashtags (Mastodon, Akkoma).
+- Posts: Support posts filtering on recent Mastodon versions
+- Reactions: Support custom emoji reactions
+- Compatbility: Support Mastodon v2 timeline filters.
+- Compatbility: Preliminary support for Ditto backend.
+- Compatibility: Support Firefish.
+- Posts: Support dislikes on Friendica.
+- UI: added a character counter to some textareas.
+- UI: added new experience for viewing Media
+- Hotkeys: Added `/` as a hotkey for search field.
+
+### Changed
+- Posts: truncate Nostr pubkeys in reply mentions.
+- Posts: upgraded emoji picker component.
+- Posts: improved design of threads.
+- UI: unified design of "approve" and "reject" buttons in follow requests and waitlist.
+- UI: added sticky column header.
+- UI: add specific zones the user can drag-and-drop files.
+- UI: disable toast notifications for API errors.
+- Chats: Display year for older messages creation date.
+
+### Fixed
+- Posts: fixed emojis being cut off in reactions modal.
+- Posts: fix audio player progress bar visibility.
+- Posts: fix audio player avatar aspect ratio for non-square avatars.
+- Posts: added missing gap in pending status.
+- Compatibility: fixed quote posting compatibility with custom Pleroma forks.
+- Profile: fix "load more" button height on account gallery page.
+- 18n: fixed Chinese language being detected from the browser.
+- Conversations: fixed pagination (Mastodon).
+- Compatibility: fix version parsing for Friendica.
+- UI: fixed various overflow issues related to long usernames.
+- UI: fixed display of Markdown code blocks in the reply indicator.
+- Auth: fixed too many API requests when the server has an error.
+- Auth: Don't display "username or e-mail" if username is not allowed.
+
 ## [3.2.0] - 2023-02-15
 
 ### Added
@@ -12,12 +51,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Posts: bot badge on statuses from bot accounts.
 - Compatibility: improved browser support for older browsers.
 - Events: allow to repost events in event menu.
-- Groups: Initial support for groups.
 - Profile: Add RSS link to user profiles.
 - Reactions: adds support for reacting to chat messages.
 - Groups: initial support for groups.
 - Profile: add RSS link to user profiles.
-- Posts: fix posts filtering.
 - Chats: reset chat message field height after sending a message.
 - Admin: allow to manage announcements.
 
@@ -38,6 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - index.html: remove `referrer` meta tag so it doesn't conflict with backend's `Referrer-Policy` header.
 - Modals: fix media modal automatically switching to video.
 - Navigation: profile dropdown erratic behavior.
+- Posts: fix posts filtering.
 
 ### Removed
 - Admin: single user mode. Now the homepage can be redirected to any URL.

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18 as build
+FROM node:20 as build
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:20
 
 RUN apt-get update &&\
     apt-get install -y inotify-tools &&\

README.md

@@ -75,7 +75,7 @@ One disadvantage of this approach is that it does not help the software spread.
 © Alex Gleason & other Soapbox contributors  
 © Eugen Rochko & other Mastodon contributors  
 © Trump Media & Technology Group  
-© Gab AI, Inc.  
+© Gab AI, Inc.
 
 Soapbox is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by

app/assets/icons/COPYING.md

@@ -2,4 +2,4 @@
 
 - verified.svg - Created by Alex Gleason. CC0
 
-Fediverse logo: https://en.wikipedia.org/wiki/Fediverse#/media/File:Fediverse_logo_proposal.svg  
+Fediverse logo: https://en.wikipedia.org/wiki/Fediverse#/media/File:Fediverse_logo_proposal.svg

app/index.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover, user-scalable=no">
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <link href="/manifest.json" rel="manifest">
+    <!--server-generated-meta-->
+    <script type="module" src="./soapbox/main.tsx"></script>
+  </head>
+  <body class="theme-mode-light no-reduce-motion">
+    <div id="soapbox" class="h-full">
+      <div class="loading-indicator-wrapper">
+        <div class="loading-indicator">
+          <div class="loading-indicator__container">
+            <div class="loading-indicator__figure"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <noscript>To use this website, please enable JavaScript.</noscript>
+  </body>
+</html>

app/soapbox/__fixtures__/group-truthsocial.json

@@ -0,0 +1,19 @@
+{
+  "avatar": "https://media.covfefe.social/groups/avatars/109/989/480/368/015/378/original/50b0d899bc5aae13.jpg",
+  "avatar_static": "https://media.covfefe.social/groups/avatars/109/989/480/368/015/378/original/50b0d899bc5aae13.jpg",
+  "created_at": "2023-03-08T00:00:00.000Z",
+  "discoverable": true,
+  "display_name": "PATRIOT PATRIOTS",
+  "domain": null,
+  "group_visibility": "everyone",
+  "header": "https://media.covfefe.social/groups/headers/109/989/480/368/015/378/original/c5063b59f919cd4a.png",
+  "header_static": "https://media.covfefe.social/groups/headers/109/989/480/368/015/378/original/c5063b59f919cd4a.png",
+  "id": "109989480368015378",
+  "members_count": 1,
+  "membership_required": true,
+  "note": "patriots 900000001",
+  "owner": {
+    "id": "424023483294040"
+  },
+  "tags": []
+}

app/soapbox/__tests__/toast.test.tsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react';
-import { AxiosError } from 'axios';
+import { AxiosError, AxiosHeaders } from 'axios';
 import React from 'react';
 import { IntlProvider } from 'react-intl';
 
@@ -20,7 +20,7 @@ function renderApp() {
 }
 
 beforeAll(() => {
-  jest.spyOn(console, 'error').mockImplementation(() => {});
+  vi.spyOn(console, 'error').mockImplementation(() => {});
 });
 
 afterEach(() => {
@@ -73,7 +73,9 @@ describe('toasts', () =>{
       statusText: String(status),
       status,
       headers: {},
-      config: {},
+      config: {
+        headers: new AxiosHeaders(),
+      },
     });
 
     describe('with a 502 status code', () => {

app/soapbox/actions/__tests__/account-notes.test.ts

@@ -1,21 +1,13 @@
-import { Map as ImmutableMap } from 'immutable';
-
 import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
-import { ReducerRecord, EditRecord } from 'soapbox/reducers/account-notes';
 
-import { normalizeAccount, normalizeRelationship } from '../../normalizers';
-import { changeAccountNoteComment, initAccountNoteModal, submitAccountNote } from '../account-notes';
-
-import type { Account } from 'soapbox/types/entities';
+import { submitAccountNote } from '../account-notes';
 
 describe('submitAccountNote()', () => {
   let store: ReturnType<typeof mockStore>;
 
   beforeEach(() => {
-    const state = rootState
-      .set('account_notes', ReducerRecord({ edit: EditRecord({ account: '1', comment: 'hello' }) }));
-    store = mockStore(state);
+    store = mockStore(rootState);
   });
 
   describe('with a successful API request', () => {
@@ -28,10 +20,9 @@ describe('submitAccountNote()', () => {
     it('post the note to the API', async() => {
       const expectedActions = [
         { type: 'ACCOUNT_NOTE_SUBMIT_REQUEST' },
-        { type: 'MODAL_CLOSE', modalType: undefined },
         { type: 'ACCOUNT_NOTE_SUBMIT_SUCCESS', relationship: {} },
       ];
-      await store.dispatch(submitAccountNote());
+      await store.dispatch(submitAccountNote('1', 'hello'));
       const actions = store.getActions();
 
       expect(actions).toEqual(expectedActions);
@@ -53,58 +44,10 @@ describe('submitAccountNote()', () => {
           error: new Error('Network Error'),
         },
       ];
-      await store.dispatch(submitAccountNote());
+      await store.dispatch(submitAccountNote('1', 'hello'));
       const actions = store.getActions();
 
       expect(actions).toEqual(expectedActions);
     });
   });
 });
-
-describe('initAccountNoteModal()', () => {
-  let store: ReturnType<typeof mockStore>;
-
-  beforeEach(() => {
-    const state = rootState
-      .set('relationships', ImmutableMap({ '1': normalizeRelationship({ note: 'hello' }) }));
-    store = mockStore(state);
-  });
-
-  it('dispatches the proper actions', async() => {
-    const account = normalizeAccount({
-      id: '1',
-      acct: 'justin-username',
-      display_name: 'Justin L',
-      avatar: 'test.jpg',
-      verified: true,
-    }) as Account;
-    const expectedActions = [
-      { type: 'ACCOUNT_NOTE_INIT_MODAL', account, comment: 'hello' },
-      { type: 'MODAL_OPEN', modalType: 'ACCOUNT_NOTE' },
-    ];
-    await store.dispatch(initAccountNoteModal(account));
-    const actions = store.getActions();
-
-    expect(actions).toEqual(expectedActions);
-  });
-});
-
-describe('changeAccountNoteComment()', () => {
-  let store: ReturnType<typeof mockStore>;
-
-  beforeEach(() => {
-    const state = rootState;
-    store = mockStore(state);
-  });
-
-  it('dispatches the proper actions', async() => {
-    const comment = 'hello world';
-    const expectedActions = [
-      { type: 'ACCOUNT_NOTE_CHANGE_COMMENT', comment },
-    ];
-    await store.dispatch(changeAccountNoteComment(comment));
-    const actions = store.getActions();
-
-    expect(actions).toEqual(expectedActions);
-  });
-});

app/soapbox/actions/__tests__/accounts.test.ts

@@ -1,10 +1,11 @@
 import { Map as ImmutableMap } from 'immutable';
 
 import { __stub } from 'soapbox/api';
+import { buildRelationship } from 'soapbox/jest/factory';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 import { ListRecord, ReducerRecord } from 'soapbox/reducers/user-lists';
 
-import { normalizeAccount, normalizeInstance, normalizeRelationship } from '../../normalizers';
+import { normalizeAccount, normalizeInstance } from '../../normalizers';
 import {
   authorizeFollowRequest,
   blockAccount,
@@ -18,12 +19,10 @@ import {
   fetchFollowing,
   fetchFollowRequests,
   fetchRelationships,
-  followAccount,
   muteAccount,
   removeFromFollowers,
   subscribeAccount,
   unblockAccount,
-  unfollowAccount,
   unmuteAccount,
   unsubscribeAccount,
 } from '../accounts';
@@ -75,9 +74,14 @@ describe('fetchAccount()', () => {
       });
 
       const state = rootState
-        .set('accounts', ImmutableMap({
-          [id]: account,
-        }) as any);
+        .set('entities', {
+          'ACCOUNTS': {
+            store: {
+              [id]: account,
+            },
+            lists: {},
+          },
+        });
 
       store = mockStore(state);
 
@@ -167,9 +171,14 @@ describe('fetchAccountByUsername()', () => {
     });
 
     state = rootState
-      .set('accounts', ImmutableMap({
-        [id]: account,
-      }));
+      .set('entities', {
+        'ACCOUNTS': {
+          store: {
+            [id]: account,
+          },
+          lists: {},
+        },
+      });
 
     store = mockStore(state);
 
@@ -370,169 +379,6 @@ describe('fetchAccountByUsername()', () => {
   });
 });
 
-describe('followAccount()', () => {
-  describe('when logged out', () => {
-    beforeEach(() => {
-      const state = rootState.set('me', null);
-      store = mockStore(state);
-    });
-
-    it('should do nothing', async() => {
-      await store.dispatch(followAccount('1'));
-      const actions = store.getActions();
-
-      expect(actions).toEqual([]);
-    });
-  });
-
-  describe('when logged in', () => {
-    const id = '1';
-
-    beforeEach(() => {
-      const state = rootState.set('me', '123');
-      store = mockStore(state);
-    });
-
-    describe('with a successful API request', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onPost(`/api/v1/accounts/${id}/follow`).reply(200, { success: true });
-        });
-      });
-
-      it('should dispatch the correct actions', async() => {
-        const expectedActions = [
-          {
-            type: 'ACCOUNT_FOLLOW_REQUEST',
-            id,
-            locked: false,
-            skipLoading: true,
-          },
-          {
-            type: 'ACCOUNT_FOLLOW_SUCCESS',
-            relationship: { success: true },
-            alreadyFollowing: undefined,
-            skipLoading: true,
-          },
-        ];
-        await store.dispatch(followAccount(id));
-        const actions = store.getActions();
-
-        expect(actions).toEqual(expectedActions);
-      });
-    });
-
-    describe('with an unsuccessful API request', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onPost(`/api/v1/accounts/${id}/follow`).networkError();
-        });
-      });
-
-      it('should dispatch the correct actions', async() => {
-        const expectedActions = [
-          {
-            type: 'ACCOUNT_FOLLOW_REQUEST',
-            id,
-            locked: false,
-            skipLoading: true,
-          },
-          {
-            type: 'ACCOUNT_FOLLOW_FAIL',
-            error: new Error('Network Error'),
-            locked: false,
-            skipLoading: true,
-          },
-        ];
-
-        try {
-          await store.dispatch(followAccount(id));
-        } catch (e) {
-          const actions = store.getActions();
-          expect(actions).toEqual(expectedActions);
-          expect(e).toEqual(new Error('Network Error'));
-        }
-      });
-    });
-  });
-});
-
-describe('unfollowAccount()', () => {
-  describe('when logged out', () => {
-    beforeEach(() => {
-      const state = rootState.set('me', null);
-      store = mockStore(state);
-    });
-
-    it('should do nothing', async() => {
-      await store.dispatch(unfollowAccount('1'));
-      const actions = store.getActions();
-
-      expect(actions).toEqual([]);
-    });
-  });
-
-  describe('when logged in', () => {
-    const id = '1';
-
-    beforeEach(() => {
-      const state = rootState.set('me', '123');
-      store = mockStore(state);
-    });
-
-    describe('with a successful API request', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onPost(`/api/v1/accounts/${id}/unfollow`).reply(200, { success: true });
-        });
-      });
-
-      it('should dispatch the correct actions', async() => {
-        const expectedActions = [
-          { type: 'ACCOUNT_UNFOLLOW_REQUEST', id: '1', skipLoading: true },
-          {
-            type: 'ACCOUNT_UNFOLLOW_SUCCESS',
-            relationship: { success: true },
-            statuses: ImmutableMap({}),
-            skipLoading: true,
-          },
-        ];
-        await store.dispatch(unfollowAccount(id));
-        const actions = store.getActions();
-
-        expect(actions).toEqual(expectedActions);
-      });
-    });
-
-    describe('with an unsuccessful API request', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onPost(`/api/v1/accounts/${id}/unfollow`).networkError();
-        });
-      });
-
-      it('should dispatch the correct actions', async() => {
-        const expectedActions = [
-          {
-            type: 'ACCOUNT_UNFOLLOW_REQUEST',
-            id,
-            skipLoading: true,
-          },
-          {
-            type: 'ACCOUNT_UNFOLLOW_FAIL',
-            error: new Error('Network Error'),
-            skipLoading: true,
-          },
-        ];
-        await store.dispatch(unfollowAccount(id));
-        const actions = store.getActions();
-
-        expect(actions).toEqual(expectedActions);
-      });
-    });
-  });
-});
-
 describe('blockAccount()', () => {
   const id = '1';
 
@@ -1340,7 +1186,7 @@ describe('fetchRelationships()', () => {
     describe('without newAccountIds', () => {
       beforeEach(() => {
         const state = rootState
-          .set('relationships', ImmutableMap({ [id]: normalizeRelationship({}) }))
+          .set('relationships', ImmutableMap({ [id]: buildRelationship() }))
           .set('me', '123');
         store = mockStore(state);
       });

app/soapbox/actions/__tests__/compose.test.ts

@@ -41,7 +41,7 @@ describe('uploadCompose()', () => {
 
     it('creates an alert if exceeds max size', async() => {
       const mockIntl = {
-        formatMessage: jest.fn().mockReturnValue('Image exceeds the current file size limit (10 Bytes)'),
+        formatMessage: vi.fn().mockReturnValue('Image exceeds the current file size limit (10 Bytes)'),
       } as unknown as IntlShape;
 
       const expectedActions = [
@@ -87,7 +87,7 @@ describe('uploadCompose()', () => {
 
     it('creates an alert if exceeds max size', async() => {
       const mockIntl = {
-        formatMessage: jest.fn().mockReturnValue('Video exceeds the current file size limit (10 Bytes)'),
+        formatMessage: vi.fn().mockReturnValue('Video exceeds the current file size limit (10 Bytes)'),
       } as unknown as IntlShape;
 
       const expectedActions = [

app/soapbox/actions/__tests__/me.test.ts

@@ -1,18 +1,16 @@
 import { Map as ImmutableMap } from 'immutable';
 
 import { __stub } from 'soapbox/api';
+import { buildAccount } from 'soapbox/jest/factory';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
-import { AccountRecord } from 'soapbox/normalizers';
+import { AuthUserRecord, ReducerRecord } from 'soapbox/reducers/auth';
 
-import { AuthUserRecord, ReducerRecord } from '../../reducers/auth';
-import {
-  fetchMe, patchMe,
-} from '../me';
+import { fetchMe, patchMe } from '../me';
 
-jest.mock('../../storage/kv-store', () => ({
+vi.mock('../../storage/kv-store', () => ({
   __esModule: true,
   default: {
-    getItemOrError: jest.fn().mockReturnValue(Promise.resolve({})),
+    getItemOrError: vi.fn().mockReturnValue(Promise.resolve({})),
   },
 }));
 
@@ -48,11 +46,15 @@ describe('fetchMe()', () => {
             }),
           }),
         }))
-        .set('accounts', ImmutableMap({
-          [accountUrl]: AccountRecord({
-            url: accountUrl,
-          }),
-        }) as any);
+        .set('entities', {
+          'ACCOUNTS': {
+            store: {
+              [accountUrl]: buildAccount({ url: accountUrl }),
+            },
+            lists: {},
+          },
+        });
+
       store = mockStore(state);
     });
 

app/soapbox/actions/__tests__/onboarding.test.ts

@@ -10,11 +10,11 @@ describe('checkOnboarding()', () => {
   });
 
   beforeEach(() => {
-    mockGetItem = jest.fn().mockReturnValue(null);
+    mockGetItem = vi.fn().mockReturnValue(null);
   });
 
   it('does nothing if localStorage item is not set', async() => {
-    mockGetItem = jest.fn().mockReturnValue(null);
+    mockGetItem = vi.fn().mockReturnValue(null);
 
     const state = rootState.setIn(['onboarding', 'needsOnboarding'], false);
     const store = mockStore(state);
@@ -27,7 +27,7 @@ describe('checkOnboarding()', () => {
   });
 
   it('does nothing if localStorage item is invalid', async() => {
-    mockGetItem = jest.fn().mockReturnValue('invalid');
+    mockGetItem = vi.fn().mockReturnValue('invalid');
 
     const state = rootState.setIn(['onboarding', 'needsOnboarding'], false);
     const store = mockStore(state);
@@ -40,7 +40,7 @@ describe('checkOnboarding()', () => {
   });
 
   it('dispatches the correct action', async() => {
-    mockGetItem = jest.fn().mockReturnValue('1');
+    mockGetItem = vi.fn().mockReturnValue('1');
 
     const state = rootState.setIn(['onboarding', 'needsOnboarding'], false);
     const store = mockStore(state);
@@ -61,7 +61,7 @@ describe('startOnboarding()', () => {
   });
 
   beforeEach(() => {
-    mockSetItem = jest.fn();
+    mockSetItem = vi.fn();
   });
 
   it('dispatches the correct action', async() => {
@@ -84,7 +84,7 @@ describe('endOnboarding()', () => {
   });
 
   beforeEach(() => {
-    mockRemoveItem = jest.fn();
+    mockRemoveItem = vi.fn();
   });
 
   it('dispatches the correct action', async() => {

app/soapbox/actions/__tests__/soapbox.test.ts

@@ -1,4 +1,6 @@
-import { rootState } from '../../jest/test-helpers';
+import { rootState } from 'soapbox/jest/test-helpers';
+import { RootState } from 'soapbox/store';
+
 import { getSoapboxConfig } from '../soapbox';
 
 const ASCII_HEART = '❤'; // '\u2764\uFE0F'
@@ -6,13 +8,13 @@ const RED_HEART_RGI = '❤️'; // '\u2764'
 
 describe('getSoapboxConfig()', () => {
   it('returns RGI heart on Pleroma > 2.3', () => {
-    const state = rootState.setIn(['instance', 'version'], '2.7.2 (compatible; Pleroma 2.3.0)');
+    const state = rootState.setIn(['instance', 'version'], '2.7.2 (compatible; Pleroma 2.3.0)') as RootState;
     expect(getSoapboxConfig(state).allowedEmoji.includes(RED_HEART_RGI)).toBe(true);
     expect(getSoapboxConfig(state).allowedEmoji.includes(ASCII_HEART)).toBe(false);
   });
 
   it('returns an ASCII heart on Pleroma < 2.3', () => {
-    const state = rootState.setIn(['instance', 'version'], '2.7.2 (compatible; Pleroma 2.0.0)');
+    const state = rootState.setIn(['instance', 'version'], '2.7.2 (compatible; Pleroma 2.0.0)') as RootState;
     expect(getSoapboxConfig(state).allowedEmoji.includes(ASCII_HEART)).toBe(true);
     expect(getSoapboxConfig(state).allowedEmoji.includes(RED_HEART_RGI)).toBe(false);
   });

app/soapbox/actions/__tests__/statuses.test.ts

@@ -123,6 +123,7 @@ describe('deleteStatus()', () => {
             withRedraft: true,
             id: 'compose-modal',
           },
+          { type: 'MODAL_CLOSE', modalType: 'COMPOSE', modalProps: undefined },
           { type: 'MODAL_OPEN', modalType: 'COMPOSE', modalProps: undefined },
         ];
         await store.dispatch(deleteStatus(statusId, true));

app/soapbox/actions/account-notes.ts

@@ -1,82 +1,44 @@
 import api from '../api';
 
-import { openModal, closeModal } from './modals';
-
 import type { AxiosError } from 'axios';
 import type { AnyAction } from 'redux';
 import type { RootState } from 'soapbox/store';
-import type { Account } from 'soapbox/types/entities';
 
 const ACCOUNT_NOTE_SUBMIT_REQUEST = 'ACCOUNT_NOTE_SUBMIT_REQUEST';
 const ACCOUNT_NOTE_SUBMIT_SUCCESS = 'ACCOUNT_NOTE_SUBMIT_SUCCESS';
 const ACCOUNT_NOTE_SUBMIT_FAIL = 'ACCOUNT_NOTE_SUBMIT_FAIL';
 
-const ACCOUNT_NOTE_INIT_MODAL = 'ACCOUNT_NOTE_INIT_MODAL';
+const submitAccountNote = (id: string, value: string) =>
+  (dispatch: React.Dispatch<AnyAction>, getState: () => RootState) => {
+    dispatch(submitAccountNoteRequest());
 
-const ACCOUNT_NOTE_CHANGE_COMMENT = 'ACCOUNT_NOTE_CHANGE_COMMENT';
-
-const submitAccountNote = () => (dispatch: React.Dispatch<AnyAction>, getState: () => RootState) => {
-  dispatch(submitAccountNoteRequest());
-
-  const id = getState().account_notes.edit.account;
-
-  return api(getState)
-    .post(`/api/v1/accounts/${id}/note`, {
-      comment: getState().account_notes.edit.comment,
-    })
-    .then(response => {
-      dispatch(closeModal());
-      dispatch(submitAccountNoteSuccess(response.data));
-    })
-    .catch(error => dispatch(submitAccountNoteFail(error)));
-};
-
-function submitAccountNoteRequest() {
-  return {
-    type: ACCOUNT_NOTE_SUBMIT_REQUEST,
+    return api(getState)
+      .post(`/api/v1/accounts/${id}/note`, {
+        comment: value,
+      })
+      .then(response => {
+        dispatch(submitAccountNoteSuccess(response.data));
+      })
+      .catch(error => dispatch(submitAccountNoteFail(error)));
   };
-}
 
-function submitAccountNoteSuccess(relationship: any) {
-  return {
-    type: ACCOUNT_NOTE_SUBMIT_SUCCESS,
-    relationship,
-  };
-}
+const submitAccountNoteRequest = () => ({
+  type: ACCOUNT_NOTE_SUBMIT_REQUEST,
+});
 
-function submitAccountNoteFail(error: AxiosError) {
-  return {
-    type: ACCOUNT_NOTE_SUBMIT_FAIL,
-    error,
-  };
-}
+const submitAccountNoteSuccess = (relationship: any) => ({
+  type: ACCOUNT_NOTE_SUBMIT_SUCCESS,
+  relationship,
+});
 
-const initAccountNoteModal = (account: Account) => (dispatch: React.Dispatch<AnyAction>, getState: () => RootState) => {
-  const comment = getState().relationships.get(account.id)!.note;
-
-  dispatch({
-    type: ACCOUNT_NOTE_INIT_MODAL,
-    account,
-    comment,
-  });
-
-  dispatch(openModal('ACCOUNT_NOTE'));
-};
-
-function changeAccountNoteComment(comment: string) {
-  return {
-    type: ACCOUNT_NOTE_CHANGE_COMMENT,
-    comment,
-  };
-}
+const submitAccountNoteFail = (error: AxiosError) => ({
+  type: ACCOUNT_NOTE_SUBMIT_FAIL,
+  error,
+});
 
 export {
   submitAccountNote,
-  initAccountNoteModal,
-  changeAccountNoteComment,
   ACCOUNT_NOTE_SUBMIT_REQUEST,
   ACCOUNT_NOTE_SUBMIT_SUCCESS,
   ACCOUNT_NOTE_SUBMIT_FAIL,
-  ACCOUNT_NOTE_INIT_MODAL,
-  ACCOUNT_NOTE_CHANGE_COMMENT,
 };

app/soapbox/actions/accounts.ts

@@ -1,3 +1,6 @@
+import { importEntities } from 'soapbox/entity-store/actions';
+import { Entities } from 'soapbox/entity-store/entities';
+import { selectAccount } from 'soapbox/selectors';
 import { isLoggedIn } from 'soapbox/utils/auth';
 import { getFeatures, parseVersion, PLEROMA } from 'soapbox/utils/features';
 
@@ -23,14 +26,6 @@ const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
 const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
 const ACCOUNT_FETCH_FAIL    = 'ACCOUNT_FETCH_FAIL';
 
-const ACCOUNT_FOLLOW_REQUEST = 'ACCOUNT_FOLLOW_REQUEST';
-const ACCOUNT_FOLLOW_SUCCESS = 'ACCOUNT_FOLLOW_SUCCESS';
-const ACCOUNT_FOLLOW_FAIL    = 'ACCOUNT_FOLLOW_FAIL';
-
-const ACCOUNT_UNFOLLOW_REQUEST = 'ACCOUNT_UNFOLLOW_REQUEST';
-const ACCOUNT_UNFOLLOW_SUCCESS = 'ACCOUNT_UNFOLLOW_SUCCESS';
-const ACCOUNT_UNFOLLOW_FAIL    = 'ACCOUNT_UNFOLLOW_FAIL';
-
 const ACCOUNT_BLOCK_REQUEST = 'ACCOUNT_BLOCK_REQUEST';
 const ACCOUNT_BLOCK_SUCCESS = 'ACCOUNT_BLOCK_SUCCESS';
 const ACCOUNT_BLOCK_FAIL    = 'ACCOUNT_BLOCK_FAIL';
@@ -147,9 +142,9 @@ const fetchAccount = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch(fetchRelationships([id]));
 
-    const account = getState().accounts.get(id);
+    const account = selectAccount(getState(), id);
 
-    if (account && !account.get('should_refetch')) {
+    if (account) {
       return null;
     }
 
@@ -227,81 +222,6 @@ const fetchAccountFail = (id: string | null, error: AxiosError) => ({
   skipAlert: true,
 });
 
-type FollowAccountOpts = {
-  reblogs?: boolean,
-  notify?: boolean
-};
-
-const followAccount = (id: string, options?: FollowAccountOpts) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    if (!isLoggedIn(getState)) return null;
-
-    const alreadyFollowing = getState().relationships.get(id)?.following || undefined;
-    const locked = getState().accounts.get(id)?.locked || false;
-
-    dispatch(followAccountRequest(id, locked));
-
-    return api(getState)
-      .post(`/api/v1/accounts/${id}/follow`, options)
-      .then(response => dispatch(followAccountSuccess(response.data, alreadyFollowing)))
-      .catch(error => {
-        dispatch(followAccountFail(error, locked));
-        throw error;
-      });
-  };
-
-const unfollowAccount = (id: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    if (!isLoggedIn(getState)) return null;
-
-    dispatch(unfollowAccountRequest(id));
-
-    return api(getState)
-      .post(`/api/v1/accounts/${id}/unfollow`)
-      .then(response => dispatch(unfollowAccountSuccess(response.data, getState().statuses)))
-      .catch(error => dispatch(unfollowAccountFail(error)));
-  };
-
-const followAccountRequest = (id: string, locked: boolean) => ({
-  type: ACCOUNT_FOLLOW_REQUEST,
-  id,
-  locked,
-  skipLoading: true,
-});
-
-const followAccountSuccess = (relationship: APIEntity, alreadyFollowing?: boolean) => ({
-  type: ACCOUNT_FOLLOW_SUCCESS,
-  relationship,
-  alreadyFollowing,
-  skipLoading: true,
-});
-
-const followAccountFail = (error: AxiosError, locked: boolean) => ({
-  type: ACCOUNT_FOLLOW_FAIL,
-  error,
-  locked,
-  skipLoading: true,
-});
-
-const unfollowAccountRequest = (id: string) => ({
-  type: ACCOUNT_UNFOLLOW_REQUEST,
-  id,
-  skipLoading: true,
-});
-
-const unfollowAccountSuccess = (relationship: APIEntity, statuses: ImmutableMap<string, Status>) => ({
-  type: ACCOUNT_UNFOLLOW_SUCCESS,
-  relationship,
-  statuses,
-  skipLoading: true,
-});
-
-const unfollowAccountFail = (error: AxiosError) => ({
-  type: ACCOUNT_UNFOLLOW_FAIL,
-  error,
-  skipLoading: true,
-});
-
 const blockAccount = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return null;
@@ -311,6 +231,7 @@ const blockAccount = (id: string) =>
     return api(getState)
       .post(`/api/v1/accounts/${id}/block`)
       .then(response => {
+        dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
         // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
         return dispatch(blockAccountSuccess(response.data, getState().statuses));
       }).catch(error => dispatch(blockAccountFail(error)));
@@ -324,7 +245,10 @@ const unblockAccount = (id: string) =>
 
     return api(getState)
       .post(`/api/v1/accounts/${id}/unblock`)
-      .then(response => dispatch(unblockAccountSuccess(response.data)))
+      .then(response => {
+        dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
+        return dispatch(unblockAccountSuccess(response.data));
+      })
       .catch(error => dispatch(unblockAccountFail(error)));
   };
 
@@ -384,6 +308,7 @@ const muteAccount = (id: string, notifications?: boolean, duration = 0) =>
     return api(getState)
       .post(`/api/v1/accounts/${id}/mute`, params)
       .then(response => {
+        dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
         // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
         return dispatch(muteAccountSuccess(response.data, getState().statuses));
       })
@@ -398,7 +323,10 @@ const unmuteAccount = (id: string) =>
 
     return api(getState)
       .post(`/api/v1/accounts/${id}/unmute`)
-      .then(response => dispatch(unmuteAccountSuccess(response.data)))
+      .then(response => {
+        dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
+        return dispatch(unmuteAccountSuccess(response.data));
+      })
       .catch(error => dispatch(unmuteAccountFail(error)));
   };
 
@@ -690,7 +618,10 @@ const fetchRelationships = (accountIds: string[]) =>
 
     return api(getState)
       .get(`/api/v1/accounts/relationships?${newAccountIds.map(id => `id[]=${id}`).join('&')}`)
-      .then(response => dispatch(fetchRelationshipsSuccess(response.data)))
+      .then(response => {
+        dispatch(importEntities(response.data, Entities.RELATIONSHIPS));
+        dispatch(fetchRelationshipsSuccess(response.data));
+      })
       .catch(error => dispatch(fetchRelationshipsFail(error)));
   };
 
@@ -988,12 +919,6 @@ export {
   ACCOUNT_FETCH_REQUEST,
   ACCOUNT_FETCH_SUCCESS,
   ACCOUNT_FETCH_FAIL,
-  ACCOUNT_FOLLOW_REQUEST,
-  ACCOUNT_FOLLOW_SUCCESS,
-  ACCOUNT_FOLLOW_FAIL,
-  ACCOUNT_UNFOLLOW_REQUEST,
-  ACCOUNT_UNFOLLOW_SUCCESS,
-  ACCOUNT_UNFOLLOW_FAIL,
   ACCOUNT_BLOCK_REQUEST,
   ACCOUNT_BLOCK_SUCCESS,
   ACCOUNT_BLOCK_FAIL,
@@ -1069,14 +994,6 @@ export {
   fetchAccountRequest,
   fetchAccountSuccess,
   fetchAccountFail,
-  followAccount,
-  unfollowAccount,
-  followAccountRequest,
-  followAccountSuccess,
-  followAccountFail,
-  unfollowAccountRequest,
-  unfollowAccountSuccess,
-  unfollowAccountFail,
   blockAccount,
   unblockAccount,
   blockAccountRequest,

app/soapbox/actions/admin.ts

@@ -2,6 +2,7 @@ import { defineMessages } from 'react-intl';
 
 import { fetchRelationships } from 'soapbox/actions/accounts';
 import { importFetchedAccount, importFetchedAccounts, importFetchedStatuses } from 'soapbox/actions/importer';
+import { accountIdsToAccts } from 'soapbox/selectors';
 import toast from 'soapbox/toast';
 import { filterBadges, getTagDiff } from 'soapbox/utils/badges';
 import { getFeatures } from 'soapbox/utils/features';
@@ -74,14 +75,6 @@ const ADMIN_REMOVE_PERMISSION_GROUP_REQUEST = 'ADMIN_REMOVE_PERMISSION_GROUP_REQ
 const ADMIN_REMOVE_PERMISSION_GROUP_SUCCESS = 'ADMIN_REMOVE_PERMISSION_GROUP_SUCCESS';
 const ADMIN_REMOVE_PERMISSION_GROUP_FAIL    = 'ADMIN_REMOVE_PERMISSION_GROUP_FAIL';
 
-const ADMIN_USERS_SUGGEST_REQUEST = 'ADMIN_USERS_SUGGEST_REQUEST';
-const ADMIN_USERS_SUGGEST_SUCCESS = 'ADMIN_USERS_SUGGEST_SUCCESS';
-const ADMIN_USERS_SUGGEST_FAIL    = 'ADMIN_USERS_SUGGEST_FAIL';
-
-const ADMIN_USERS_UNSUGGEST_REQUEST = 'ADMIN_USERS_UNSUGGEST_REQUEST';
-const ADMIN_USERS_UNSUGGEST_SUCCESS = 'ADMIN_USERS_UNSUGGEST_SUCCESS';
-const ADMIN_USERS_UNSUGGEST_FAIL    = 'ADMIN_USERS_UNSUGGEST_FAIL';
-
 const ADMIN_USER_INDEX_EXPAND_FAIL    = 'ADMIN_USER_INDEX_EXPAND_FAIL';
 const ADMIN_USER_INDEX_EXPAND_REQUEST = 'ADMIN_USER_INDEX_EXPAND_REQUEST';
 const ADMIN_USER_INDEX_EXPAND_SUCCESS = 'ADMIN_USER_INDEX_EXPAND_SUCCESS';
@@ -121,13 +114,11 @@ const messages = defineMessages({
   announcementUpdateSuccess: { id: 'admin.edit_announcement.updated', defaultMessage: 'Announcement edited' },
 });
 
-const nicknamesFromIds = (getState: () => RootState, ids: string[]) => ids.map(id => getState().accounts.get(id)!.acct);
-
 const fetchConfig = () =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: ADMIN_CONFIG_FETCH_REQUEST });
     return api(getState)
-      .get('/api/pleroma/admin/config')
+      .get('/api/v1/pleroma/admin/config')
       .then(({ data }) => {
         dispatch({ type: ADMIN_CONFIG_FETCH_SUCCESS, configs: data.configs, needsReboot: data.need_reboot });
       }).catch(error => {
@@ -139,7 +130,7 @@ const updateConfig = (configs: Record<string, any>[]) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: ADMIN_CONFIG_UPDATE_REQUEST, configs });
     return api(getState)
-      .post('/api/pleroma/admin/config', { configs })
+      .post('/api/v1/pleroma/admin/config', { configs })
       .then(({ data }) => {
         dispatch({ type: ADMIN_CONFIG_UPDATE_SUCCESS, configs: data.configs, needsReboot: data.need_reboot });
       }).catch(error => {
@@ -178,7 +169,7 @@ const fetchMastodonReports = (params: Record<string, any>) =>
 const fetchPleromaReports = (params: Record<string, any>) =>
   (dispatch: AppDispatch, getState: () => RootState) =>
     api(getState)
-      .get('/api/pleroma/admin/reports', { params })
+      .get('/api/v1/pleroma/admin/reports', { params })
       .then(({ data: { reports } }) => {
         reports.forEach((report: APIEntity) => {
           dispatch(importFetchedAccount(report.account));
@@ -224,7 +215,7 @@ const patchMastodonReports = (reports: { id: string, state: string }[]) =>
 const patchPleromaReports = (reports: { id: string, state: string }[]) =>
   (dispatch: AppDispatch, getState: () => RootState) =>
     api(getState)
-      .patch('/api/pleroma/admin/reports', { reports })
+      .patch('/api/v1/pleroma/admin/reports', { reports })
       .then(() => {
         dispatch({ type: ADMIN_REPORTS_PATCH_SUCCESS, reports });
       }).catch(error => {
@@ -286,7 +277,7 @@ const fetchPleromaUsers = (filters: string[], page: number, query?: string | nul
     if (query) params.query = query;
 
     return api(getState)
-      .get('/api/pleroma/admin/users', { params })
+      .get('/api/v1/pleroma/admin/users', { params })
       .then(({ data: { users, count, page_size: pageSize } }) => {
         dispatch(fetchRelationships(users.map((user: APIEntity) => user.id)));
         dispatch({ type: ADMIN_USERS_FETCH_SUCCESS, users, count, pageSize, filters, page });
@@ -329,9 +320,9 @@ const deactivateMastodonUsers = (accountIds: string[], reportId?: string) =>
 
 const deactivatePleromaUsers = (accountIds: string[]) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
+    const nicknames = accountIdsToAccts(getState(), accountIds);
     return api(getState)
-      .patch('/api/pleroma/admin/users/deactivate', { nicknames })
+      .patch('/api/v1/pleroma/admin/users/deactivate', { nicknames })
       .then(({ data: { users } }) => {
         dispatch({ type: ADMIN_USERS_DEACTIVATE_SUCCESS, users, accountIds });
       }).catch(error => {
@@ -357,10 +348,10 @@ const deactivateUsers = (accountIds: string[], reportId?: string) =>
 
 const deleteUsers = (accountIds: string[]) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
+    const nicknames = accountIdsToAccts(getState(), accountIds);
     dispatch({ type: ADMIN_USERS_DELETE_REQUEST, accountIds });
     return api(getState)
-      .delete('/api/pleroma/admin/users', { data: { nicknames } })
+      .delete('/api/v1/pleroma/admin/users', { data: { nicknames } })
       .then(({ data: nicknames }) => {
         dispatch({ type: ADMIN_USERS_DELETE_SUCCESS, nicknames, accountIds });
       }).catch(error => {
@@ -382,9 +373,9 @@ const approveMastodonUsers = (accountIds: string[]) =>
 
 const approvePleromaUsers = (accountIds: string[]) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
+    const nicknames = accountIdsToAccts(getState(), accountIds);
     return api(getState)
-      .patch('/api/pleroma/admin/users/approve', { nicknames })
+      .patch('/api/v1/pleroma/admin/users/approve', { nicknames })
       .then(({ data: { users } }) => {
         dispatch({ type: ADMIN_USERS_APPROVE_SUCCESS, users, accountIds });
       }).catch(error => {
@@ -412,7 +403,7 @@ const deleteStatus = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: ADMIN_STATUS_DELETE_REQUEST, id });
     return api(getState)
-      .delete(`/api/pleroma/admin/statuses/${id}`)
+      .delete(`/api/v1/pleroma/admin/statuses/${id}`)
       .then(() => {
         dispatch({ type: ADMIN_STATUS_DELETE_SUCCESS, id });
       }).catch(error => {
@@ -424,7 +415,7 @@ const toggleStatusSensitivity = (id: string, sensitive: boolean) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: ADMIN_STATUS_TOGGLE_SENSITIVITY_REQUEST, id });
     return api(getState)
-      .put(`/api/pleroma/admin/statuses/${id}`, { sensitive: !sensitive })
+      .put(`/api/v1/pleroma/admin/statuses/${id}`, { sensitive: !sensitive })
       .then(() => {
         dispatch({ type: ADMIN_STATUS_TOGGLE_SENSITIVITY_SUCCESS, id });
       }).catch(error => {
@@ -436,7 +427,7 @@ const fetchModerationLog = (params?: Record<string, any>) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: ADMIN_LOG_FETCH_REQUEST });
     return api(getState)
-      .get('/api/pleroma/admin/moderation_log', { params })
+      .get('/api/v1/pleroma/admin/moderation_log', { params })
       .then(({ data }) => {
         dispatch({ type: ADMIN_LOG_FETCH_SUCCESS, items: data.items, total: data.total });
         return data;
@@ -447,7 +438,7 @@ const fetchModerationLog = (params?: Record<string, any>) =>
 
 const tagUsers = (accountIds: string[], tags: string[]) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
+    const nicknames = accountIdsToAccts(getState(), accountIds);
     dispatch({ type: ADMIN_USERS_TAG_REQUEST, accountIds, tags });
     return api(getState)
       .put('/api/v1/pleroma/admin/users/tag', { nicknames, tags })
@@ -460,7 +451,7 @@ const tagUsers = (accountIds: string[], tags: string[]) =>
 
 const untagUsers = (accountIds: string[], tags: string[]) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
+    const nicknames = accountIdsToAccts(getState(), accountIds);
 
     // Legacy: allow removing legacy 'donor' tags.
     if (tags.includes('badge:donor')) {
@@ -495,17 +486,9 @@ const setBadges = (accountId: string, oldTags: string[], newTags: string[]) =>
     return dispatch(setTags(accountId, oldBadges, newBadges));
   };
 
-const verifyUser = (accountId: string) =>
-  (dispatch: AppDispatch) =>
-    dispatch(tagUsers([accountId], ['verified']));
-
-const unverifyUser = (accountId: string) =>
-  (dispatch: AppDispatch) =>
-    dispatch(untagUsers([accountId], ['verified']));
-
 const addPermission = (accountIds: string[], permissionGroup: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
+    const nicknames = accountIdsToAccts(getState(), accountIds);
     dispatch({ type: ADMIN_ADD_PERMISSION_GROUP_REQUEST, accountIds, permissionGroup });
     return api(getState)
       .post(`/api/v1/pleroma/admin/users/permission_group/${permissionGroup}`, { nicknames })
@@ -518,7 +501,7 @@ const addPermission = (accountIds: string[], permissionGroup: string) =>
 
 const removePermission = (accountIds: string[], permissionGroup: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
+    const nicknames = accountIdsToAccts(getState(), accountIds);
     dispatch({ type: ADMIN_REMOVE_PERMISSION_GROUP_REQUEST, accountIds, permissionGroup });
     return api(getState)
       .delete(`/api/v1/pleroma/admin/users/permission_group/${permissionGroup}`, { data: { nicknames } })
@@ -562,32 +545,6 @@ const setRole = (accountId: string, role: 'user' | 'moderator' | 'admin') =>
     }
   };
 
-const suggestUsers = (accountIds: string[]) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
-    dispatch({ type: ADMIN_USERS_SUGGEST_REQUEST, accountIds });
-    return api(getState)
-      .patch('/api/pleroma/admin/users/suggest', { nicknames })
-      .then(({ data: { users } }) => {
-        dispatch({ type: ADMIN_USERS_SUGGEST_SUCCESS, users, accountIds });
-      }).catch(error => {
-        dispatch({ type: ADMIN_USERS_SUGGEST_FAIL, error, accountIds });
-      });
-  };
-
-const unsuggestUsers = (accountIds: string[]) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    const nicknames = nicknamesFromIds(getState, accountIds);
-    dispatch({ type: ADMIN_USERS_UNSUGGEST_REQUEST, accountIds });
-    return api(getState)
-      .patch('/api/pleroma/admin/users/unsuggest', { nicknames })
-      .then(({ data: { users } }) => {
-        dispatch({ type: ADMIN_USERS_UNSUGGEST_SUCCESS, users, accountIds });
-      }).catch(error => {
-        dispatch({ type: ADMIN_USERS_UNSUGGEST_FAIL, error, accountIds });
-      });
-  };
-
 const setUserIndexQuery = (query: string) => ({ type: ADMIN_USER_INDEX_QUERY_SET, query });
 
 const fetchUserIndex = () =>
@@ -636,7 +593,7 @@ const fetchAdminAnnouncements = () =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: ADMIN_ANNOUNCEMENTS_FETCH_REQUEST });
     return api(getState)
-      .get('/api/pleroma/admin/announcements', { params: { limit: 50 } })
+      .get('/api/v1/pleroma/admin/announcements', { params: { limit: 50 } })
       .then(({ data }) => {
         dispatch({ type: ADMIN_ANNOUNCEMENTS_FETCH_SUCCESS, announcements: data });
         return data;
@@ -651,7 +608,7 @@ const expandAdminAnnouncements = () =>
 
     dispatch({ type: ADMIN_ANNOUNCEMENTS_EXPAND_REQUEST });
     return api(getState)
-      .get('/api/pleroma/admin/announcements', { params: { limit: 50, offset: page * 50 } })
+      .get('/api/v1/pleroma/admin/announcements', { params: { limit: 50, offset: page * 50 } })
       .then(({ data }) => {
         dispatch({ type: ADMIN_ANNOUNCEMENTS_EXPAND_SUCCESS, announcements: data });
         return data;
@@ -687,7 +644,7 @@ const handleCreateAnnouncement = () =>
     const { id, content, starts_at, ends_at, all_day } = getState().admin_announcements.form;
 
     return api(getState)[id ? 'patch' : 'post'](
-      id ? `/api/pleroma/admin/announcements/${id}` : '/api/pleroma/admin/announcements',
+      id ? `/api/v1/pleroma/admin/announcements/${id}` : '/api/v1/pleroma/admin/announcements',
       { content, starts_at, ends_at, all_day },
     ).then(({ data }) => {
       dispatch({ type: ADMIN_ANNOUNCEMENT_CREATE_SUCCESS, announcement: data });
@@ -703,7 +660,7 @@ const deleteAnnouncement = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: ADMIN_ANNOUNCEMENT_DELETE_REQUEST, id });
 
-    return api(getState).delete(`/api/pleroma/admin/announcements/${id}`).then(({ data }) => {
+    return api(getState).delete(`/api/v1/pleroma/admin/announcements/${id}`).then(({ data }) => {
       dispatch({ type: ADMIN_ANNOUNCEMENT_DELETE_SUCCESS, id });
       toast.success(messages.announcementDeleteSuccess);
       dispatch(fetchAdminAnnouncements());
@@ -765,12 +722,6 @@ export {
   ADMIN_REMOVE_PERMISSION_GROUP_REQUEST,
   ADMIN_REMOVE_PERMISSION_GROUP_SUCCESS,
   ADMIN_REMOVE_PERMISSION_GROUP_FAIL,
-  ADMIN_USERS_SUGGEST_REQUEST,
-  ADMIN_USERS_SUGGEST_SUCCESS,
-  ADMIN_USERS_SUGGEST_FAIL,
-  ADMIN_USERS_UNSUGGEST_REQUEST,
-  ADMIN_USERS_UNSUGGEST_SUCCESS,
-  ADMIN_USERS_UNSUGGEST_FAIL,
   ADMIN_USER_INDEX_EXPAND_FAIL,
   ADMIN_USER_INDEX_EXPAND_REQUEST,
   ADMIN_USER_INDEX_EXPAND_SUCCESS,
@@ -811,16 +762,12 @@ export {
   untagUsers,
   setTags,
   setBadges,
-  verifyUser,
-  unverifyUser,
   addPermission,
   removePermission,
   promoteToAdmin,
   promoteToModerator,
   demoteToUser,
   setRole,
-  suggestUsers,
-  unsuggestUsers,
   setUserIndexQuery,
   fetchUserIndex,
   expandUserIndex,

app/soapbox/actions/aliases.ts

@@ -10,8 +10,8 @@ import { importFetchedAccounts } from './importer';
 import { patchMeSuccess } from './me';
 
 import type { AxiosError } from 'axios';
+import type { Account } from 'soapbox/schemas';
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { APIEntity, Account } from 'soapbox/types/entities';
 
 const ALIASES_FETCH_REQUEST = 'ALIASES_FETCH_REQUEST';
 const ALIASES_FETCH_SUCCESS = 'ALIASES_FETCH_SUCCESS';
@@ -56,7 +56,7 @@ const fetchAliasesRequest = () => ({
   type: ALIASES_FETCH_REQUEST,
 });
 
-const fetchAliasesSuccess = (aliases: APIEntity[]) => ({
+const fetchAliasesSuccess = (aliases: unknown[]) => ({
   type: ALIASES_FETCH_SUCCESS,
   value: aliases,
 });
@@ -82,7 +82,7 @@ const fetchAliasesSuggestions = (q: string) =>
     }).catch(error => toast.showAlertForError(error));
   };
 
-const fetchAliasesSuggestionsReady = (query: string, accounts: APIEntity[]) => ({
+const fetchAliasesSuggestionsReady = (query: string, accounts: unknown[]) => ({
   type: ALIASES_SUGGESTIONS_READY,
   query,
   accounts,
@@ -111,7 +111,7 @@ const addToAliases = (account: Account) =>
 
       dispatch(addToAliasesRequest());
 
-      api(getState).patch('/api/v1/accounts/update_credentials', { also_known_as: [...alsoKnownAs, account.pleroma.get('ap_id')] })
+      api(getState).patch('/api/v1/accounts/update_credentials', { also_known_as: [...alsoKnownAs, account.pleroma?.ap_id] })
         .then((response => {
           toast.success(messages.createSuccess);
           dispatch(addToAliasesSuccess);

app/soapbox/actions/auth.ts

@@ -16,6 +16,7 @@ import { obtainOAuthToken, revokeOAuthToken } from 'soapbox/actions/oauth';
 import { startOnboarding } from 'soapbox/actions/onboarding';
 import { custom } from 'soapbox/custom';
 import { queryClient } from 'soapbox/queries/client';
+import { selectAccount } from 'soapbox/selectors';
 import KVStore from 'soapbox/storage/kv-store';
 import toast from 'soapbox/toast';
 import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth';
@@ -178,8 +179,7 @@ export const rememberAuthAccount = (accountUrl: string) =>
 
 export const loadCredentials = (token: string, accountUrl: string) =>
   (dispatch: AppDispatch) => dispatch(rememberAuthAccount(accountUrl))
-    .then(() => dispatch(verifyCredentials(token, accountUrl)))
-    .catch(() => dispatch(verifyCredentials(token, accountUrl)));
+    .finally(() => dispatch(verifyCredentials(token, accountUrl)));
 
 export const logIn = (username: string, password: string) =>
   (dispatch: AppDispatch) => dispatch(getAuthApp()).then(() => {
@@ -228,7 +228,7 @@ export const logOut = () =>
 
 export const switchAccount = (accountId: string, background = false) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const account = getState().accounts.get(accountId);
+    const account = selectAccount(getState(), accountId);
     // Clear all stored cache from React Query
     queryClient.invalidateQueries();
     queryClient.clear();
@@ -240,9 +240,10 @@ export const fetchOwnAccounts = () =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
     return state.auth.users.forEach((user) => {
-      const account = state.accounts.get(user.id);
+      const account = selectAccount(state, user.id);
       if (!account) {
-        dispatch(verifyCredentials(user.access_token, user.url));
+        dispatch(verifyCredentials(user.access_token, user.url))
+          .catch(() => console.warn(`Failed to load account: ${user.url}`));
       }
     });
   };

app/soapbox/actions/blocks.ts

@@ -6,9 +6,8 @@ import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
 
-import type { AnyAction } from '@reduxjs/toolkit';
 import type { AxiosError } from 'axios';
-import type { RootState } from 'soapbox/store';
+import type { AppDispatch, RootState } from 'soapbox/store';
 
 const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
 const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
@@ -18,7 +17,7 @@ const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
 const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 const BLOCKS_EXPAND_FAIL = 'BLOCKS_EXPAND_FAIL';
 
-const fetchBlocks = () => (dispatch: React.Dispatch<AnyAction>, getState: () => RootState) => {
+const fetchBlocks = () => (dispatch: AppDispatch, getState: () => RootState) => {
   if (!isLoggedIn(getState)) return null;
   const nextLinkName = getNextLinkName(getState);
 
@@ -54,7 +53,7 @@ function fetchBlocksFail(error: AxiosError) {
   };
 }
 
-const expandBlocks = () => (dispatch: React.Dispatch<AnyAction>, getState: () => RootState) => {
+const expandBlocks = () => (dispatch: AppDispatch, getState: () => RootState) => {
   if (!isLoggedIn(getState)) return null;
   const nextLinkName = getNextLinkName(getState);
 

app/soapbox/actions/compose.ts

@@ -4,7 +4,9 @@ import throttle from 'lodash/throttle';
 import { defineMessages, IntlShape } from 'react-intl';
 
 import api from 'soapbox/api';
-import { search as emojiSearch } from 'soapbox/features/emoji/emoji-mart-search-light';
+import { isNativeEmoji } from 'soapbox/features/emoji';
+import emojiSearch from 'soapbox/features/emoji/search';
+import { selectAccount, selectOwnAccount } from 'soapbox/selectors';
 import { tagHistory } from 'soapbox/settings';
 import toast from 'soapbox/toast';
 import { isLoggedIn } from 'soapbox/utils/auth';
@@ -19,70 +21,71 @@ import { openModal, closeModal } from './modals';
 import { getSettings } from './settings';
 import { createStatus } from './statuses';
 
-import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 import type { AutoSuggestion } from 'soapbox/components/autosuggest-input';
+import type { Emoji } from 'soapbox/features/emoji';
+import type { Account, Group } from 'soapbox/schemas';
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { Account, APIEntity, Status, Tag } from 'soapbox/types/entities';
+import type { APIEntity, Status, Tag } from 'soapbox/types/entities';
 import type { History } from 'soapbox/types/history';
 
 const { CancelToken, isCancel } = axios;
 
 let cancelFetchComposeSuggestionsAccounts: Canceler;
 
-const COMPOSE_CHANGE          = 'COMPOSE_CHANGE';
-const COMPOSE_SUBMIT_REQUEST  = 'COMPOSE_SUBMIT_REQUEST';
-const COMPOSE_SUBMIT_SUCCESS  = 'COMPOSE_SUBMIT_SUCCESS';
-const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
-const COMPOSE_REPLY           = 'COMPOSE_REPLY';
-const COMPOSE_EVENT_REPLY     = 'COMPOSE_EVENT_REPLY';
-const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
-const COMPOSE_QUOTE           = 'COMPOSE_QUOTE';
-const COMPOSE_QUOTE_CANCEL    = 'COMPOSE_QUOTE_CANCEL';
-const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
-const COMPOSE_MENTION         = 'COMPOSE_MENTION';
-const COMPOSE_RESET           = 'COMPOSE_RESET';
-const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST';
-const COMPOSE_UPLOAD_SUCCESS  = 'COMPOSE_UPLOAD_SUCCESS';
-const COMPOSE_UPLOAD_FAIL     = 'COMPOSE_UPLOAD_FAIL';
-const COMPOSE_UPLOAD_PROGRESS = 'COMPOSE_UPLOAD_PROGRESS';
-const COMPOSE_UPLOAD_UNDO     = 'COMPOSE_UPLOAD_UNDO';
-const COMPOSE_GROUP_POST      = 'COMPOSE_GROUP_POST';
+const COMPOSE_CHANGE          = 'COMPOSE_CHANGE' as const;
+const COMPOSE_SUBMIT_REQUEST  = 'COMPOSE_SUBMIT_REQUEST' as const;
+const COMPOSE_SUBMIT_SUCCESS  = 'COMPOSE_SUBMIT_SUCCESS' as const;
+const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL' as const;
+const COMPOSE_REPLY           = 'COMPOSE_REPLY' as const;
+const COMPOSE_EVENT_REPLY     = 'COMPOSE_EVENT_REPLY' as const;
+const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL' as const;
+const COMPOSE_QUOTE           = 'COMPOSE_QUOTE' as const;
+const COMPOSE_QUOTE_CANCEL    = 'COMPOSE_QUOTE_CANCEL' as const;
+const COMPOSE_DIRECT          = 'COMPOSE_DIRECT' as const;
+const COMPOSE_MENTION         = 'COMPOSE_MENTION' as const;
+const COMPOSE_RESET           = 'COMPOSE_RESET' as const;
+const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST' as const;
+const COMPOSE_UPLOAD_SUCCESS  = 'COMPOSE_UPLOAD_SUCCESS' as const;
+const COMPOSE_UPLOAD_FAIL     = 'COMPOSE_UPLOAD_FAIL' as const;
+const COMPOSE_UPLOAD_PROGRESS = 'COMPOSE_UPLOAD_PROGRESS' as const;
+const COMPOSE_UPLOAD_UNDO     = 'COMPOSE_UPLOAD_UNDO' as const;
+const COMPOSE_GROUP_POST      = 'COMPOSE_GROUP_POST' as const;
+const COMPOSE_SET_GROUP_TIMELINE_VISIBLE = 'COMPOSE_SET_GROUP_TIMELINE_VISIBLE' as const;
 
-const COMPOSE_SUGGESTIONS_CLEAR = 'COMPOSE_SUGGESTIONS_CLEAR';
-const COMPOSE_SUGGESTIONS_READY = 'COMPOSE_SUGGESTIONS_READY';
-const COMPOSE_SUGGESTION_SELECT = 'COMPOSE_SUGGESTION_SELECT';
-const COMPOSE_SUGGESTION_TAGS_UPDATE = 'COMPOSE_SUGGESTION_TAGS_UPDATE';
+const COMPOSE_SUGGESTIONS_CLEAR = 'COMPOSE_SUGGESTIONS_CLEAR' as const;
+const COMPOSE_SUGGESTIONS_READY = 'COMPOSE_SUGGESTIONS_READY' as const;
+const COMPOSE_SUGGESTION_SELECT = 'COMPOSE_SUGGESTION_SELECT' as const;
+const COMPOSE_SUGGESTION_TAGS_UPDATE = 'COMPOSE_SUGGESTION_TAGS_UPDATE' as const;
 
-const COMPOSE_TAG_HISTORY_UPDATE = 'COMPOSE_TAG_HISTORY_UPDATE';
+const COMPOSE_TAG_HISTORY_UPDATE = 'COMPOSE_TAG_HISTORY_UPDATE' as const;
 
-const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE';
-const COMPOSE_TYPE_CHANGE = 'COMPOSE_TYPE_CHANGE';
-const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
-const COMPOSE_VISIBILITY_CHANGE  = 'COMPOSE_VISIBILITY_CHANGE';
-const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE';
-const COMPOSE_COMPOSING_CHANGE = 'COMPOSE_COMPOSING_CHANGE';
+const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE' as const;
+const COMPOSE_TYPE_CHANGE = 'COMPOSE_TYPE_CHANGE' as const;
+const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE' as const;
+const COMPOSE_VISIBILITY_CHANGE  = 'COMPOSE_VISIBILITY_CHANGE' as const;
+const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE' as const;
 
-const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
+const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT' as const;
 
-const COMPOSE_UPLOAD_CHANGE_REQUEST     = 'COMPOSE_UPLOAD_UPDATE_REQUEST';
-const COMPOSE_UPLOAD_CHANGE_SUCCESS     = 'COMPOSE_UPLOAD_UPDATE_SUCCESS';
-const COMPOSE_UPLOAD_CHANGE_FAIL        = 'COMPOSE_UPLOAD_UPDATE_FAIL';
+const COMPOSE_UPLOAD_CHANGE_REQUEST     = 'COMPOSE_UPLOAD_UPDATE_REQUEST' as const;
+const COMPOSE_UPLOAD_CHANGE_SUCCESS     = 'COMPOSE_UPLOAD_UPDATE_SUCCESS' as const;
+const COMPOSE_UPLOAD_CHANGE_FAIL        = 'COMPOSE_UPLOAD_UPDATE_FAIL' as const;
 
-const COMPOSE_POLL_ADD             = 'COMPOSE_POLL_ADD';
-const COMPOSE_POLL_REMOVE          = 'COMPOSE_POLL_REMOVE';
-const COMPOSE_POLL_OPTION_ADD      = 'COMPOSE_POLL_OPTION_ADD';
-const COMPOSE_POLL_OPTION_CHANGE   = 'COMPOSE_POLL_OPTION_CHANGE';
-const COMPOSE_POLL_OPTION_REMOVE   = 'COMPOSE_POLL_OPTION_REMOVE';
-const COMPOSE_POLL_SETTINGS_CHANGE = 'COMPOSE_POLL_SETTINGS_CHANGE';
+const COMPOSE_POLL_ADD             = 'COMPOSE_POLL_ADD' as const;
+const COMPOSE_POLL_REMOVE          = 'COMPOSE_POLL_REMOVE' as const;
+const COMPOSE_POLL_OPTION_ADD      = 'COMPOSE_POLL_OPTION_ADD' as const;
+const COMPOSE_POLL_OPTION_CHANGE   = 'COMPOSE_POLL_OPTION_CHANGE' as const;
+const COMPOSE_POLL_OPTION_REMOVE   = 'COMPOSE_POLL_OPTION_REMOVE' as const;
+const COMPOSE_POLL_SETTINGS_CHANGE = 'COMPOSE_POLL_SETTINGS_CHANGE' as const;
 
-const COMPOSE_SCHEDULE_ADD    = 'COMPOSE_SCHEDULE_ADD';
-const COMPOSE_SCHEDULE_SET    = 'COMPOSE_SCHEDULE_SET';
-const COMPOSE_SCHEDULE_REMOVE = 'COMPOSE_SCHEDULE_REMOVE';
+const COMPOSE_SCHEDULE_ADD    = 'COMPOSE_SCHEDULE_ADD' as const;
+const COMPOSE_SCHEDULE_SET    = 'COMPOSE_SCHEDULE_SET' as const;
+const COMPOSE_SCHEDULE_REMOVE = 'COMPOSE_SCHEDULE_REMOVE' as const;
 
-const COMPOSE_ADD_TO_MENTIONS = 'COMPOSE_ADD_TO_MENTIONS';
-const COMPOSE_REMOVE_FROM_MENTIONS = 'COMPOSE_REMOVE_FROM_MENTIONS';
+const COMPOSE_ADD_TO_MENTIONS = 'COMPOSE_ADD_TO_MENTIONS' as const;
+const COMPOSE_REMOVE_FROM_MENTIONS = 'COMPOSE_REMOVE_FROM_MENTIONS' as const;
 
-const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS';
+const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS' as const;
 
 const messages = defineMessages({
   exceededImageSizeLimit: { id: 'upload_error.image_size_limit', defaultMessage: 'Image exceeds the current file size limit ({limit})' },
@@ -98,12 +101,24 @@ const messages = defineMessages({
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
 });
 
+interface ComposeSetStatusAction {
+  type: typeof COMPOSE_SET_STATUS
+  id: string
+  status: Status
+  rawText: string
+  explicitAddressing: boolean
+  spoilerText?: string
+  contentType?: string | false
+  v: ReturnType<typeof parseVersion>
+  withRedraft?: boolean
+}
+
 const setComposeToStatus = (status: Status, rawText: string, spoilerText?: string, contentType?: string | false, withRedraft?: boolean) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const { instance } = getState();
     const { explicitAddressing } = getFeatures(instance);
 
-    dispatch({
+    const action: ComposeSetStatusAction = {
       type: COMPOSE_SET_STATUS,
       id: 'compose-modal',
       status,
@@ -113,7 +128,9 @@ const setComposeToStatus = (status: Status, rawText: string, spoilerText?: strin
       contentType,
       v: parseVersion(instance.version),
       withRedraft,
-    });
+    };
+
+    dispatch(action);
   };
 
 const changeCompose = (composeId: string, text: string) => ({
@@ -122,20 +139,35 @@ const changeCompose = (composeId: string, text: string) => ({
   text: text,
 });
 
+interface ComposeReplyAction {
+  type: typeof COMPOSE_REPLY
+  id: string
+  status: Status
+  account: Account
+  explicitAddressing: boolean
+  preserveSpoilers: boolean
+}
+
 const replyCompose = (status: Status) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
     const instance = state.instance;
     const { explicitAddressing } = getFeatures(instance);
+    const preserveSpoilers = !!getSettings(state).get('preserveSpoilers');
+    const account = selectOwnAccount(state);
 
-    dispatch({
+    if (!account) return;
+
+    const action: ComposeReplyAction = {
       type: COMPOSE_REPLY,
       id: 'compose-modal',
       status: status,
-      account: state.accounts.get(state.me),
+      account,
       explicitAddressing,
-    });
+      preserveSpoilers,
+    };
 
+    dispatch(action);
     dispatch(openModal('COMPOSE'));
   };
 
@@ -144,20 +176,29 @@ const cancelReplyCompose = () => ({
   id: 'compose-modal',
 });
 
+interface ComposeQuoteAction {
+  type: typeof COMPOSE_QUOTE
+  id: string
+  status: Status
+  account: Account | undefined
+  explicitAddressing: boolean
+}
+
 const quoteCompose = (status: Status) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
     const instance = state.instance;
     const { explicitAddressing } = getFeatures(instance);
 
-    dispatch({
+    const action: ComposeQuoteAction = {
       type: COMPOSE_QUOTE,
       id: 'compose-modal',
       status: status,
-      account: state.accounts.get(state.me),
+      account: selectOwnAccount(state),
       explicitAddressing,
-    });
+    };
 
+    dispatch(action);
     dispatch(openModal('COMPOSE'));
   };
 
@@ -166,43 +207,67 @@ const cancelQuoteCompose = () => ({
   id: 'compose-modal',
 });
 
+const groupComposeModal = (group: Group) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    const composeId = `group:${group.id}`;
+
+    dispatch(groupCompose(composeId, group.id));
+    dispatch(openModal('COMPOSE', { composeId }));
+  };
+
 const resetCompose = (composeId = 'compose-modal') => ({
   type: COMPOSE_RESET,
   id: composeId,
 });
 
+interface ComposeMentionAction {
+  type: typeof COMPOSE_MENTION
+  id: string
+  account: Account
+}
+
 const mentionCompose = (account: Account) =>
   (dispatch: AppDispatch) => {
-    dispatch({
+    const action: ComposeMentionAction = {
       type: COMPOSE_MENTION,
       id: 'compose-modal',
       account: account,
-    });
+    };
 
+    dispatch(action);
     dispatch(openModal('COMPOSE'));
   };
 
+interface ComposeDirectAction {
+  type: typeof COMPOSE_DIRECT
+  id: string
+  account: Account
+}
+
 const directCompose = (account: Account) =>
   (dispatch: AppDispatch) => {
-    dispatch({
+    const action: ComposeDirectAction = {
       type: COMPOSE_DIRECT,
       id: 'compose-modal',
-      account: account,
-    });
+      account,
+    };
 
+    dispatch(action);
     dispatch(openModal('COMPOSE'));
   };
 
 const directComposeById = (accountId: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const account = getState().accounts.get(accountId);
+    const account = selectAccount(getState(), accountId);
+    if (!account) return;
 
-    dispatch({
+    const action: ComposeDirectAction = {
       type: COMPOSE_DIRECT,
       id: 'compose-modal',
-      account: account,
-    });
+      account,
+    };
 
+    dispatch(action);
     dispatch(openModal('COMPOSE'));
   };
 
@@ -277,7 +342,7 @@ const submitCompose = (composeId: string, routerHistory?: History, force = false
 
     const idempotencyKey = compose.idempotencyKey;
 
-    const params = {
+    const params: Record<string, any> = {
       status,
       in_reply_to_id: compose.in_reply_to,
       quote_id: compose.quote,
@@ -289,9 +354,13 @@ const submitCompose = (composeId: string, routerHistory?: History, force = false
       poll: compose.poll,
       scheduled_at: compose.schedule,
       to,
-      group_id: compose.privacy === 'group' ? compose.group_id : null,
     };
 
+    if (compose.privacy === 'group') {
+      params.group_id = compose.group_id;
+      params.group_timeline_visible = compose.group_timeline_visible; // Truth Social
+    }
+
     dispatch(createStatus(params, idempotencyKey, statusId)).then(function(data) {
       if (!statusId && data.visibility === 'direct' && getState().conversations.mounted <= 0 && routerHistory) {
         routerHistory.push('/messages');
@@ -472,14 +541,17 @@ const undoUploadCompose = (composeId: string, media_id: string) => ({
   media_id: media_id,
 });
 
-const groupCompose = (composeId: string, groupId: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    dispatch({
-      type: COMPOSE_GROUP_POST,
-      id: composeId,
-      group_id: groupId,
-    });
-  };
+const groupCompose = (composeId: string, groupId: string) => ({
+  type: COMPOSE_GROUP_POST,
+  id: composeId,
+  group_id: groupId,
+});
+
+const setGroupTimelineVisible = (composeId: string, groupTimelineVisible: boolean) => ({
+  type: COMPOSE_SET_GROUP_TIMELINE_VISIBLE,
+  id: composeId,
+  groupTimelineVisible,
+});
 
 const clearComposeSuggestions = (composeId: string) => {
   if (cancelFetchComposeSuggestionsAccounts) {
@@ -515,7 +587,9 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, composeId,
 }, 200, { leading: true, trailing: true });
 
 const fetchComposeSuggestionsEmojis = (dispatch: AppDispatch, getState: () => RootState, composeId: string, token: string) => {
-  const results = emojiSearch(token.replace(':', ''), { maxResults: 5 } as any);
+  const state = getState();
+  const results = emojiSearch(token.replace(':', ''), { maxResults: 5 }, state.custom_emojis);
+
   dispatch(readyComposeSuggestionsEmojis(composeId, token, results));
 };
 
@@ -541,6 +615,14 @@ const fetchComposeSuggestions = (composeId: string, token: string) =>
     }
   };
 
+interface ComposeSuggestionsReadyAction {
+  type: typeof COMPOSE_SUGGESTIONS_READY
+  id: string
+  token: string
+  emojis?: Emoji[]
+  accounts?: APIEntity[]
+}
+
 const readyComposeSuggestionsEmojis = (composeId: string, token: string, emojis: Emoji[]) => ({
   type: COMPOSE_SUGGESTIONS_READY,
   id: composeId,
@@ -555,31 +637,42 @@ const readyComposeSuggestionsAccounts = (composeId: string, token: string, accou
   accounts,
 });
 
+interface ComposeSuggestionSelectAction {
+  type: typeof COMPOSE_SUGGESTION_SELECT
+  id: string
+  position: number
+  token: string | null
+  completion: string
+  path: Array<string | number>
+}
+
 const selectComposeSuggestion = (composeId: string, position: number, token: string | null, suggestion: AutoSuggestion, path: Array<string | number>) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    let completion, startPosition;
+    let completion = '', startPosition = position;
 
     if (typeof suggestion === 'object' && suggestion.id) {
-      completion    = suggestion.native || suggestion.colons;
+      completion    = isNativeEmoji(suggestion) ? suggestion.native : suggestion.colons;
       startPosition = position - 1;
 
       dispatch(useEmoji(suggestion));
     } else if (typeof suggestion === 'string' && suggestion[0] === '#') {
       completion    = suggestion;
       startPosition = position - 1;
-    } else {
-      completion    = getState().accounts.get(suggestion)!.acct;
+    } else if (typeof suggestion === 'string') {
+      completion    = selectAccount(getState(), suggestion)!.acct;
       startPosition = position;
     }
 
-    dispatch({
+    const action: ComposeSuggestionSelectAction = {
       type: COMPOSE_SUGGESTION_SELECT,
       id: composeId,
       position: startPosition,
       token,
       completion,
       path,
-    });
+    };
+
+    dispatch(action);
   };
 
 const updateSuggestionTags = (composeId: string, token: string, currentTrends: ImmutableList<Tag>) => ({
@@ -689,7 +782,7 @@ const removePollOption = (composeId: string, index: number) => ({
   index,
 });
 
-const changePollSettings = (composeId: string, expiresIn?: string | number, isMultiple?: boolean) => ({
+const changePollSettings = (composeId: string, expiresIn?: number, isMultiple?: boolean) => ({
   type: COMPOSE_POLL_SETTINGS_CHANGE,
   id: composeId,
   expiresIn,
@@ -703,30 +796,56 @@ const openComposeWithText = (composeId: string, text = '') =>
     dispatch(changeCompose(composeId, text));
   };
 
+interface ComposeAddToMentionsAction {
+  type: typeof COMPOSE_ADD_TO_MENTIONS
+  id: string
+  account: string
+}
+
 const addToMentions = (composeId: string, accountId: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
-    const acct = state.accounts.get(accountId)!.acct;
+    const account = selectAccount(state, accountId);
+    if (!account) return;
 
-    return dispatch({
+    const action: ComposeAddToMentionsAction = {
       type: COMPOSE_ADD_TO_MENTIONS,
       id: composeId,
-      account: acct,
-    });
+      account: account.acct,
+    };
+
+    return dispatch(action);
   };
 
+interface ComposeRemoveFromMentionsAction {
+  type: typeof COMPOSE_REMOVE_FROM_MENTIONS
+  id: string
+  account: string
+}
+
 const removeFromMentions = (composeId: string, accountId: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
-    const acct = state.accounts.get(accountId)!.acct;
+    const account = selectAccount(state, accountId);
+    if (!account) return;
 
-    return dispatch({
+    const action: ComposeRemoveFromMentionsAction = {
       type: COMPOSE_REMOVE_FROM_MENTIONS,
       id: composeId,
-      account: acct,
-    });
+      account: account.acct,
+    };
+
+    return dispatch(action);
   };
 
+interface ComposeEventReplyAction {
+  type: typeof COMPOSE_EVENT_REPLY
+  id: string
+  status: Status
+  account: Account
+  explicitAddressing: boolean
+}
+
 const eventDiscussionCompose = (composeId: string, status: Status) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
@@ -737,11 +856,57 @@ const eventDiscussionCompose = (composeId: string, status: Status) =>
       type: COMPOSE_EVENT_REPLY,
       id: composeId,
       status: status,
-      account: state.accounts.get(state.me),
+      account: selectOwnAccount(state),
       explicitAddressing,
     });
   };
 
+type ComposeAction =
+  ComposeSetStatusAction
+  | ReturnType<typeof changeCompose>
+  | ComposeReplyAction
+  | ReturnType<typeof cancelReplyCompose>
+  | ComposeQuoteAction
+  | ReturnType<typeof cancelQuoteCompose>
+  | ReturnType<typeof resetCompose>
+  | ComposeMentionAction
+  | ComposeDirectAction
+  | ReturnType<typeof submitComposeRequest>
+  | ReturnType<typeof submitComposeSuccess>
+  | ReturnType<typeof submitComposeFail>
+  | ReturnType<typeof changeUploadComposeRequest>
+  | ReturnType<typeof changeUploadComposeSuccess>
+  | ReturnType<typeof changeUploadComposeFail>
+  | ReturnType<typeof uploadComposeRequest>
+  | ReturnType<typeof uploadComposeProgress>
+  | ReturnType<typeof uploadComposeSuccess>
+  | ReturnType<typeof uploadComposeFail>
+  | ReturnType<typeof undoUploadCompose>
+  | ReturnType<typeof groupCompose>
+  | ReturnType<typeof setGroupTimelineVisible>
+  | ReturnType<typeof clearComposeSuggestions>
+  | ComposeSuggestionsReadyAction
+  | ComposeSuggestionSelectAction
+  | ReturnType<typeof updateSuggestionTags>
+  | ReturnType<typeof updateTagHistory>
+  | ReturnType<typeof changeComposeSpoilerness>
+  | ReturnType<typeof changeComposeContentType>
+  | ReturnType<typeof changeComposeSpoilerText>
+  | ReturnType<typeof changeComposeVisibility>
+  | ReturnType<typeof insertEmojiCompose>
+  | ReturnType<typeof addPoll>
+  | ReturnType<typeof removePoll>
+  | ReturnType<typeof addSchedule>
+  | ReturnType<typeof setSchedule>
+  | ReturnType<typeof removeSchedule>
+  | ReturnType<typeof addPollOption>
+  | ReturnType<typeof changePollOption>
+  | ReturnType<typeof removePollOption>
+  | ReturnType<typeof changePollSettings>
+  | ComposeAddToMentionsAction
+  | ComposeRemoveFromMentionsAction
+  | ComposeEventReplyAction
+
 export {
   COMPOSE_CHANGE,
   COMPOSE_SUBMIT_REQUEST,
@@ -771,7 +936,6 @@ export {
   COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
   COMPOSE_LISTABILITY_CHANGE,
-  COMPOSE_COMPOSING_CHANGE,
   COMPOSE_EMOJI_INSERT,
   COMPOSE_UPLOAD_CHANGE_REQUEST,
   COMPOSE_UPLOAD_CHANGE_SUCCESS,
@@ -788,6 +952,7 @@ export {
   COMPOSE_ADD_TO_MENTIONS,
   COMPOSE_REMOVE_FROM_MENTIONS,
   COMPOSE_SET_STATUS,
+  COMPOSE_SET_GROUP_TIMELINE_VISIBLE,
   setComposeToStatus,
   changeCompose,
   replyCompose,
@@ -814,6 +979,8 @@ export {
   uploadComposeFail,
   undoUploadCompose,
   groupCompose,
+  groupComposeModal,
+  setGroupTimelineVisible,
   clearComposeSuggestions,
   fetchComposeSuggestions,
   readyComposeSuggestionsEmojis,
@@ -839,4 +1006,5 @@ export {
   addToMentions,
   removeFromMentions,
   eventDiscussionCompose,
+  type ComposeAction,
 };

app/soapbox/actions/domain-blocks.ts

@@ -1,9 +1,11 @@
+import { Entities } from 'soapbox/entity-store/entities';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
 import api, { getLinks } from '../api';
 
 import type { AxiosError } from 'axios';
-import type { List as ImmutableList } from 'immutable';
+import type { EntityStore } from 'soapbox/entity-store/types';
+import type { Account } from 'soapbox/schemas';
 import type { AppDispatch, RootState } from 'soapbox/store';
 
 const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
@@ -29,9 +31,9 @@ const blockDomain = (domain: string) =>
     dispatch(blockDomainRequest(domain));
 
     api(getState).post('/api/v1/domain_blocks', { domain }).then(() => {
-      const at_domain = '@' + domain;
-      const accounts = getState().accounts.filter(item => item.acct.endsWith(at_domain)).valueSeq().map(item => item.id);
-      dispatch(blockDomainSuccess(domain, accounts.toList()));
+      const accounts = selectAccountsByDomain(getState(), domain);
+      if (!accounts) return;
+      dispatch(blockDomainSuccess(domain, accounts));
     }).catch(err => {
       dispatch(blockDomainFail(domain, err));
     });
@@ -42,7 +44,7 @@ const blockDomainRequest = (domain: string) => ({
   domain,
 });
 
-const blockDomainSuccess = (domain: string, accounts: ImmutableList<string>) => ({
+const blockDomainSuccess = (domain: string, accounts: string[]) => ({
   type: DOMAIN_BLOCK_SUCCESS,
   domain,
   accounts,
@@ -67,9 +69,9 @@ const unblockDomain = (domain: string) =>
     };
 
     api(getState).delete('/api/v1/domain_blocks', params).then(() => {
-      const at_domain = '@' + domain;
-      const accounts = getState().accounts.filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
-      dispatch(unblockDomainSuccess(domain, accounts.toList()));
+      const accounts = selectAccountsByDomain(getState(), domain);
+      if (!accounts) return;
+      dispatch(unblockDomainSuccess(domain, accounts));
     }).catch(err => {
       dispatch(unblockDomainFail(domain, err));
     });
@@ -80,7 +82,7 @@ const unblockDomainRequest = (domain: string) => ({
   domain,
 });
 
-const unblockDomainSuccess = (domain: string, accounts: ImmutableList<string>) => ({
+const unblockDomainSuccess = (domain: string, accounts: string[]) => ({
   type: DOMAIN_UNBLOCK_SUCCESS,
   domain,
   accounts,
@@ -141,6 +143,15 @@ const expandDomainBlocks = () =>
     });
   };
 
+function selectAccountsByDomain(state: RootState, domain: string): string[] {
+  const store = state.entities[Entities.ACCOUNTS]?.store as EntityStore<Account> | undefined;
+  const entries = store ? Object.entries(store) : undefined;
+  const accounts = entries
+    ?.filter(([_, item]) => item && item.acct.endsWith(`@${domain}`))
+    .map(([_, item]) => item!.id);
+  return accounts || [];
+}
+
 const expandDomainBlocksRequest = () => ({
   type: DOMAIN_BLOCKS_EXPAND_REQUEST,
 });

app/soapbox/actions/emoji-reacts.ts

@@ -25,7 +25,7 @@ const EMOJI_REACTS_FETCH_FAIL    = 'EMOJI_REACTS_FETCH_FAIL';
 
 const noOp = () => () => new Promise(f => f(undefined));
 
-const simpleEmojiReact = (status: Status, emoji: string) =>
+const simpleEmojiReact = (status: Status, emoji: string, custom?: string) =>
   (dispatch: AppDispatch) => {
     const emojiReacts: ImmutableList<ImmutableMap<string, any>> = status.pleroma.get('emoji_reactions') || ImmutableList();
 
@@ -43,7 +43,7 @@ const simpleEmojiReact = (status: Status, emoji: string) =>
       if (emoji === '👍') {
         dispatch(favourite(status));
       } else {
-        dispatch(emojiReact(status, emoji));
+        dispatch(emojiReact(status, emoji, custom));
       }
     }).catch(err => {
       console.error(err);
@@ -70,14 +70,14 @@ const fetchEmojiReacts = (id: string, emoji: string) =>
     });
   };
 
-const emojiReact = (status: Status, emoji: string) =>
+const emojiReact = (status: Status, emoji: string, custom?: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return dispatch(noOp());
 
-    dispatch(emojiReactRequest(status, emoji));
+    dispatch(emojiReactRequest(status, emoji, custom));
 
     return api(getState)
-      .put(`/api/v1/pleroma/statuses/${status.get('id')}/reactions/${emoji}`)
+      .put(`/api/v1/pleroma/statuses/${status.id}/reactions/${emoji}`)
       .then(function(response) {
         dispatch(importFetchedStatus(response.data));
         dispatch(emojiReactSuccess(status, emoji));
@@ -93,7 +93,7 @@ const unEmojiReact = (status: Status, emoji: string) =>
     dispatch(unEmojiReactRequest(status, emoji));
 
     return api(getState)
-      .delete(`/api/v1/pleroma/statuses/${status.get('id')}/reactions/${emoji}`)
+      .delete(`/api/v1/pleroma/statuses/${status.id}/reactions/${emoji}`)
       .then(response => {
         dispatch(importFetchedStatus(response.data));
         dispatch(unEmojiReactSuccess(status, emoji));
@@ -120,10 +120,11 @@ const fetchEmojiReactsFail = (id: string, error: AxiosError) => ({
   error,
 });
 
-const emojiReactRequest = (status: Status, emoji: string) => ({
+const emojiReactRequest = (status: Status, emoji: string, custom?: string) => ({
   type: EMOJI_REACT_REQUEST,
   status,
   emoji,
+  custom,
   skipLoading: true,
 });
 

app/soapbox/actions/emojis.ts

@@ -1,6 +1,6 @@
 import { saveSettings } from './settings';
 
-import type { Emoji } from 'soapbox/components/autosuggest-emoji';
+import type { Emoji } from 'soapbox/features/emoji';
 import type { AppDispatch } from 'soapbox/store';
 
 const EMOJI_USE = 'EMOJI_USE';

app/soapbox/actions/events.ts

@@ -569,7 +569,7 @@ const rejectEventParticipationRequestFail = (id: string, accountId: string, erro
 });
 
 const fetchEventIcs = (id: string) =>
-  (dispatch: any, getState: () => RootState) =>
+  (dispatch: AppDispatch, getState: () => RootState) =>
     api(getState).get(`/api/v1/pleroma/events/${id}/ics`);
 
 const cancelEventCompose = () => ({

app/soapbox/actions/export-data.ts

@@ -34,8 +34,8 @@ type ExportDataActions = {
   | typeof EXPORT_BLOCKS_FAIL
   | typeof EXPORT_MUTES_REQUEST
   | typeof EXPORT_MUTES_SUCCESS
-  | typeof EXPORT_MUTES_FAIL,
-  error?: any,
+  | typeof EXPORT_MUTES_FAIL
+  error?: any
 }
 
 function fileExport(content: string, fileName: string) {

app/soapbox/actions/familiar-followers.ts

@@ -1,8 +1,9 @@
-import { RootState } from 'soapbox/store';
+import { AppDispatch, RootState } from 'soapbox/store';
 
 import api from '../api';
 
-import { ACCOUNTS_IMPORT, importFetchedAccounts } from './importer';
+import { fetchRelationships } from './accounts';
+import { importFetchedAccounts } from './importer';
 
 import type { APIEntity } from 'soapbox/types/entities';
 
@@ -10,31 +11,7 @@ export const FAMILIAR_FOLLOWERS_FETCH_REQUEST = 'FAMILIAR_FOLLOWERS_FETCH_REQUES
 export const FAMILIAR_FOLLOWERS_FETCH_SUCCESS = 'FAMILIAR_FOLLOWERS_FETCH_SUCCESS';
 export const FAMILIAR_FOLLOWERS_FETCH_FAIL    = 'FAMILIAR_FOLLOWERS_FETCH_FAIL';
 
-type FamiliarFollowersFetchRequestAction = {
-  type: typeof FAMILIAR_FOLLOWERS_FETCH_REQUEST,
-  id: string,
-}
-
-type FamiliarFollowersFetchRequestSuccessAction = {
-  type: typeof FAMILIAR_FOLLOWERS_FETCH_SUCCESS,
-  id: string,
-  accounts: Array<APIEntity>,
-}
-
-type FamiliarFollowersFetchRequestFailAction = {
-  type: typeof FAMILIAR_FOLLOWERS_FETCH_FAIL,
-  id: string,
-  error: any,
-}
-
-type AccountsImportAction = {
-  type: typeof ACCOUNTS_IMPORT,
-  accounts: Array<APIEntity>,
-}
-
-export type FamiliarFollowersActions = FamiliarFollowersFetchRequestAction | FamiliarFollowersFetchRequestSuccessAction | FamiliarFollowersFetchRequestFailAction | AccountsImportAction
-
-export const fetchAccountFamiliarFollowers = (accountId: string) => (dispatch: React.Dispatch<FamiliarFollowersActions>, getState: () => RootState) => {
+export const fetchAccountFamiliarFollowers = (accountId: string) => (dispatch: AppDispatch, getState: () => RootState) => {
   dispatch({
     type: FAMILIAR_FOLLOWERS_FETCH_REQUEST,
     id: accountId,
@@ -44,7 +21,8 @@ export const fetchAccountFamiliarFollowers = (accountId: string) => (dispatch: R
     .then(({ data }) => {
       const accounts = data.find(({ id }: { id: string }) => id === accountId).accounts;
 
-      dispatch(importFetchedAccounts(accounts) as AccountsImportAction);
+      dispatch(importFetchedAccounts(accounts));
+      dispatch(fetchRelationships(accounts.map((item: APIEntity) => item.id)));
       dispatch({
         type: FAMILIAR_FOLLOWERS_FETCH_SUCCESS,
         id: accountId,
@@ -55,5 +33,6 @@ export const fetchAccountFamiliarFollowers = (accountId: string) => (dispatch: R
       type: FAMILIAR_FOLLOWERS_FETCH_FAIL,
       id: accountId,
       error,
+      skipAlert: true,
     }));
 };

app/soapbox/actions/filters.ts

@@ -12,10 +12,18 @@ const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
 const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';
 const FILTERS_FETCH_FAIL    = 'FILTERS_FETCH_FAIL';
 
+const FILTER_FETCH_REQUEST = 'FILTER_FETCH_REQUEST';
+const FILTER_FETCH_SUCCESS = 'FILTER_FETCH_SUCCESS';
+const FILTER_FETCH_FAIL    = 'FILTER_FETCH_FAIL';
+
 const FILTERS_CREATE_REQUEST = 'FILTERS_CREATE_REQUEST';
 const FILTERS_CREATE_SUCCESS = 'FILTERS_CREATE_SUCCESS';
 const FILTERS_CREATE_FAIL    = 'FILTERS_CREATE_FAIL';
 
+const FILTERS_UPDATE_REQUEST = 'FILTERS_UPDATE_REQUEST';
+const FILTERS_UPDATE_SUCCESS = 'FILTERS_UPDATE_SUCCESS';
+const FILTERS_UPDATE_FAIL    = 'FILTERS_UPDATE_FAIL';
+
 const FILTERS_DELETE_REQUEST = 'FILTERS_DELETE_REQUEST';
 const FILTERS_DELETE_SUCCESS = 'FILTERS_DELETE_SUCCESS';
 const FILTERS_DELETE_FAIL    = 'FILTERS_DELETE_FAIL';
@@ -25,22 +33,16 @@ const messages = defineMessages({
   removed: { id: 'filters.removed', defaultMessage: 'Filter deleted.' },
 });
 
-const fetchFilters = () =>
+type FilterKeywords = { keyword: string, whole_word: boolean }[];
+
+const fetchFiltersV1 = () =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    if (!isLoggedIn(getState)) return;
-
-    const state = getState();
-    const instance = state.instance;
-    const features = getFeatures(instance);
-
-    if (!features.filters) return;
-
     dispatch({
       type: FILTERS_FETCH_REQUEST,
       skipLoading: true,
     });
 
-    api(getState)
+    return api(getState)
       .get('/api/v1/filters')
       .then(({ data }) => dispatch({
         type: FILTERS_FETCH_SUCCESS,
@@ -55,15 +57,105 @@ const fetchFilters = () =>
       }));
   };
 
-const createFilter = (phrase: string, expires_at: string, context: Array<string>, whole_word: boolean, irreversible: boolean) =>
+const fetchFiltersV2 = () =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    dispatch({
+      type: FILTERS_FETCH_REQUEST,
+      skipLoading: true,
+    });
+
+    return api(getState)
+      .get('/api/v2/filters')
+      .then(({ data }) => dispatch({
+        type: FILTERS_FETCH_SUCCESS,
+        filters: data,
+        skipLoading: true,
+      }))
+      .catch(err => dispatch({
+        type: FILTERS_FETCH_FAIL,
+        err,
+        skipLoading: true,
+        skipAlert: true,
+      }));
+  };
+
+const fetchFilters = (fromFiltersPage = false) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    if (!isLoggedIn(getState)) return;
+
+    const state = getState();
+    const instance = state.instance;
+    const features = getFeatures(instance);
+
+    if (features.filtersV2 && fromFiltersPage) return dispatch(fetchFiltersV2());
+
+    if (features.filters) return dispatch(fetchFiltersV1());
+  };
+
+const fetchFilterV1 = (id: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    dispatch({
+      type: FILTER_FETCH_REQUEST,
+      skipLoading: true,
+    });
+
+    return api(getState)
+      .get(`/api/v1/filters/${id}`)
+      .then(({ data }) => dispatch({
+        type: FILTER_FETCH_SUCCESS,
+        filter: data,
+        skipLoading: true,
+      }))
+      .catch(err => dispatch({
+        type: FILTER_FETCH_FAIL,
+        err,
+        skipLoading: true,
+        skipAlert: true,
+      }));
+  };
+
+const fetchFilterV2 = (id: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    dispatch({
+      type: FILTER_FETCH_REQUEST,
+      skipLoading: true,
+    });
+
+    return api(getState)
+      .get(`/api/v2/filters/${id}`)
+      .then(({ data }) => dispatch({
+        type: FILTER_FETCH_SUCCESS,
+        filter: data,
+        skipLoading: true,
+      }))
+      .catch(err => dispatch({
+        type: FILTER_FETCH_FAIL,
+        err,
+        skipLoading: true,
+        skipAlert: true,
+      }));
+  };
+
+const fetchFilter = (id: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    const state = getState();
+    const instance = state.instance;
+    const features = getFeatures(instance);
+
+    if (features.filtersV2) return dispatch(fetchFilterV2(id));
+
+    if (features.filters) return dispatch(fetchFilterV1(id));
+  };
+
+const createFilterV1 = (title: string, expires_in: string | null, context: Array<string>, hide: boolean, keywords: FilterKeywords) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: FILTERS_CREATE_REQUEST });
     return api(getState).post('/api/v1/filters', {
-      phrase,
+      phrase: keywords[0].keyword,
       context,
-      irreversible,
-      whole_word,
-      expires_at,
+      irreversible: hide,
+      whole_word: keywords[0].whole_word,
+      expires_in,
     }).then(response => {
       dispatch({ type: FILTERS_CREATE_SUCCESS, filter: response.data });
       toast.success(messages.added);
@@ -72,7 +164,80 @@ const createFilter = (phrase: string, expires_at: string, context: Array<string>
     });
   };
 
-const deleteFilter = (id: string) =>
+const createFilterV2 = (title: string, expires_in: string | null, context: Array<string>, hide: boolean, keywords_attributes: FilterKeywords) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    dispatch({ type: FILTERS_CREATE_REQUEST });
+    return api(getState).post('/api/v2/filters', {
+      title,
+      context,
+      filter_action: hide ? 'hide' : 'warn',
+      expires_in,
+      keywords_attributes,
+    }).then(response => {
+      dispatch({ type: FILTERS_CREATE_SUCCESS, filter: response.data });
+      toast.success(messages.added);
+    }).catch(error => {
+      dispatch({ type: FILTERS_CREATE_FAIL, error });
+    });
+  };
+
+const createFilter = (title: string, expires_in: string | null, context: Array<string>, hide: boolean, keywords: FilterKeywords) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    const state = getState();
+    const instance = state.instance;
+    const features = getFeatures(instance);
+
+    if (features.filtersV2) return dispatch(createFilterV2(title, expires_in, context, hide, keywords));
+
+    return dispatch(createFilterV1(title, expires_in, context, hide, keywords));
+  };
+
+const updateFilterV1 = (id: string, title: string, expires_in: string | null, context: Array<string>, hide: boolean, keywords: FilterKeywords) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    dispatch({ type: FILTERS_UPDATE_REQUEST });
+    return api(getState).patch(`/api/v1/filters/${id}`, {
+      phrase: keywords[0].keyword,
+      context,
+      irreversible: hide,
+      whole_word: keywords[0].whole_word,
+      expires_in,
+    }).then(response => {
+      dispatch({ type: FILTERS_UPDATE_SUCCESS, filter: response.data });
+      toast.success(messages.added);
+    }).catch(error => {
+      dispatch({ type: FILTERS_UPDATE_FAIL, error });
+    });
+  };
+
+const updateFilterV2 = (id: string, title: string, expires_in: string | null, context: Array<string>, hide: boolean, keywords_attributes: FilterKeywords) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    dispatch({ type: FILTERS_UPDATE_REQUEST });
+    return api(getState).patch(`/api/v2/filters/${id}`, {
+      title,
+      context,
+      filter_action: hide ? 'hide' : 'warn',
+      expires_in,
+      keywords_attributes,
+    }).then(response => {
+      dispatch({ type: FILTERS_UPDATE_SUCCESS, filter: response.data });
+      toast.success(messages.added);
+    }).catch(error => {
+      dispatch({ type: FILTERS_UPDATE_FAIL, error });
+    });
+  };
+
+const updateFilter = (id: string, title: string, expires_in: string | null, context: Array<string>, hide: boolean, keywords: FilterKeywords) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    const state = getState();
+    const instance = state.instance;
+    const features = getFeatures(instance);
+
+    if (features.filtersV2) return dispatch(updateFilterV2(id, title, expires_in, context, hide, keywords));
+
+    return dispatch(updateFilterV1(id, title, expires_in, context, hide, keywords));
+  };
+
+const deleteFilterV1 = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: FILTERS_DELETE_REQUEST });
     return api(getState).delete(`/api/v1/filters/${id}`).then(response => {
@@ -83,17 +248,47 @@ const deleteFilter = (id: string) =>
     });
   };
 
+const deleteFilterV2 = (id: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    dispatch({ type: FILTERS_DELETE_REQUEST });
+    return api(getState).delete(`/api/v2/filters/${id}`).then(response => {
+      dispatch({ type: FILTERS_DELETE_SUCCESS, filter: response.data });
+      toast.success(messages.removed);
+    }).catch(error => {
+      dispatch({ type: FILTERS_DELETE_FAIL, error });
+    });
+  };
+
+const deleteFilter = (id: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    const state = getState();
+    const instance = state.instance;
+    const features = getFeatures(instance);
+
+    if (features.filtersV2) return dispatch(deleteFilterV2(id));
+
+    return dispatch(deleteFilterV1(id));
+  };
+
 export {
   FILTERS_FETCH_REQUEST,
   FILTERS_FETCH_SUCCESS,
   FILTERS_FETCH_FAIL,
+  FILTER_FETCH_REQUEST,
+  FILTER_FETCH_SUCCESS,
+  FILTER_FETCH_FAIL,
   FILTERS_CREATE_REQUEST,
   FILTERS_CREATE_SUCCESS,
   FILTERS_CREATE_FAIL,
+  FILTERS_UPDATE_REQUEST,
+  FILTERS_UPDATE_SUCCESS,
+  FILTERS_UPDATE_FAIL,
   FILTERS_DELETE_REQUEST,
   FILTERS_DELETE_SUCCESS,
   FILTERS_DELETE_FAIL,
   fetchFilters,
+  fetchFilter,
   createFilter,
+  updateFilter,
   deleteFilter,
-};
+};

app/soapbox/actions/groups.ts

@@ -1,20 +1,14 @@
-import { defineMessages } from 'react-intl';
-
-import toast from 'soapbox/toast';
+import { deleteEntities } from 'soapbox/entity-store/actions';
 
 import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
 import { importFetchedGroups, importFetchedAccounts } from './importer';
-import { closeModal, openModal } from './modals';
-import { deleteFromTimelines } from './timelines';
 
 import type { AxiosError } from 'axios';
 import type { GroupRole } from 'soapbox/reducers/group-memberships';
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { APIEntity, Group } from 'soapbox/types/entities';
-
-const GROUP_EDITOR_SET = 'GROUP_EDITOR_SET';
+import type { APIEntity } from 'soapbox/types/entities';
 
 const GROUP_CREATE_REQUEST = 'GROUP_CREATE_REQUEST';
 const GROUP_CREATE_SUCCESS = 'GROUP_CREATE_SUCCESS';
@@ -40,18 +34,6 @@ const GROUP_RELATIONSHIPS_FETCH_REQUEST = 'GROUP_RELATIONSHIPS_FETCH_REQUEST';
 const GROUP_RELATIONSHIPS_FETCH_SUCCESS = 'GROUP_RELATIONSHIPS_FETCH_SUCCESS';
 const GROUP_RELATIONSHIPS_FETCH_FAIL    = 'GROUP_RELATIONSHIPS_FETCH_FAIL';
 
-const GROUP_JOIN_REQUEST = 'GROUP_JOIN_REQUEST';
-const GROUP_JOIN_SUCCESS = 'GROUP_JOIN_SUCCESS';
-const GROUP_JOIN_FAIL    = 'GROUP_JOIN_FAIL';
-
-const GROUP_LEAVE_REQUEST = 'GROUP_LEAVE_REQUEST';
-const GROUP_LEAVE_SUCCESS = 'GROUP_LEAVE_SUCCESS';
-const GROUP_LEAVE_FAIL    = 'GROUP_LEAVE_FAIL';
-
-const GROUP_DELETE_STATUS_REQUEST = 'GROUP_DELETE_STATUS_REQUEST';
-const GROUP_DELETE_STATUS_SUCCESS = 'GROUP_DELETE_STATUS_SUCCESS';
-const GROUP_DELETE_STATUS_FAIL    = 'GROUP_DELETE_STATUS_FAIL';
-
 const GROUP_KICK_REQUEST = 'GROUP_KICK_REQUEST';
 const GROUP_KICK_SUCCESS = 'GROUP_KICK_SUCCESS';
 const GROUP_KICK_FAIL    = 'GROUP_KICK_FAIL';
@@ -104,101 +86,8 @@ const GROUP_MEMBERSHIP_REQUEST_REJECT_REQUEST = 'GROUP_MEMBERSHIP_REQUEST_REJECT
 const GROUP_MEMBERSHIP_REQUEST_REJECT_SUCCESS = 'GROUP_MEMBERSHIP_REQUEST_REJECT_SUCCESS';
 const GROUP_MEMBERSHIP_REQUEST_REJECT_FAIL    = 'GROUP_MEMBERSHIP_REQUEST_REJECT_FAIL';
 
-const GROUP_EDITOR_TITLE_CHANGE       = 'GROUP_EDITOR_TITLE_CHANGE';
-const GROUP_EDITOR_DESCRIPTION_CHANGE = 'GROUP_EDITOR_DESCRIPTION_CHANGE';
-const GROUP_EDITOR_PRIVACY_CHANGE     = 'GROUP_EDITOR_PRIVACY_CHANGE';
-const GROUP_EDITOR_MEDIA_CHANGE       = 'GROUP_EDITOR_MEDIA_CHANGE';
-
-const GROUP_EDITOR_RESET = 'GROUP_EDITOR_RESET';
-
-const messages = defineMessages({
-  success: { id: 'manage_group.submit_success', defaultMessage: 'The group was created' },
-  editSuccess: { id: 'manage_group.edit_success', defaultMessage: 'The group was edited' },
-  joinSuccess: { id: 'group.join.success', defaultMessage: 'Joined the group' },
-  joinRequestSuccess: { id: 'group.join.request_success', defaultMessage: 'Requested to join the group' },
-  leaveSuccess: { id: 'group.leave.success', defaultMessage: 'Left the group' },
-  view: { id: 'toast.view', defaultMessage: 'View' },
-});
-
-const editGroup = (group: Group) => (dispatch: AppDispatch) => {
-  dispatch({
-    type: GROUP_EDITOR_SET,
-    group,
-  });
-  dispatch(openModal('MANAGE_GROUP'));
-};
-
-const createGroup = (params: Record<string, any>, shouldReset?: boolean) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    dispatch(createGroupRequest());
-
-    return api(getState).post('/api/v1/groups', params, {
-      headers: {
-        'Content-Type': 'multipart/form-data',
-      },
-    })
-      .then(({ data }) => {
-        dispatch(importFetchedGroups([data]));
-        dispatch(createGroupSuccess(data));
-        toast.success(messages.success, {
-          actionLabel: messages.view,
-          actionLink: `/groups/${data.id}`,
-        });
-
-        if (shouldReset) {
-          dispatch(resetGroupEditor());
-        }
-        dispatch(closeModal('MANAGE_GROUP'));
-      }).catch(err => dispatch(createGroupFail(err)));
-  };
-
-const createGroupRequest = () => ({
-  type: GROUP_CREATE_REQUEST,
-});
-
-const createGroupSuccess = (group: APIEntity) => ({
-  type: GROUP_CREATE_SUCCESS,
-  group,
-});
-
-const createGroupFail = (error: AxiosError) => ({
-  type: GROUP_CREATE_FAIL,
-  error,
-});
-
-const updateGroup = (id: string, params: Record<string, any>, shouldReset?: boolean) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    dispatch(updateGroupRequest());
-
-    return api(getState).put(`/api/v1/groups/${id}`, params)
-      .then(({ data }) => {
-        dispatch(importFetchedGroups([data]));
-        dispatch(updateGroupSuccess(data));
-        toast.success(messages.editSuccess);
-
-        if (shouldReset) {
-          dispatch(resetGroupEditor());
-        }
-        dispatch(closeModal('MANAGE_GROUP'));
-      }).catch(err => dispatch(updateGroupFail(err)));
-  };
-
-const updateGroupRequest = () => ({
-  type: GROUP_UPDATE_REQUEST,
-});
-
-const updateGroupSuccess = (group: APIEntity) => ({
-  type: GROUP_UPDATE_SUCCESS,
-  group,
-});
-
-const updateGroupFail = (error: AxiosError) => ({
-  type: GROUP_UPDATE_FAIL,
-  error,
-});
-
 const deleteGroup = (id: string) => (dispatch: AppDispatch, getState: () => RootState) => {
-  dispatch(deleteGroupRequest(id));
+  dispatch(deleteEntities([id], 'Group'));
 
   return api(getState).delete(`/api/v1/groups/${id}`)
     .then(() => dispatch(deleteGroupSuccess(id)))
@@ -312,100 +201,6 @@ const fetchGroupRelationshipsFail = (error: AxiosError) => ({
   skipNotFound: true,
 });
 
-const joinGroup = (id: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    const locked = (getState().groups.items.get(id) as any).locked || false;
-
-    dispatch(joinGroupRequest(id, locked));
-
-    return api(getState).post(`/api/v1/groups/${id}/join`).then(response => {
-      dispatch(joinGroupSuccess(response.data));
-      toast.success(locked ? messages.joinRequestSuccess : messages.joinSuccess);
-    }).catch(error => {
-      dispatch(joinGroupFail(error, locked));
-    });
-  };
-
-const leaveGroup = (id: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    dispatch(leaveGroupRequest(id));
-
-    return api(getState).post(`/api/v1/groups/${id}/leave`).then(response => {
-      dispatch(leaveGroupSuccess(response.data));
-      toast.success(messages.leaveSuccess);
-    }).catch(error => {
-      dispatch(leaveGroupFail(error));
-    });
-  };
-
-const joinGroupRequest = (id: string, locked: boolean) => ({
-  type: GROUP_JOIN_REQUEST,
-  id,
-  locked,
-  skipLoading: true,
-});
-
-const joinGroupSuccess = (relationship: APIEntity) => ({
-  type: GROUP_JOIN_SUCCESS,
-  relationship,
-  skipLoading: true,
-});
-
-const joinGroupFail = (error: AxiosError, locked: boolean) => ({
-  type: GROUP_JOIN_FAIL,
-  error,
-  locked,
-  skipLoading: true,
-});
-
-const leaveGroupRequest = (id: string) => ({
-  type: GROUP_LEAVE_REQUEST,
-  id,
-  skipLoading: true,
-});
-
-const leaveGroupSuccess = (relationship: APIEntity) => ({
-  type: GROUP_LEAVE_SUCCESS,
-  relationship,
-  skipLoading: true,
-});
-
-const leaveGroupFail = (error: AxiosError) => ({
-  type: GROUP_LEAVE_FAIL,
-  error,
-  skipLoading: true,
-});
-
-const groupDeleteStatus = (groupId: string, statusId: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    dispatch(groupDeleteStatusRequest(groupId, statusId));
-
-    return api(getState).delete(`/api/v1/groups/${groupId}/statuses/${statusId}`)
-      .then(() => {
-        dispatch(deleteFromTimelines(statusId));
-        dispatch(groupDeleteStatusSuccess(groupId, statusId));
-      }).catch(err => dispatch(groupDeleteStatusFail(groupId, statusId, err)));
-  };
-
-const groupDeleteStatusRequest = (groupId: string, statusId: string) => ({
-  type: GROUP_DELETE_STATUS_REQUEST,
-  groupId,
-  statusId,
-});
-
-const groupDeleteStatusSuccess = (groupId: string, statusId: string) => ({
-  type: GROUP_DELETE_STATUS_SUCCESS,
-  groupId,
-  statusId,
-});
-
-const groupDeleteStatusFail = (groupId: string, statusId: string, error: AxiosError) => ({
-  type: GROUP_DELETE_STATUS_SUCCESS,
-  groupId,
-  statusId,
-  error,
-});
-
 const groupKick = (groupId: string, accountId: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch(groupKickRequest(groupId, accountId));
@@ -828,55 +623,7 @@ const rejectGroupMembershipRequestFail = (groupId: string, accountId: string, er
   error,
 });
 
-const changeGroupEditorTitle = (value: string) => ({
-  type: GROUP_EDITOR_TITLE_CHANGE,
-  value,
-});
-
-const changeGroupEditorDescription = (value: string) => ({
-  type: GROUP_EDITOR_DESCRIPTION_CHANGE,
-  value,
-});
-
-const changeGroupEditorPrivacy = (value: boolean) => ({
-  type: GROUP_EDITOR_PRIVACY_CHANGE,
-  value,
-});
-
-const changeGroupEditorMedia = (mediaType: 'header' | 'avatar', file: File) => ({
-  type: GROUP_EDITOR_MEDIA_CHANGE,
-  mediaType,
-  value: file,
-});
-
-const resetGroupEditor = () => ({
-  type: GROUP_EDITOR_RESET,
-});
-
-const submitGroupEditor = (shouldReset?: boolean) => (dispatch: AppDispatch, getState: () => RootState) => {
-  const groupId     = getState().group_editor.groupId;
-  const displayName = getState().group_editor.displayName;
-  const note        = getState().group_editor.note;
-  const avatar      = getState().group_editor.avatar;
-  const header      = getState().group_editor.header;
-
-  const params: Record<string, any> = {
-    display_name: displayName,
-    note,
-  };
-
-  if (avatar) params.avatar = avatar;
-  if (header) params.header = header;
-
-  if (groupId === null) {
-    dispatch(createGroup(params, shouldReset));
-  } else {
-    dispatch(updateGroup(groupId, params, shouldReset));
-  }
-};
-
 export {
-  GROUP_EDITOR_SET,
   GROUP_CREATE_REQUEST,
   GROUP_CREATE_SUCCESS,
   GROUP_CREATE_FAIL,
@@ -895,15 +642,6 @@ export {
   GROUP_RELATIONSHIPS_FETCH_REQUEST,
   GROUP_RELATIONSHIPS_FETCH_SUCCESS,
   GROUP_RELATIONSHIPS_FETCH_FAIL,
-  GROUP_JOIN_REQUEST,
-  GROUP_JOIN_SUCCESS,
-  GROUP_JOIN_FAIL,
-  GROUP_LEAVE_REQUEST,
-  GROUP_LEAVE_SUCCESS,
-  GROUP_LEAVE_FAIL,
-  GROUP_DELETE_STATUS_REQUEST,
-  GROUP_DELETE_STATUS_SUCCESS,
-  GROUP_DELETE_STATUS_FAIL,
   GROUP_KICK_REQUEST,
   GROUP_KICK_SUCCESS,
   GROUP_KICK_FAIL,
@@ -943,20 +681,6 @@ export {
   GROUP_MEMBERSHIP_REQUEST_REJECT_REQUEST,
   GROUP_MEMBERSHIP_REQUEST_REJECT_SUCCESS,
   GROUP_MEMBERSHIP_REQUEST_REJECT_FAIL,
-  GROUP_EDITOR_TITLE_CHANGE,
-  GROUP_EDITOR_DESCRIPTION_CHANGE,
-  GROUP_EDITOR_PRIVACY_CHANGE,
-  GROUP_EDITOR_MEDIA_CHANGE,
-  GROUP_EDITOR_RESET,
-  editGroup,
-  createGroup,
-  createGroupRequest,
-  createGroupSuccess,
-  createGroupFail,
-  updateGroup,
-  updateGroupRequest,
-  updateGroupSuccess,
-  updateGroupFail,
   deleteGroup,
   deleteGroupRequest,
   deleteGroupSuccess,
@@ -973,18 +697,6 @@ export {
   fetchGroupRelationshipsRequest,
   fetchGroupRelationshipsSuccess,
   fetchGroupRelationshipsFail,
-  joinGroup,
-  leaveGroup,
-  joinGroupRequest,
-  joinGroupSuccess,
-  joinGroupFail,
-  leaveGroupRequest,
-  leaveGroupSuccess,
-  leaveGroupFail,
-  groupDeleteStatus,
-  groupDeleteStatusRequest,
-  groupDeleteStatusSuccess,
-  groupDeleteStatusFail,
   groupKick,
   groupKickRequest,
   groupKickSuccess,
@@ -1037,10 +749,4 @@ export {
   rejectGroupMembershipRequestRequest,
   rejectGroupMembershipRequestSuccess,
   rejectGroupMembershipRequestFail,
-  changeGroupEditorTitle,
-  changeGroupEditorDescription,
-  changeGroupEditorPrivacy,
-  changeGroupEditorMedia,
-  resetGroupEditor,
-  submitGroupEditor,
 };

app/soapbox/actions/import-data.ts

@@ -27,8 +27,8 @@ type ImportDataActions = {
   | typeof IMPORT_BLOCKS_FAIL
   | typeof IMPORT_MUTES_REQUEST
   | typeof IMPORT_MUTES_SUCCESS
-  | typeof IMPORT_MUTES_FAIL,
-  error?: any,
+  | typeof IMPORT_MUTES_FAIL
+  error?: any
   config?: string
 }
 

app/soapbox/actions/importer/index.ts

@@ -1,3 +1,8 @@
+import { importEntities } from 'soapbox/entity-store/actions';
+import { Entities } from 'soapbox/entity-store/entities';
+import { Group, accountSchema, groupSchema } from 'soapbox/schemas';
+import { filteredArray } from 'soapbox/schemas/utils';
+
 import { getSettings } from '../settings';
 
 import type { AppDispatch, RootState } from 'soapbox/store';
@@ -12,17 +17,33 @@ const STATUSES_IMPORT = 'STATUSES_IMPORT';
 const POLLS_IMPORT    = 'POLLS_IMPORT';
 const ACCOUNT_FETCH_FAIL_FOR_USERNAME_LOOKUP = 'ACCOUNT_FETCH_FAIL_FOR_USERNAME_LOOKUP';
 
-const importAccount = (account: APIEntity) =>
-  ({ type: ACCOUNT_IMPORT, account });
+const importAccount = (data: APIEntity) =>
+  (dispatch: AppDispatch, _getState: () => RootState) => {
+    dispatch({ type: ACCOUNT_IMPORT, account: data });
+    try {
+      const account = accountSchema.parse(data);
+      dispatch(importEntities([account], Entities.ACCOUNTS));
+    } catch (e) {
+      //
+    }
+  };
 
-const importAccounts = (accounts: APIEntity[]) =>
-  ({ type: ACCOUNTS_IMPORT, accounts });
+const importAccounts = (data: APIEntity[]) =>
+  (dispatch: AppDispatch, _getState: () => RootState) => {
+    dispatch({ type: ACCOUNTS_IMPORT, accounts: data });
+    try {
+      const accounts = filteredArray(accountSchema).parse(data);
+      dispatch(importEntities(accounts, Entities.ACCOUNTS));
+    } catch (e) {
+      //
+    }
+  };
 
-const importGroup = (group: APIEntity) =>
-  ({ type: GROUP_IMPORT, group });
+const importGroup = (group: Group) =>
+  importEntities([group], Entities.GROUPS);
 
-const importGroups = (groups: APIEntity[]) =>
-  ({ type: GROUPS_IMPORT, groups });
+const importGroups = (groups: Group[]) =>
+  importEntities(groups, Entities.GROUPS);
 
 const importStatus = (status: APIEntity, idempotencyKey?: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
@@ -69,17 +90,8 @@ const importFetchedGroup = (group: APIEntity) =>
   importFetchedGroups([group]);
 
 const importFetchedGroups = (groups: APIEntity[]) => {
-  const normalGroups: APIEntity[] = [];
-
-  const processGroup = (group: APIEntity) => {
-    if (!group.id) return;
-
-    normalGroups.push(group);
-  };
-
-  groups.forEach(processGroup);
-
-  return importGroups(normalGroups);
+  const entities = filteredArray(groupSchema).parse(groups);
+  return importGroups(entities);
 };
 
 const importFetchedStatus = (status: APIEntity, idempotencyKey?: string) =>

app/soapbox/actions/instance.ts

@@ -3,16 +3,11 @@ import get from 'lodash/get';
 
 import KVStore from 'soapbox/storage/kv-store';
 import { RootState } from 'soapbox/store';
-import { getAuthUserUrl } from 'soapbox/utils/auth';
+import { getAuthUserUrl, getMeUrl } from 'soapbox/utils/auth';
 import { parseVersion } from 'soapbox/utils/features';
 
 import api from '../api';
 
-const getMeUrl = (state: RootState) => {
-  const me = state.me;
-  return state.accounts.get(me)?.url;
-};
-
 /** Figure out the appropriate instance to fetch depending on the state */
 export const getHost = (state: RootState) => {
   const accountUrl = getMeUrl(state) || getAuthUserUrl(state) as string;

app/soapbox/actions/interactions.ts

@@ -3,14 +3,15 @@ import { defineMessages } from 'react-intl';
 import toast from 'soapbox/toast';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
-import api from '../api';
+import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
+import { expandGroupFeaturedTimeline } from './timelines';
 
 import type { AxiosError } from 'axios';
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { APIEntity, Status as StatusEntity } from 'soapbox/types/entities';
+import type { APIEntity, Group, Status as StatusEntity } from 'soapbox/types/entities';
 
 const REBLOG_REQUEST = 'REBLOG_REQUEST';
 const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
@@ -20,6 +21,10 @@ const FAVOURITE_REQUEST = 'FAVOURITE_REQUEST';
 const FAVOURITE_SUCCESS = 'FAVOURITE_SUCCESS';
 const FAVOURITE_FAIL    = 'FAVOURITE_FAIL';
 
+const DISLIKE_REQUEST = 'DISLIKE_REQUEST';
+const DISLIKE_SUCCESS = 'DISLIKE_SUCCESS';
+const DISLIKE_FAIL    = 'DISLIKE_FAIL';
+
 const UNREBLOG_REQUEST = 'UNREBLOG_REQUEST';
 const UNREBLOG_SUCCESS = 'UNREBLOG_SUCCESS';
 const UNREBLOG_FAIL    = 'UNREBLOG_FAIL';
@@ -28,6 +33,10 @@ const UNFAVOURITE_REQUEST = 'UNFAVOURITE_REQUEST';
 const UNFAVOURITE_SUCCESS = 'UNFAVOURITE_SUCCESS';
 const UNFAVOURITE_FAIL    = 'UNFAVOURITE_FAIL';
 
+const UNDISLIKE_REQUEST = 'UNDISLIKE_REQUEST';
+const UNDISLIKE_SUCCESS = 'UNDISLIKE_SUCCESS';
+const UNDISLIKE_FAIL    = 'UNDISLIKE_FAIL';
+
 const REBLOGS_FETCH_REQUEST = 'REBLOGS_FETCH_REQUEST';
 const REBLOGS_FETCH_SUCCESS = 'REBLOGS_FETCH_SUCCESS';
 const REBLOGS_FETCH_FAIL    = 'REBLOGS_FETCH_FAIL';
@@ -36,6 +45,10 @@ const FAVOURITES_FETCH_REQUEST = 'FAVOURITES_FETCH_REQUEST';
 const FAVOURITES_FETCH_SUCCESS = 'FAVOURITES_FETCH_SUCCESS';
 const FAVOURITES_FETCH_FAIL    = 'FAVOURITES_FETCH_FAIL';
 
+const DISLIKES_FETCH_REQUEST = 'DISLIKES_FETCH_REQUEST';
+const DISLIKES_FETCH_SUCCESS = 'DISLIKES_FETCH_SUCCESS';
+const DISLIKES_FETCH_FAIL    = 'DISLIKES_FETCH_FAIL';
+
 const REACTIONS_FETCH_REQUEST = 'REACTIONS_FETCH_REQUEST';
 const REACTIONS_FETCH_SUCCESS = 'REACTIONS_FETCH_SUCCESS';
 const REACTIONS_FETCH_FAIL    = 'REACTIONS_FETCH_FAIL';
@@ -60,6 +73,12 @@ const REMOTE_INTERACTION_REQUEST = 'REMOTE_INTERACTION_REQUEST';
 const REMOTE_INTERACTION_SUCCESS = 'REMOTE_INTERACTION_SUCCESS';
 const REMOTE_INTERACTION_FAIL    = 'REMOTE_INTERACTION_FAIL';
 
+const FAVOURITES_EXPAND_SUCCESS = 'FAVOURITES_EXPAND_SUCCESS';
+const FAVOURITES_EXPAND_FAIL = 'FAVOURITES_EXPAND_FAIL';
+
+const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS';
+const REBLOGS_EXPAND_FAIL = 'REBLOGS_EXPAND_FAIL';
+
 const messages = defineMessages({
   bookmarkAdded: { id: 'status.bookmarked', defaultMessage: 'Bookmark added.' },
   bookmarkRemoved: { id: 'status.unbookmarked', defaultMessage: 'Bookmark removed.' },
@@ -72,7 +91,7 @@ const reblog = (status: StatusEntity) =>
 
     dispatch(reblogRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/reblog`).then(function(response) {
+    api(getState).post(`/api/v1/statuses/${status.id}/reblog`).then(function(response) {
       // The reblog API method returns a new status wrapped around the original. In this case we are only
       // interested in how the original is modified, hence passing it skipping the wrapper
       dispatch(importFetchedStatus(response.data.reblog));
@@ -88,7 +107,7 @@ const unreblog = (status: StatusEntity) =>
 
     dispatch(unreblogRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(() => {
+    api(getState).post(`/api/v1/statuses/${status.id}/unreblog`).then(() => {
       dispatch(unreblogSuccess(status));
     }).catch(error => {
       dispatch(unreblogFail(status, error));
@@ -96,7 +115,7 @@ const unreblog = (status: StatusEntity) =>
   };
 
 const toggleReblog = (status: StatusEntity) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
+  (dispatch: AppDispatch) => {
     if (status.reblogged) {
       dispatch(unreblog(status));
     } else {
@@ -148,7 +167,7 @@ const favourite = (status: StatusEntity) =>
 
     dispatch(favouriteRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/favourite`).then(function(response) {
+    api(getState).post(`/api/v1/statuses/${status.id}/favourite`).then(function(response) {
       dispatch(favouriteSuccess(status));
     }).catch(function(error) {
       dispatch(favouriteFail(status, error));
@@ -161,7 +180,7 @@ const unfavourite = (status: StatusEntity) =>
 
     dispatch(unfavouriteRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unfavourite`).then(() => {
+    api(getState).post(`/api/v1/statuses/${status.id}/unfavourite`).then(() => {
       dispatch(unfavouriteSuccess(status));
     }).catch(error => {
       dispatch(unfavouriteFail(status, error));
@@ -169,7 +188,7 @@ const unfavourite = (status: StatusEntity) =>
   };
 
 const toggleFavourite = (status: StatusEntity) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
+  (dispatch: AppDispatch) => {
     if (status.favourited) {
       dispatch(unfavourite(status));
     } else {
@@ -215,11 +234,84 @@ const unfavouriteFail = (status: StatusEntity, error: AxiosError) => ({
   skipLoading: true,
 });
 
+const dislike = (status: StatusEntity) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    if (!isLoggedIn(getState)) return;
+
+    dispatch(dislikeRequest(status));
+
+    api(getState).post(`/api/friendica/statuses/${status.id}/dislike`).then(function() {
+      dispatch(dislikeSuccess(status));
+    }).catch(function(error) {
+      dispatch(dislikeFail(status, error));
+    });
+  };
+
+const undislike = (status: StatusEntity) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    if (!isLoggedIn(getState)) return;
+
+    dispatch(undislikeRequest(status));
+
+    api(getState).post(`/api/friendica/statuses/${status.id}/undislike`).then(() => {
+      dispatch(undislikeSuccess(status));
+    }).catch(error => {
+      dispatch(undislikeFail(status, error));
+    });
+  };
+
+const toggleDislike = (status: StatusEntity) =>
+  (dispatch: AppDispatch) => {
+    if (status.disliked) {
+      dispatch(undislike(status));
+    } else {
+      dispatch(dislike(status));
+    }
+  };
+
+const dislikeRequest = (status: StatusEntity) => ({
+  type: DISLIKE_REQUEST,
+  status: status,
+  skipLoading: true,
+});
+
+const dislikeSuccess = (status: StatusEntity) => ({
+  type: DISLIKE_SUCCESS,
+  status: status,
+  skipLoading: true,
+});
+
+const dislikeFail = (status: StatusEntity, error: AxiosError) => ({
+  type: DISLIKE_FAIL,
+  status: status,
+  error: error,
+  skipLoading: true,
+});
+
+const undislikeRequest = (status: StatusEntity) => ({
+  type: UNDISLIKE_REQUEST,
+  status: status,
+  skipLoading: true,
+});
+
+const undislikeSuccess = (status: StatusEntity) => ({
+  type: UNDISLIKE_SUCCESS,
+  status: status,
+  skipLoading: true,
+});
+
+const undislikeFail = (status: StatusEntity, error: AxiosError) => ({
+  type: UNDISLIKE_FAIL,
+  status: status,
+  error: error,
+  skipLoading: true,
+});
+
 const bookmark = (status: StatusEntity) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch(bookmarkRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function(response) {
+    api(getState).post(`/api/v1/statuses/${status.id}/bookmark`).then(function(response) {
       dispatch(importFetchedStatus(response.data));
       dispatch(bookmarkSuccess(status, response.data));
       toast.success(messages.bookmarkAdded, {
@@ -235,7 +327,7 @@ const unbookmark = (status: StatusEntity) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch(unbookmarkRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
+    api(getState).post(`/api/v1/statuses/${status.id}/unbookmark`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unbookmarkSuccess(status, response.data));
       toast.success(messages.bookmarkRemoved);
@@ -294,9 +386,10 @@ const fetchReblogs = (id: string) =>
     dispatch(fetchReblogsRequest(id));
 
     api(getState).get(`/api/v1/statuses/${id}/reblogged_by`).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchRelationships(response.data.map((item: APIEntity) => item.id)));
-      dispatch(fetchReblogsSuccess(id, response.data));
+      dispatch(fetchReblogsSuccess(id, response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchReblogsFail(id, error));
     });
@@ -307,10 +400,11 @@ const fetchReblogsRequest = (id: string) => ({
   id,
 });
 
-const fetchReblogsSuccess = (id: string, accounts: APIEntity[]) => ({
+const fetchReblogsSuccess = (id: string, accounts: APIEntity[], next: string | null) => ({
   type: REBLOGS_FETCH_SUCCESS,
   id,
   accounts,
+  next,
 });
 
 const fetchReblogsFail = (id: string, error: AxiosError) => ({
@@ -319,6 +413,31 @@ const fetchReblogsFail = (id: string, error: AxiosError) => ({
   error,
 });
 
+const expandReblogs = (id: string, path: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    api(getState).get(path).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedAccounts(response.data));
+      dispatch(fetchRelationships(response.data.map((item: APIEntity) => item.id)));
+      dispatch(expandReblogsSuccess(id, response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(expandReblogsFail(id, error));
+    });
+  };
+
+const expandReblogsSuccess = (id: string, accounts: APIEntity[], next: string | null) => ({
+  type: REBLOGS_EXPAND_SUCCESS,
+  id,
+  accounts,
+  next,
+});
+
+const expandReblogsFail = (id: string, error: AxiosError) => ({
+  type: REBLOGS_EXPAND_FAIL,
+  id,
+  error,
+});
+
 const fetchFavourites = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
@@ -326,9 +445,10 @@ const fetchFavourites = (id: string) =>
     dispatch(fetchFavouritesRequest(id));
 
     api(getState).get(`/api/v1/statuses/${id}/favourited_by`).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchRelationships(response.data.map((item: APIEntity) => item.id)));
-      dispatch(fetchFavouritesSuccess(id, response.data));
+      dispatch(fetchFavouritesSuccess(id, response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchFavouritesFail(id, error));
     });
@@ -339,10 +459,11 @@ const fetchFavouritesRequest = (id: string) => ({
   id,
 });
 
-const fetchFavouritesSuccess = (id: string, accounts: APIEntity[]) => ({
+const fetchFavouritesSuccess = (id: string, accounts: APIEntity[], next: string | null) => ({
   type: FAVOURITES_FETCH_SUCCESS,
   id,
   accounts,
+  next,
 });
 
 const fetchFavouritesFail = (id: string, error: AxiosError) => ({
@@ -351,6 +472,63 @@ const fetchFavouritesFail = (id: string, error: AxiosError) => ({
   error,
 });
 
+const expandFavourites = (id: string, path: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    api(getState).get(path).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedAccounts(response.data));
+      dispatch(fetchRelationships(response.data.map((item: APIEntity) => item.id)));
+      dispatch(expandFavouritesSuccess(id, response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(expandFavouritesFail(id, error));
+    });
+  };
+
+const expandFavouritesSuccess = (id: string, accounts: APIEntity[], next: string | null) => ({
+  type: FAVOURITES_EXPAND_SUCCESS,
+  id,
+  accounts,
+  next,
+});
+
+const expandFavouritesFail = (id: string, error: AxiosError) => ({
+  type: FAVOURITES_EXPAND_FAIL,
+  id,
+  error,
+});
+
+const fetchDislikes = (id: string) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    if (!isLoggedIn(getState)) return;
+
+    dispatch(fetchDislikesRequest(id));
+
+    api(getState).get(`/api/friendica/statuses/${id}/disliked_by`).then(response => {
+      dispatch(importFetchedAccounts(response.data));
+      dispatch(fetchRelationships(response.data.map((item: APIEntity) => item.id)));
+      dispatch(fetchDislikesSuccess(id, response.data));
+    }).catch(error => {
+      dispatch(fetchDislikesFail(id, error));
+    });
+  };
+
+const fetchDislikesRequest = (id: string) => ({
+  type: DISLIKES_FETCH_REQUEST,
+  id,
+});
+
+const fetchDislikesSuccess = (id: string, accounts: APIEntity[]) => ({
+  type: DISLIKES_FETCH_SUCCESS,
+  id,
+  accounts,
+});
+
+const fetchDislikesFail = (id: string, error: AxiosError) => ({
+  type: DISLIKES_FETCH_FAIL,
+  id,
+  error,
+});
+
 const fetchReactions = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch(fetchReactionsRequest(id));
@@ -386,7 +564,7 @@ const pin = (status: StatusEntity) =>
 
     dispatch(pinRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
+    api(getState).post(`/api/v1/statuses/${status.id}/pin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(pinSuccess(status));
     }).catch(error => {
@@ -394,6 +572,20 @@ const pin = (status: StatusEntity) =>
     });
   };
 
+const pinToGroup = (status: StatusEntity, group: Group) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    return api(getState)
+      .post(`/api/v1/groups/${group.id}/statuses/${status.id}/pin`)
+      .then(() => dispatch(expandGroupFeaturedTimeline(group.id)));
+  };
+
+const unpinFromGroup = (status: StatusEntity, group: Group) =>
+  (dispatch: AppDispatch, getState: () => RootState) => {
+    return api(getState)
+      .post(`/api/v1/groups/${group.id}/statuses/${status.id}/unpin`)
+      .then(() => dispatch(expandGroupFeaturedTimeline(group.id)));
+  };
+
 const pinRequest = (status: StatusEntity) => ({
   type: PIN_REQUEST,
   status,
@@ -419,7 +611,7 @@ const unpin = (status: StatusEntity) =>
 
     dispatch(unpinRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
+    api(getState).post(`/api/v1/statuses/${status.id}/unpin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unpinSuccess(status));
     }).catch(error => {
@@ -498,18 +690,27 @@ export {
   FAVOURITE_REQUEST,
   FAVOURITE_SUCCESS,
   FAVOURITE_FAIL,
+  DISLIKE_REQUEST,
+  DISLIKE_SUCCESS,
+  DISLIKE_FAIL,
   UNREBLOG_REQUEST,
   UNREBLOG_SUCCESS,
   UNREBLOG_FAIL,
   UNFAVOURITE_REQUEST,
   UNFAVOURITE_SUCCESS,
   UNFAVOURITE_FAIL,
+  UNDISLIKE_REQUEST,
+  UNDISLIKE_SUCCESS,
+  UNDISLIKE_FAIL,
   REBLOGS_FETCH_REQUEST,
   REBLOGS_FETCH_SUCCESS,
   REBLOGS_FETCH_FAIL,
   FAVOURITES_FETCH_REQUEST,
   FAVOURITES_FETCH_SUCCESS,
   FAVOURITES_FETCH_FAIL,
+  DISLIKES_FETCH_REQUEST,
+  DISLIKES_FETCH_SUCCESS,
+  DISLIKES_FETCH_FAIL,
   REACTIONS_FETCH_REQUEST,
   REACTIONS_FETCH_SUCCESS,
   REACTIONS_FETCH_FAIL,
@@ -528,6 +729,10 @@ export {
   REMOTE_INTERACTION_REQUEST,
   REMOTE_INTERACTION_SUCCESS,
   REMOTE_INTERACTION_FAIL,
+  FAVOURITES_EXPAND_SUCCESS,
+  FAVOURITES_EXPAND_FAIL,
+  REBLOGS_EXPAND_SUCCESS,
+  REBLOGS_EXPAND_FAIL,
   reblog,
   unreblog,
   toggleReblog,
@@ -546,6 +751,15 @@ export {
   unfavouriteRequest,
   unfavouriteSuccess,
   unfavouriteFail,
+  dislike,
+  undislike,
+  toggleDislike,
+  dislikeRequest,
+  dislikeSuccess,
+  dislikeFail,
+  undislikeRequest,
+  undislikeSuccess,
+  undislikeFail,
   bookmark,
   unbookmark,
   toggleBookmark,
@@ -559,10 +773,16 @@ export {
   fetchReblogsRequest,
   fetchReblogsSuccess,
   fetchReblogsFail,
+  expandReblogs,
   fetchFavourites,
   fetchFavouritesRequest,
   fetchFavouritesSuccess,
   fetchFavouritesFail,
+  expandFavourites,
+  fetchDislikes,
+  fetchDislikesRequest,
+  fetchDislikesSuccess,
+  fetchDislikesFail,
   fetchReactions,
   fetchReactionsRequest,
   fetchReactionsSuccess,
@@ -576,6 +796,8 @@ export {
   unpinSuccess,
   unpinFail,
   togglePin,
+  pinToGroup,
+  unpinFromGroup,
   remoteInteraction,
   remoteInteractionRequest,
   remoteInteractionSuccess,

app/soapbox/actions/lists.ts

@@ -1,3 +1,4 @@
+import { selectAccount } from 'soapbox/selectors';
 import toast from 'soapbox/toast';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
@@ -356,7 +357,7 @@ const resetListAdder = () => ({
 const setupListAdder = (accountId: string) => (dispatch: AppDispatch, getState: () => RootState) => {
   dispatch({
     type: LIST_ADDER_SETUP,
-    account: getState().accounts.get(accountId),
+    account: selectAccount(getState(), accountId),
   });
   dispatch(fetchLists());
   dispatch(fetchAccountLists(accountId));

app/soapbox/actions/me.ts

@@ -1,3 +1,4 @@
+import { selectAccount } from 'soapbox/selectors';
 import KVStore from 'soapbox/storage/kv-store';
 import { getAuthUserId, getAuthUserUrl } from 'soapbox/utils/auth';
 
@@ -10,14 +11,14 @@ import type { AxiosError, RawAxiosRequestHeaders } from 'axios';
 import type { AppDispatch, RootState } from 'soapbox/store';
 import type { APIEntity } from 'soapbox/types/entities';
 
-const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST';
-const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS';
-const ME_FETCH_FAIL    = 'ME_FETCH_FAIL';
-const ME_FETCH_SKIP    = 'ME_FETCH_SKIP';
+const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST' as const;
+const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS' as const;
+const ME_FETCH_FAIL    = 'ME_FETCH_FAIL' as const;
+const ME_FETCH_SKIP    = 'ME_FETCH_SKIP' as const;
 
-const ME_PATCH_REQUEST = 'ME_PATCH_REQUEST';
-const ME_PATCH_SUCCESS = 'ME_PATCH_SUCCESS';
-const ME_PATCH_FAIL    = 'ME_PATCH_FAIL';
+const ME_PATCH_REQUEST = 'ME_PATCH_REQUEST' as const;
+const ME_PATCH_SUCCESS = 'ME_PATCH_SUCCESS' as const;
+const ME_PATCH_FAIL    = 'ME_PATCH_FAIL' as const;
 
 const noOp = () => new Promise(f => f(undefined));
 
@@ -25,7 +26,9 @@ const getMeId = (state: RootState) => state.me || getAuthUserId(state);
 
 const getMeUrl = (state: RootState) => {
   const accountId = getMeId(state);
-  return state.accounts.get(accountId)?.url || getAuthUserUrl(state);
+  if (accountId) {
+    return selectAccount(state, accountId)?.url || getAuthUserUrl(state);
+  }
 };
 
 const getMeToken = (state: RootState) => {
@@ -85,13 +88,10 @@ const fetchMeRequest = () => ({
   type: ME_FETCH_REQUEST,
 });
 
-const fetchMeSuccess = (me: APIEntity) =>
-  (dispatch: AppDispatch) => {
-    dispatch({
-      type: ME_FETCH_SUCCESS,
-      me,
-    });
-  };
+const fetchMeSuccess = (me: APIEntity) => ({
+  type: ME_FETCH_SUCCESS,
+  me,
+});
 
 const fetchMeFail = (error: APIEntity) => ({
   type: ME_FETCH_FAIL,
@@ -103,13 +103,20 @@ const patchMeRequest = () => ({
   type: ME_PATCH_REQUEST,
 });
 
+interface MePatchSuccessAction {
+  type: typeof ME_PATCH_SUCCESS
+  me: APIEntity
+}
+
 const patchMeSuccess = (me: APIEntity) =>
   (dispatch: AppDispatch) => {
-    dispatch(importFetchedAccount(me));
-    dispatch({
+    const action: MePatchSuccessAction = {
       type: ME_PATCH_SUCCESS,
       me,
-    });
+    };
+
+    dispatch(importFetchedAccount(me));
+    dispatch(action);
   };
 
 const patchMeFail = (error: AxiosError) => ({
@@ -118,6 +125,14 @@ const patchMeFail = (error: AxiosError) => ({
   skipAlert: true,
 });
 
+type MeAction =
+  | ReturnType<typeof fetchMeRequest>
+  | ReturnType<typeof fetchMeSuccess>
+  | ReturnType<typeof fetchMeFail>
+  | ReturnType<typeof patchMeRequest>
+  | MePatchSuccessAction
+  | ReturnType<typeof patchMeFail>;
+
 export {
   ME_FETCH_REQUEST,
   ME_FETCH_SUCCESS,
@@ -134,4 +149,5 @@ export {
   patchMeRequest,
   patchMeSuccess,
   patchMeFail,
+  type MeAction,
 };

app/soapbox/actions/modals.ts

@@ -1,3 +1,5 @@
+import { AppDispatch } from 'soapbox/store';
+
 import type { ModalType } from 'soapbox/features/ui/components/modal-root';
 
 export const MODAL_OPEN  = 'MODAL_OPEN';
@@ -5,13 +7,18 @@ export const MODAL_CLOSE = 'MODAL_CLOSE';
 
 /** Open a modal of the given type */
 export function openModal(type: ModalType, props?: any) {
-  return {
-    type: MODAL_OPEN,
-    modalType: type,
-    modalProps: props,
+  return (dispatch: AppDispatch) => {
+    dispatch(closeModal(type));
+    dispatch(openModalSuccess(type, props));
   };
 }
 
+const openModalSuccess = (type: ModalType, props?: any) => ({
+  type: MODAL_OPEN,
+  modalType: type,
+  modalProps: props,
+});
+
 /** Close the modal */
 export function closeModal(type?: ModalType) {
   return {

app/soapbox/actions/moderation.tsx

@@ -7,6 +7,7 @@ import { openModal } from 'soapbox/actions/modals';
 import OutlineBox from 'soapbox/components/outline-box';
 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';
 
@@ -42,13 +43,13 @@ const messages = defineMessages({
 const deactivateUserModal = (intl: IntlShape, accountId: string, afterConfirm = () => {}) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
-    const acct = state.accounts.get(accountId)!.acct;
-    const name = state.accounts.get(accountId)!.username;
+    const acct = selectAccount(state, accountId)!.acct;
+    const name = selectAccount(state, accountId)!.username;
 
     const message = (
       <Stack space={4}>
         <OutlineBox>
-          <AccountContainer id={accountId} />
+          <AccountContainer id={accountId} hideActions />
         </OutlineBox>
 
         <Text>
@@ -75,7 +76,7 @@ const deactivateUserModal = (intl: IntlShape, accountId: string, afterConfirm =
 const deleteUserModal = (intl: IntlShape, accountId: string, afterConfirm = () => {}) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
-    const account = state.accounts.get(accountId)!;
+    const account = selectAccount(state, accountId)!;
     const acct = account.acct;
     const name = account.username;
     const local = isLocal(account);
@@ -83,7 +84,7 @@ const deleteUserModal = (intl: IntlShape, accountId: string, afterConfirm = () =
     const message = (
       <Stack space={4}>
         <OutlineBox>
-          <AccountContainer id={accountId} />
+          <AccountContainer id={accountId} hideActions />
         </OutlineBox>
 
         <Text>
@@ -112,32 +113,10 @@ const deleteUserModal = (intl: IntlShape, accountId: string, afterConfirm = () =
     }));
   };
 
-const rejectUserModal = (intl: IntlShape, accountId: string, afterConfirm = () => {}) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    const state = getState();
-    const acct = state.accounts.get(accountId)!.acct;
-    const name = state.accounts.get(accountId)!.username;
-
-    dispatch(openModal('CONFIRM', {
-      icon: require('@tabler/icons/user-off.svg'),
-      heading: intl.formatMessage(messages.rejectUserHeading, { acct }),
-      message: intl.formatMessage(messages.rejectUserPrompt, { acct }),
-      confirm: intl.formatMessage(messages.rejectUserConfirm, { name }),
-      onConfirm: () => {
-        dispatch(deleteUsers([accountId]))
-          .then(() => {
-            afterConfirm();
-          })
-          .catch(() => {});
-      },
-    }));
-  };
-
 const toggleStatusSensitivityModal = (intl: IntlShape, statusId: string, sensitive: boolean, afterConfirm = () => {}) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
-    const accountId = state.statuses.get(statusId)!.account;
-    const acct = state.accounts.get(accountId)!.acct;
+    const acct = state.statuses.get(statusId)!.account.acct;
 
     dispatch(openModal('CONFIRM', {
       icon: require('@tabler/icons/alert-triangle.svg'),
@@ -157,13 +136,12 @@ const toggleStatusSensitivityModal = (intl: IntlShape, statusId: string, sensiti
 const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = () => {}) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
-    const accountId = state.statuses.get(statusId)!.account;
-    const acct = state.accounts.get(accountId)!.acct;
+    const acct = state.statuses.get(statusId)!.account.acct;
 
     dispatch(openModal('CONFIRM', {
       icon: require('@tabler/icons/trash.svg'),
       heading: intl.formatMessage(messages.deleteStatusHeading),
-      message: intl.formatMessage(messages.deleteStatusPrompt, { acct }),
+      message: intl.formatMessage(messages.deleteStatusPrompt, { acct: <strong className='break-words'>{acct}</strong> }),
       confirm: intl.formatMessage(messages.deleteStatusConfirm),
       onConfirm: () => {
         dispatch(deleteStatus(statusId)).then(() => {
@@ -178,7 +156,6 @@ const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = ()
 export {
   deactivateUserModal,
   deleteUserModal,
-  rejectUserModal,
   toggleStatusSensitivityModal,
   deleteStatusModal,
 };

app/soapbox/actions/mutes.ts

@@ -1,95 +1,14 @@
-import { isLoggedIn } from 'soapbox/utils/auth';
-import { getNextLinkName } from 'soapbox/utils/quirks';
-
-import api, { getLinks } from '../api';
-
-import { fetchRelationships } from './accounts';
-import { importFetchedAccounts } from './importer';
 import { openModal } from './modals';
 
-import type { AxiosError } from 'axios';
-import type { AppDispatch, RootState } from 'soapbox/store';
-import type { APIEntity, Account as AccountEntity } from 'soapbox/types/entities';
-
-const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
-const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';
-const MUTES_FETCH_FAIL    = 'MUTES_FETCH_FAIL';
-
-const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST';
-const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
-const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
+import type { Account } from 'soapbox/schemas';
+import type { AppDispatch } from 'soapbox/store';
+import type { Account as AccountEntity } from 'soapbox/types/entities';
 
 const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
 const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
 const MUTES_CHANGE_DURATION = 'MUTES_CHANGE_DURATION';
 
-const fetchMutes = () =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    if (!isLoggedIn(getState)) return;
-    const nextLinkName = getNextLinkName(getState);
-
-    dispatch(fetchMutesRequest());
-
-    api(getState).get('/api/v1/mutes').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === nextLinkName);
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchMutesSuccess(response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map((item: APIEntity) => item.id)));
-    }).catch(error => dispatch(fetchMutesFail(error)));
-  };
-
-const fetchMutesRequest = () => ({
-  type: MUTES_FETCH_REQUEST,
-});
-
-const fetchMutesSuccess = (accounts: APIEntity[], next: string | null) => ({
-  type: MUTES_FETCH_SUCCESS,
-  accounts,
-  next,
-});
-
-const fetchMutesFail = (error: AxiosError) => ({
-  type: MUTES_FETCH_FAIL,
-  error,
-});
-
-const expandMutes = () =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    if (!isLoggedIn(getState)) return;
-    const nextLinkName = getNextLinkName(getState);
-
-    const url = getState().user_lists.mutes.next;
-
-    if (url === null) {
-      return;
-    }
-
-    dispatch(expandMutesRequest());
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === nextLinkName);
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(expandMutesSuccess(response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map((item: APIEntity) => item.id)));
-    }).catch(error => dispatch(expandMutesFail(error)));
-  };
-
-const expandMutesRequest = () => ({
-  type: MUTES_EXPAND_REQUEST,
-});
-
-const expandMutesSuccess = (accounts: APIEntity[], next: string | null) => ({
-  type: MUTES_EXPAND_SUCCESS,
-  accounts,
-  next,
-});
-
-const expandMutesFail = (error: AxiosError) => ({
-  type: MUTES_EXPAND_FAIL,
-  error,
-});
-
-const initMuteModal = (account: AccountEntity) =>
+const initMuteModal = (account: AccountEntity | Account) =>
   (dispatch: AppDispatch) => {
     dispatch({
       type: MUTES_INIT_MODAL,
@@ -113,23 +32,9 @@ const changeMuteDuration = (duration: number) =>
   };
 
 export {
-  MUTES_FETCH_REQUEST,
-  MUTES_FETCH_SUCCESS,
-  MUTES_FETCH_FAIL,
-  MUTES_EXPAND_REQUEST,
-  MUTES_EXPAND_SUCCESS,
-  MUTES_EXPAND_FAIL,
   MUTES_INIT_MODAL,
   MUTES_TOGGLE_HIDE_NOTIFICATIONS,
   MUTES_CHANGE_DURATION,
-  fetchMutes,
-  fetchMutesRequest,
-  fetchMutesSuccess,
-  fetchMutesFail,
-  expandMutes,
-  expandMutesRequest,
-  expandMutesSuccess,
-  expandMutesFail,
   initMuteModal,
   toggleHideNotifications,
   changeMuteDuration,

app/soapbox/actions/notifications.ts

@@ -12,6 +12,7 @@ import { EXCLUDE_TYPES, NOTIFICATION_TYPES } from 'soapbox/utils/notification';
 import { joinPublicPath } from 'soapbox/utils/static';
 
 import { fetchRelationships } from './accounts';
+import { fetchGroupRelationships } from './groups';
 import {
   importFetchedAccount,
   importFetchedAccounts,
@@ -23,7 +24,7 @@ import { getSettings, saveSettings } from './settings';
 
 import type { AxiosError } from 'axios';
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { APIEntity } from 'soapbox/types/entities';
+import type { APIEntity, Status } from 'soapbox/types/entities';
 
 const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
 const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
@@ -237,6 +238,9 @@ const expandNotifications = ({ maxId }: Record<string, any> = {}, done: () => an
       dispatch(importFetchedAccounts(Object.values(entries.accounts)));
       dispatch(importFetchedStatuses(Object.values(entries.statuses)));
 
+      const statusesFromGroups = (Object.values(entries.statuses) as Status[]).filter((status) => !!status.group);
+      dispatch(fetchGroupRelationships(statusesFromGroups.map((status: any) => status.group?.id)));
+
       dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore));
       fetchRelatedRelationships(dispatch, response.data);
       done();

app/soapbox/actions/oauth.ts

@@ -6,9 +6,11 @@
  * @see module:soapbox/actions/auth
  */
 
+import { getBaseURL } from 'soapbox/utils/state';
+
 import { baseClient } from '../api';
 
-import type { AppDispatch } from 'soapbox/store';
+import type { AppDispatch, RootState } from 'soapbox/store';
 
 export const OAUTH_TOKEN_CREATE_REQUEST = 'OAUTH_TOKEN_CREATE_REQUEST';
 export const OAUTH_TOKEN_CREATE_SUCCESS = 'OAUTH_TOKEN_CREATE_SUCCESS';
@@ -31,9 +33,10 @@ export const obtainOAuthToken = (params: Record<string, string | undefined>, bas
   };
 
 export const revokeOAuthToken = (params: Record<string, string>) =>
-  (dispatch: AppDispatch) => {
+  (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: OAUTH_TOKEN_REVOKE_REQUEST, params });
-    return baseClient().post('/oauth/revoke', params).then(({ data }) => {
+    const baseURL = getBaseURL(getState());
+    return baseClient(null, baseURL).post('/oauth/revoke', params).then(({ data }) => {
       dispatch({ type: OAUTH_TOKEN_REVOKE_SUCCESS, params, data });
       return data;
     }).catch(error => {

app/soapbox/actions/push-notifications/registerer.ts

@@ -37,8 +37,8 @@ const subscribe = (registration: ServiceWorkerRegistration, getState: () => Root
   });
 
 const unsubscribe = ({ registration, subscription }: {
-  registration: ServiceWorkerRegistration,
-  subscription: PushSubscription | null,
+  registration: ServiceWorkerRegistration
+  subscription: PushSubscription | null
 }) =>
   subscription ? subscription.unsubscribe().then(() => registration) : new Promise<ServiceWorkerRegistration>(r => r(registration));
 
@@ -82,8 +82,8 @@ const register = () =>
       .then(getPushSubscription)
       // @ts-ignore
       .then(({ registration, subscription }: {
-        registration: ServiceWorkerRegistration,
-        subscription: PushSubscription | null,
+        registration: ServiceWorkerRegistration
+        subscription: PushSubscription | null
       }) => {
         if (subscription !== null) {
           // We have a subscription, check if it is still valid

app/soapbox/actions/reports.ts

@@ -3,8 +3,9 @@ import api from '../api';
 import { openModal } from './modals';
 
 import type { AxiosError } from 'axios';
+import type { Account } from 'soapbox/schemas';
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { Account, ChatMessage, Status } from 'soapbox/types/entities';
+import type { ChatMessage, Group, Status } from 'soapbox/types/entities';
 
 const REPORT_INIT   = 'REPORT_INIT';
 const REPORT_CANCEL = 'REPORT_CANCEL';
@@ -20,19 +21,29 @@ const REPORT_BLOCK_CHANGE   = 'REPORT_BLOCK_CHANGE';
 
 const REPORT_RULE_CHANGE    = 'REPORT_RULE_CHANGE';
 
-type ReportedEntity = {
-  status?: Status,
-  chatMessage?: ChatMessage
+enum ReportableEntities {
+  ACCOUNT = 'ACCOUNT',
+  CHAT_MESSAGE = 'CHAT_MESSAGE',
+  GROUP = 'GROUP',
+  STATUS = 'STATUS'
 }
 
-const initReport = (account: Account, entities?: ReportedEntity) => (dispatch: AppDispatch) => {
-  const { status, chatMessage } = entities || {};
+type ReportedEntity = {
+  status?: Status
+  chatMessage?: ChatMessage
+  group?: Group
+}
+
+const initReport = (entityType: ReportableEntities, account: Account, entities?: ReportedEntity) => (dispatch: AppDispatch) => {
+  const { status, chatMessage, group } = entities || {};
 
   dispatch({
     type: REPORT_INIT,
+    entityType,
     account,
     status,
     chatMessage,
+    group,
   });
 
   return dispatch(openModal('REPORT'));
@@ -56,7 +67,8 @@ const submitReport = () =>
     return api(getState).post('/api/v1/reports', {
       account_id: reports.getIn(['new', 'account_id']),
       status_ids: reports.getIn(['new', 'status_ids']),
-      message_ids: [reports.getIn(['new', 'chat_message', 'id'])],
+      message_ids: [reports.getIn(['new', 'chat_message', 'id'])].filter(Boolean),
+      group_id: reports.getIn(['new', 'group', 'id']),
       rule_ids: reports.getIn(['new', 'rule_ids']),
       comment: reports.getIn(['new', 'comment']),
       forward: reports.getIn(['new', 'forward']),
@@ -97,6 +109,7 @@ const changeReportRule = (ruleId: string) => ({
 });
 
 export {
+  ReportableEntities,
   REPORT_INIT,
   REPORT_CANCEL,
   REPORT_SUBMIT_REQUEST,

app/soapbox/actions/search.ts

@@ -1,7 +1,7 @@
-import api from '../api';
+import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
-import { importFetchedAccounts, importFetchedGroups, importFetchedStatuses } from './importer';
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
 
 import type { AxiosError } from 'axios';
 import type { SearchFilter } from 'soapbox/reducers/search';
@@ -83,11 +83,9 @@ const submitSearch = (filter?: SearchFilter) =>
         dispatch(importFetchedStatuses(response.data.statuses));
       }
 
-      if (response.data.groups) {
-        dispatch(importFetchedGroups(response.data.groups));
-      }
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
 
-      dispatch(fetchSearchSuccess(response.data, value, type));
+      dispatch(fetchSearchSuccess(response.data, value, type, next ? next.uri : null));
       dispatch(fetchRelationships(response.data.accounts.map((item: APIEntity) => item.id)));
     }).catch(error => {
       dispatch(fetchSearchFail(error));
@@ -99,11 +97,12 @@ const fetchSearchRequest = (value: string) => ({
   value,
 });
 
-const fetchSearchSuccess = (results: APIEntity[], searchTerm: string, searchType: SearchFilter) => ({
+const fetchSearchSuccess = (results: APIEntity[], searchTerm: string, searchType: SearchFilter, next: string | null) => ({
   type: SEARCH_FETCH_SUCCESS,
   results,
   searchTerm,
   searchType,
+  next,
 });
 
 const fetchSearchFail = (error: AxiosError) => ({
@@ -123,18 +122,32 @@ const setFilter = (filterType: SearchFilter) =>
   };
 
 const expandSearch = (type: SearchFilter) => (dispatch: AppDispatch, getState: () => RootState) => {
-  const value  = getState().search.value;
-  const offset = getState().search.results[type].size;
+  const value     = getState().search.value;
+  const offset    = getState().search.results[type].size;
+  const accountId = getState().search.accountId;
 
   dispatch(expandSearchRequest(type));
 
-  api(getState).get('/api/v2/search', {
-    params: {
+  let url = getState().search.next as string;
+  let params: Record<string, any> = {};
+
+  // if no URL was extracted from the Link header,
+  // fall back on querying with the offset
+  if (!url) {
+    url = '/api/v2/search';
+    params = {
       q: value,
       type,
       offset,
-    },
-  }).then(({ data }) => {
+    };
+    if (accountId) params.account_id = accountId;
+  }
+
+  api(getState).get(url, {
+    params,
+  }).then(response => {
+    const data = response.data;
+
     if (data.accounts) {
       dispatch(importFetchedAccounts(data.accounts));
     }
@@ -143,11 +156,9 @@ const expandSearch = (type: SearchFilter) => (dispatch: AppDispatch, getState: (
       dispatch(importFetchedStatuses(data.statuses));
     }
 
-    if (data.groups) {
-      dispatch(importFetchedGroups(data.groups));
-    }
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
 
-    dispatch(expandSearchSuccess(data, value, type));
+    dispatch(expandSearchSuccess(data, value, type, next ? next.uri : null));
     dispatch(fetchRelationships(data.accounts.map((item: APIEntity) => item.id)));
   }).catch(error => {
     dispatch(expandSearchFail(error));
@@ -159,11 +170,12 @@ const expandSearchRequest = (searchType: SearchFilter) => ({
   searchType,
 });
 
-const expandSearchSuccess = (results: APIEntity[], searchTerm: string, searchType: SearchFilter) => ({
+const expandSearchSuccess = (results: APIEntity[], searchTerm: string, searchType: SearchFilter, next: string | null) => ({
   type: SEARCH_EXPAND_SUCCESS,
   results,
   searchTerm,
   searchType,
+  next,
 });
 
 const expandSearchFail = (error: AxiosError) => ({

app/soapbox/actions/settings.ts

@@ -1,29 +1,28 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable';
-import { defineMessages } from 'react-intl';
+import { defineMessage } from 'react-intl';
 import { createSelector } from 'reselect';
 import { v4 as uuid } from 'uuid';
 
 import { patchMe } from 'soapbox/actions/me';
+import messages from 'soapbox/messages';
 import toast from 'soapbox/toast';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
 import type { AppDispatch, RootState } from 'soapbox/store';
 
-const SETTING_CHANGE = 'SETTING_CHANGE';
-const SETTING_SAVE   = 'SETTING_SAVE';
-const SETTINGS_UPDATE = 'SETTINGS_UPDATE';
+const SETTING_CHANGE = 'SETTING_CHANGE' as const;
+const SETTING_SAVE   = 'SETTING_SAVE' as const;
+const SETTINGS_UPDATE = 'SETTINGS_UPDATE' as const;
 
 const FE_NAME = 'soapbox_fe';
 
 /** Options when changing/saving settings. */
 type SettingOpts = {
   /** Whether to display an alert when settings are saved. */
-  showAlert?: boolean,
+  showAlert?: boolean
 }
 
-const messages = defineMessages({
-  saveSuccess: { id: 'settings.save.success', defaultMessage: 'Your preferences have been saved!' },
-});
+const saveSuccessMessage = defineMessage({ id: 'settings.save.success', defaultMessage: 'Your preferences have been saved!' });
 
 const defaultSettings = ImmutableMap({
   onboarded: false,
@@ -40,11 +39,12 @@ const defaultSettings = ImmutableMap({
   defaultPrivacy: 'public',
   defaultContentType: 'text/plain',
   themeMode: 'system',
-  locale: navigator.language.split(/[-_]/)[0] || 'en',
+  locale: navigator.language || 'en',
   showExplanationBox: true,
   explanationBox: true,
   autoloadTimelines: true,
   autoloadMore: true,
+  preserveSpoilers: false,
 
   systemFont: false,
   demetricator: false,
@@ -182,25 +182,33 @@ const getSettings = createSelector([
     .mergeDeep(settings);
 });
 
+interface SettingChangeAction {
+  type: typeof SETTING_CHANGE
+  path: string[]
+  value: any
+}
+
 const changeSettingImmediate = (path: string[], value: any, opts?: SettingOpts) =>
   (dispatch: AppDispatch) => {
-    dispatch({
+    const action: SettingChangeAction = {
       type: SETTING_CHANGE,
       path,
       value,
-    });
+    };
 
+    dispatch(action);
     dispatch(saveSettingsImmediate(opts));
   };
 
 const changeSetting = (path: string[], value: any, opts?: SettingOpts) =>
   (dispatch: AppDispatch) => {
-    dispatch({
+    const action: SettingChangeAction = {
       type: SETTING_CHANGE,
       path,
       value,
-    });
+    };
 
+    dispatch(action);
     return dispatch(saveSettings(opts));
   };
 
@@ -221,7 +229,7 @@ const saveSettingsImmediate = (opts?: SettingOpts) =>
       dispatch({ type: SETTING_SAVE });
 
       if (opts?.showAlert) {
-        toast.success(messages.saveSuccess);
+        toast.success(saveSuccessMessage);
       }
     }).catch(error => {
       toast.showAlertForError(error);
@@ -231,6 +239,16 @@ const saveSettingsImmediate = (opts?: SettingOpts) =>
 const saveSettings = (opts?: SettingOpts) =>
   (dispatch: AppDispatch) => dispatch(saveSettingsImmediate(opts));
 
+const getLocale = (state: RootState, fallback = 'en') => {
+  const localeWithVariant = (getSettings(state).get('locale') as string).replace('_', '-');
+  const locale = localeWithVariant.split('-')[0];
+  return Object.keys(messages).includes(localeWithVariant) ? localeWithVariant : Object.keys(messages).includes(locale) ? locale : fallback;
+};
+
+type SettingsAction =
+  | SettingChangeAction
+  | { type: typeof SETTING_SAVE }
+
 export {
   SETTING_CHANGE,
   SETTING_SAVE,
@@ -242,4 +260,6 @@ export {
   changeSetting,
   saveSettingsImmediate,
   saveSettings,
+  getLocale,
+  type SettingsAction,
 };

app/soapbox/actions/statuses.ts

@@ -5,6 +5,7 @@ import { shouldHaveCard } from 'soapbox/utils/status';
 import api, { getNextLink } from '../api';
 
 import { setComposeToStatus } from './compose';
+import { fetchGroupRelationships } from './groups';
 import { importFetchedStatus, importFetchedStatuses } from './importer';
 import { openModal } from './modals';
 import { deleteFromTimelines } from './timelines';
@@ -48,6 +49,8 @@ const STATUS_TRANSLATE_SUCCESS = 'STATUS_TRANSLATE_SUCCESS';
 const STATUS_TRANSLATE_FAIL    = 'STATUS_TRANSLATE_FAIL';
 const STATUS_TRANSLATE_UNDO    = 'STATUS_TRANSLATE_UNDO';
 
+const STATUS_UNFILTER = 'STATUS_UNFILTER';
+
 const statusExists = (getState: () => RootState, statusId: string) => {
   return (getState().statuses.get(statusId) || null) !== null;
 };
@@ -122,6 +125,9 @@ const fetchStatus = (id: string) => {
 
     return api(getState).get(`/api/v1/statuses/${id}`).then(({ data: status }) => {
       dispatch(importFetchedStatus(status));
+      if (status.group) {
+        dispatch(fetchGroupRelationships([status.group.id]));
+      }
       dispatch({ type: STATUS_FETCH_SUCCESS, status, skipLoading });
       return status;
     }).catch(error => {
@@ -335,6 +341,11 @@ const undoStatusTranslation = (id: string) => ({
   id,
 });
 
+const unfilterStatus = (id: string) => ({
+  type: STATUS_UNFILTER,
+  id,
+});
+
 export {
   STATUS_CREATE_REQUEST,
   STATUS_CREATE_SUCCESS,
@@ -363,6 +374,7 @@ export {
   STATUS_TRANSLATE_SUCCESS,
   STATUS_TRANSLATE_FAIL,
   STATUS_TRANSLATE_UNDO,
+  STATUS_UNFILTER,
   createStatus,
   editStatus,
   fetchStatus,
@@ -381,4 +393,5 @@ export {
   toggleStatusHidden,
   translateStatus,
   undoStatusTranslation,
+  unfilterStatus,
 };

app/soapbox/actions/streaming.ts

@@ -1,5 +1,8 @@
-import { getSettings } from 'soapbox/actions/settings';
-import messages from 'soapbox/locales/messages';
+import { getLocale, getSettings } from 'soapbox/actions/settings';
+import { importEntities } from 'soapbox/entity-store/actions';
+import { Entities } from 'soapbox/entity-store/entities';
+import { selectEntity } from 'soapbox/entity-store/selectors';
+import messages from 'soapbox/messages';
 import { ChatKeys, IChat, isLastMessage } from 'soapbox/queries/chats';
 import { queryClient } from 'soapbox/queries/client';
 import { getUnreadChatsCount, updateChatListItem, updateChatMessage } from 'soapbox/utils/chats';
@@ -10,46 +13,27 @@ import { connectStream } from '../stream';
 
 import {
   deleteAnnouncement,
-  fetchAnnouncements,
   updateAnnouncements,
   updateReaction as updateAnnouncementsReaction,
 } from './announcements';
 import { updateConversations } from './conversations';
 import { fetchFilters } from './filters';
 import { MARKER_FETCH_SUCCESS } from './markers';
-import { updateNotificationsQueue, expandNotifications } from './notifications';
+import { updateNotificationsQueue } from './notifications';
 import { updateStatus } from './statuses';
 import {
   // deleteFromTimelines,
-  expandHomeTimeline,
   connectTimeline,
   disconnectTimeline,
   processTimelineUpdate,
 } from './timelines';
 
 import type { IStatContext } from 'soapbox/contexts/stat-context';
+import type { Relationship } from 'soapbox/schemas';
 import type { AppDispatch, RootState } from 'soapbox/store';
 import type { APIEntity, Chat } from 'soapbox/types/entities';
 
 const STREAMING_CHAT_UPDATE = 'STREAMING_CHAT_UPDATE';
-const STREAMING_FOLLOW_RELATIONSHIPS_UPDATE = 'STREAMING_FOLLOW_RELATIONSHIPS_UPDATE';
-
-const validLocale = (locale: string) => Object.keys(messages).includes(locale);
-
-const getLocale = (state: RootState) => {
-  const locale = getSettings(state).get('locale') as string;
-  return validLocale(locale) ? locale : 'en';
-};
-
-const updateFollowRelationships = (relationships: APIEntity) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    const me = getState().me;
-    return dispatch({
-      type: STREAMING_FOLLOW_RELATIONSHIPS_UPDATE,
-      me,
-      ...relationships,
-    });
-  };
 
 const removeChatMessage = (payload: string) => {
   const data = JSON.parse(payload);
@@ -80,8 +64,9 @@ const updateChatQuery = (chat: IChat) => {
   queryClient.setQueryData<Chat>(ChatKeys.chat(chat.id), newChat as any);
 };
 
-interface StreamOpts {
-  statContext?: IStatContext,
+interface TimelineStreamOpts {
+  statContext?: IStatContext
+  enabled?: boolean
 }
 
 const connectTimelineStream = (
@@ -89,7 +74,7 @@ const connectTimelineStream = (
   path: string,
   pollingRefresh: ((dispatch: AppDispatch, done?: () => void) => void) | null = null,
   accept: ((status: APIEntity) => boolean) | null = null,
-  opts?: StreamOpts,
+  opts?: TimelineStreamOpts,
 ) => connectStream(path, pollingRefresh, (dispatch: AppDispatch, getState: () => RootState) => {
   const locale = getLocale(getState());
 
@@ -102,7 +87,7 @@ const connectTimelineStream = (
       dispatch(disconnectTimeline(timelineId));
     },
 
-    onReceive(data: any) {
+    onReceive(websocket, data: any) {
       switch (data.event) {
         case 'update':
           dispatch(processTimelineUpdate(timelineId, JSON.parse(data.payload), accept));
@@ -193,45 +178,52 @@ const connectTimelineStream = (
   };
 });
 
-const refreshHomeTimelineAndNotification = (dispatch: AppDispatch, done?: () => void) =>
-  dispatch(expandHomeTimeline({}, () =>
-    dispatch(expandNotifications({}, () =>
-      dispatch(fetchAnnouncements(done))))));
+function followStateToRelationship(followState: string) {
+  switch (followState) {
+    case 'follow_pending':
+      return { following: false, requested: true };
+    case 'follow_accept':
+      return { following: true, requested: false };
+    case 'follow_reject':
+      return { following: false, requested: false };
+    default:
+      return {};
+  }
+}
 
-const connectUserStream      = (opts?: StreamOpts) =>
-  connectTimelineStream('home', 'user', refreshHomeTimelineAndNotification, null, opts);
+interface FollowUpdate {
+  state: 'follow_pending' | 'follow_accept' | 'follow_reject'
+  follower: {
+    id: string
+    follower_count: number
+    following_count: number
+  }
+  following: {
+    id: string
+    follower_count: number
+    following_count: number
+  }
+}
 
-const connectCommunityStream = ({ onlyMedia }: Record<string, any> = {}) =>
-  connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`);
+function updateFollowRelationships(update: FollowUpdate) {
+  return (dispatch: AppDispatch, getState: () => RootState) => {
+    const me = getState().me;
+    const relationship = selectEntity<Relationship>(getState(), Entities.RELATIONSHIPS, update.following.id);
 
-const connectPublicStream    = ({ onlyMedia }: Record<string, any> = {}) =>
-  connectTimelineStream(`public${onlyMedia ? ':media' : ''}`, `public${onlyMedia ? ':media' : ''}`);
+    if (update.follower.id === me && relationship) {
+      const updated = {
+        ...relationship,
+        ...followStateToRelationship(update.state),
+      };
 
-const connectRemoteStream    = (instance: string, { onlyMedia }: Record<string, any> = {}) =>
-  connectTimelineStream(`remote${onlyMedia ? ':media' : ''}:${instance}`, `public:remote${onlyMedia ? ':media' : ''}&instance=${instance}`);
-
-const connectHashtagStream   = (id: string, tag: string, accept: (status: APIEntity) => boolean) =>
-  connectTimelineStream(`hashtag:${id}`, `hashtag&tag=${tag}`, null, accept);
-
-const connectDirectStream    = () =>
-  connectTimelineStream('direct', 'direct');
-
-const connectListStream      = (id: string) =>
-  connectTimelineStream(`list:${id}`, `list&list=${id}`);
-
-const connectGroupStream     = (id: string) =>
-  connectTimelineStream(`group:${id}`, `group&group=${id}`);
+      // Add a small delay to deal with API race conditions.
+      setTimeout(() => dispatch(importEntities([updated], Entities.RELATIONSHIPS)), 300);
+    }
+  };
+}
 
 export {
   STREAMING_CHAT_UPDATE,
-  STREAMING_FOLLOW_RELATIONSHIPS_UPDATE,
   connectTimelineStream,
-  connectUserStream,
-  connectCommunityStream,
-  connectPublicStream,
-  connectRemoteStream,
-  connectHashtagStream,
-  connectDirectStream,
-  connectListStream,
-  connectGroupStream,
+  type TimelineStreamOpts,
 };

app/soapbox/actions/tags.ts

@@ -0,0 +1,201 @@
+import api, { getLinks } from '../api';
+
+import type { AxiosError } from 'axios';
+import type { AppDispatch, RootState } from 'soapbox/store';
+import type { APIEntity } from 'soapbox/types/entities';
+
+const HASHTAG_FETCH_REQUEST = 'HASHTAG_FETCH_REQUEST';
+const HASHTAG_FETCH_SUCCESS = 'HASHTAG_FETCH_SUCCESS';
+const HASHTAG_FETCH_FAIL    = 'HASHTAG_FETCH_FAIL';
+
+const HASHTAG_FOLLOW_REQUEST = 'HASHTAG_FOLLOW_REQUEST';
+const HASHTAG_FOLLOW_SUCCESS = 'HASHTAG_FOLLOW_SUCCESS';
+const HASHTAG_FOLLOW_FAIL    = 'HASHTAG_FOLLOW_FAIL';
+
+const HASHTAG_UNFOLLOW_REQUEST = 'HASHTAG_UNFOLLOW_REQUEST';
+const HASHTAG_UNFOLLOW_SUCCESS = 'HASHTAG_UNFOLLOW_SUCCESS';
+const HASHTAG_UNFOLLOW_FAIL    = 'HASHTAG_UNFOLLOW_FAIL';
+
+const FOLLOWED_HASHTAGS_FETCH_REQUEST = 'FOLLOWED_HASHTAGS_FETCH_REQUEST';
+const FOLLOWED_HASHTAGS_FETCH_SUCCESS = 'FOLLOWED_HASHTAGS_FETCH_SUCCESS';
+const FOLLOWED_HASHTAGS_FETCH_FAIL    = 'FOLLOWED_HASHTAGS_FETCH_FAIL';
+
+const FOLLOWED_HASHTAGS_EXPAND_REQUEST = 'FOLLOWED_HASHTAGS_EXPAND_REQUEST';
+const FOLLOWED_HASHTAGS_EXPAND_SUCCESS = 'FOLLOWED_HASHTAGS_EXPAND_SUCCESS';
+const FOLLOWED_HASHTAGS_EXPAND_FAIL    = 'FOLLOWED_HASHTAGS_EXPAND_FAIL';
+
+const fetchHashtag = (name: string) => (dispatch: AppDispatch, getState: () => RootState) => {
+  dispatch(fetchHashtagRequest());
+
+  api(getState).get(`/api/v1/tags/${name}`).then(({ data }) => {
+    dispatch(fetchHashtagSuccess(name, data));
+  }).catch(err => {
+    dispatch(fetchHashtagFail(err));
+  });
+};
+
+const fetchHashtagRequest = () => ({
+  type: HASHTAG_FETCH_REQUEST,
+});
+
+const fetchHashtagSuccess = (name: string, tag: APIEntity) => ({
+  type: HASHTAG_FETCH_SUCCESS,
+  name,
+  tag,
+});
+
+const fetchHashtagFail = (error: AxiosError) => ({
+  type: HASHTAG_FETCH_FAIL,
+  error,
+});
+
+const followHashtag = (name: string) => (dispatch: AppDispatch, getState: () => RootState) => {
+  dispatch(followHashtagRequest(name));
+
+  api(getState).post(`/api/v1/tags/${name}/follow`).then(({ data }) => {
+    dispatch(followHashtagSuccess(name, data));
+  }).catch(err => {
+    dispatch(followHashtagFail(name, err));
+  });
+};
+
+const followHashtagRequest = (name: string) => ({
+  type: HASHTAG_FOLLOW_REQUEST,
+  name,
+});
+
+const followHashtagSuccess = (name: string, tag: APIEntity) => ({
+  type: HASHTAG_FOLLOW_SUCCESS,
+  name,
+  tag,
+});
+
+const followHashtagFail = (name: string, error: AxiosError) => ({
+  type: HASHTAG_FOLLOW_FAIL,
+  name,
+  error,
+});
+
+const unfollowHashtag = (name: string) => (dispatch: AppDispatch, getState: () => RootState) => {
+  dispatch(unfollowHashtagRequest(name));
+
+  api(getState).post(`/api/v1/tags/${name}/unfollow`).then(({ data }) => {
+    dispatch(unfollowHashtagSuccess(name, data));
+  }).catch(err => {
+    dispatch(unfollowHashtagFail(name, err));
+  });
+};
+
+const unfollowHashtagRequest = (name: string) => ({
+  type: HASHTAG_UNFOLLOW_REQUEST,
+  name,
+});
+
+const unfollowHashtagSuccess = (name: string, tag: APIEntity) => ({
+  type: HASHTAG_UNFOLLOW_SUCCESS,
+  name,
+  tag,
+});
+
+const unfollowHashtagFail = (name: string, error: AxiosError) => ({
+  type: HASHTAG_UNFOLLOW_FAIL,
+  name,
+  error,
+});
+
+const fetchFollowedHashtags = () => (dispatch: AppDispatch, getState: () => RootState) => {
+  dispatch(fetchFollowedHashtagsRequest());
+
+  api(getState).get('/api/v1/followed_tags').then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(fetchFollowedHashtagsSuccess(response.data, next ? next.uri : null));
+  }).catch(err => {
+    dispatch(fetchFollowedHashtagsFail(err));
+  });
+};
+
+const fetchFollowedHashtagsRequest = () => ({
+  type: FOLLOWED_HASHTAGS_FETCH_REQUEST,
+});
+
+const fetchFollowedHashtagsSuccess = (followed_tags: APIEntity[], next: string | null) => ({
+  type: FOLLOWED_HASHTAGS_FETCH_SUCCESS,
+  followed_tags,
+  next,
+});
+
+const fetchFollowedHashtagsFail = (error: AxiosError) => ({
+  type: FOLLOWED_HASHTAGS_FETCH_FAIL,
+  error,
+});
+
+const expandFollowedHashtags = () => (dispatch: AppDispatch, getState: () => RootState) => {
+  const url = getState().followed_tags.next;
+
+  if (url === null) {
+    return;
+  }
+
+  dispatch(expandFollowedHashtagsRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(expandFollowedHashtagsSuccess(response.data, next ? next.uri : null));
+  }).catch(error => {
+    dispatch(expandFollowedHashtagsFail(error));
+  });
+};
+
+const expandFollowedHashtagsRequest = () => ({
+  type: FOLLOWED_HASHTAGS_EXPAND_REQUEST,
+});
+
+const expandFollowedHashtagsSuccess = (followed_tags: APIEntity[], next: string | null) => ({
+  type: FOLLOWED_HASHTAGS_EXPAND_SUCCESS,
+  followed_tags,
+  next,
+});
+
+const expandFollowedHashtagsFail = (error: AxiosError) => ({
+  type: FOLLOWED_HASHTAGS_EXPAND_FAIL,
+  error,
+});
+
+
+export {
+  HASHTAG_FETCH_REQUEST,
+  HASHTAG_FETCH_SUCCESS,
+  HASHTAG_FETCH_FAIL,
+  HASHTAG_FOLLOW_REQUEST,
+  HASHTAG_FOLLOW_SUCCESS,
+  HASHTAG_FOLLOW_FAIL,
+  HASHTAG_UNFOLLOW_REQUEST,
+  HASHTAG_UNFOLLOW_SUCCESS,
+  HASHTAG_UNFOLLOW_FAIL,
+  FOLLOWED_HASHTAGS_FETCH_REQUEST,
+  FOLLOWED_HASHTAGS_FETCH_SUCCESS,
+  FOLLOWED_HASHTAGS_FETCH_FAIL,
+  FOLLOWED_HASHTAGS_EXPAND_REQUEST,
+  FOLLOWED_HASHTAGS_EXPAND_SUCCESS,
+  FOLLOWED_HASHTAGS_EXPAND_FAIL,
+  fetchHashtag,
+  fetchHashtagRequest,
+  fetchHashtagSuccess,
+  fetchHashtagFail,
+  followHashtag,
+  followHashtagRequest,
+  followHashtagSuccess,
+  followHashtagFail,
+  unfollowHashtag,
+  unfollowHashtagRequest,
+  unfollowHashtagSuccess,
+  unfollowHashtagFail,
+  fetchFollowedHashtags,
+  fetchFollowedHashtagsRequest,
+  fetchFollowedHashtagsSuccess,
+  fetchFollowedHashtagsFail,
+  expandFollowedHashtags,
+  expandFollowedHashtagsRequest,
+  expandFollowedHashtagsSuccess,
+  expandFollowedHashtagsFail,
+};

app/soapbox/actions/timelines.ts

@@ -4,31 +4,32 @@ import { getSettings } from 'soapbox/actions/settings';
 import { normalizeStatus } from 'soapbox/normalizers';
 import { shouldFilter } from 'soapbox/utils/timelines';
 
-import api, { getLinks } from '../api';
+import api, { getNextLink, getPrevLink } from '../api';
 
+import { fetchGroupRelationships } from './groups';
 import { importFetchedStatus, importFetchedStatuses } from './importer';
 
 import type { AxiosError } from 'axios';
 import type { AppDispatch, RootState } from 'soapbox/store';
 import type { APIEntity, Status } from 'soapbox/types/entities';
 
-const TIMELINE_UPDATE = 'TIMELINE_UPDATE';
-const TIMELINE_DELETE = 'TIMELINE_DELETE';
-const TIMELINE_CLEAR = 'TIMELINE_CLEAR';
-const TIMELINE_UPDATE_QUEUE = 'TIMELINE_UPDATE_QUEUE';
-const TIMELINE_DEQUEUE = 'TIMELINE_DEQUEUE';
-const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP';
+const TIMELINE_UPDATE = 'TIMELINE_UPDATE' as const;
+const TIMELINE_DELETE = 'TIMELINE_DELETE' as const;
+const TIMELINE_CLEAR = 'TIMELINE_CLEAR' as const;
+const TIMELINE_UPDATE_QUEUE = 'TIMELINE_UPDATE_QUEUE' as const;
+const TIMELINE_DEQUEUE = 'TIMELINE_DEQUEUE' as const;
+const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP' as const;
 
-const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST';
-const TIMELINE_EXPAND_SUCCESS = 'TIMELINE_EXPAND_SUCCESS';
-const TIMELINE_EXPAND_FAIL = 'TIMELINE_EXPAND_FAIL';
+const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST' as const;
+const TIMELINE_EXPAND_SUCCESS = 'TIMELINE_EXPAND_SUCCESS' as const;
+const TIMELINE_EXPAND_FAIL = 'TIMELINE_EXPAND_FAIL' as const;
 
-const TIMELINE_CONNECT = 'TIMELINE_CONNECT';
-const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT';
+const TIMELINE_CONNECT = 'TIMELINE_CONNECT' as const;
+const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT' as const;
 
-const TIMELINE_REPLACE = 'TIMELINE_REPLACE';
-const TIMELINE_INSERT = 'TIMELINE_INSERT';
-const TIMELINE_CLEAR_FEED_ACCOUNT_ID = 'TIMELINE_CLEAR_FEED_ACCOUNT_ID';
+const TIMELINE_REPLACE = 'TIMELINE_REPLACE' as const;
+const TIMELINE_INSERT = 'TIMELINE_INSERT' as const;
+const TIMELINE_CLEAR_FEED_ACCOUNT_ID = 'TIMELINE_CLEAR_FEED_ACCOUNT_ID' as const;
 
 const MAX_QUEUED_ITEMS = 40;
 
@@ -39,7 +40,7 @@ const processTimelineUpdate = (timeline: string, status: APIEntity, accept: ((st
     const hasPendingStatuses = !getState().pending_statuses.isEmpty();
 
     const columnSettings = getSettings(getState()).get(timeline, ImmutableMap());
-    const shouldSkipQueue = shouldFilter(normalizeStatus(status) as Status, columnSettings);
+    const shouldSkipQueue = shouldFilter(normalizeStatus(status) as Status, columnSettings as any);
 
     if (ownStatus && hasPendingStatuses) {
       // WebSockets push statuses without the Idempotency-Key,
@@ -110,19 +111,29 @@ const dequeueTimeline = (timelineId: string, expandFunc?: (lastStatusId: string)
     }
   };
 
+interface TimelineDeleteAction {
+  type: typeof TIMELINE_DELETE
+  id: string
+  accountId: string
+  references: ImmutableMap<string, readonly [statusId: string, accountId: string]>
+  reblogOf: unknown
+}
+
 const deleteFromTimelines = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const accountId = getState().statuses.get(id)?.account;
-    const references = getState().statuses.filter(status => status.get('reblog') === id).map(status => [status.get('id'), status.get('account')]);
+    const accountId = getState().statuses.get(id)?.account?.id!;
+    const references = getState().statuses.filter(status => status.reblog === id).map(status => [status.id, status.account.id] as const);
     const reblogOf = getState().statuses.getIn([id, 'reblog'], null);
 
-    dispatch({
+    const action: TimelineDeleteAction = {
       type: TIMELINE_DELETE,
       id,
       accountId,
       references,
       reblogOf,
-    });
+    };
+
+    dispatch(action);
   };
 
 const clearTimeline = (timeline: string) =>
@@ -139,7 +150,7 @@ const parseTags = (tags: Record<string, any[]> = {}, mode: 'any' | 'all' | 'none
 };
 
 const replaceHomeTimeline = (
-  accountId: string | null,
+  accountId: string | undefined,
   { maxId }: Record<string, any> = {},
   done?: () => void,
 ) => (dispatch: AppDispatch, _getState: () => RootState) => {
@@ -162,7 +173,12 @@ const expandTimeline = (timelineId: string, path: string, params: Record<string,
       return dispatch(noOpAsync());
     }
 
-    if (!params.max_id && !params.pinned && (timeline.items || ImmutableOrderedSet()).size > 0) {
+    if (
+      !params.max_id &&
+      !params.pinned &&
+      (timeline.items || ImmutableOrderedSet()).size > 0 &&
+      !path.includes('max_id=')
+    ) {
       params.since_id = timeline.getIn(['items', 0]);
     }
 
@@ -171,9 +187,20 @@ const expandTimeline = (timelineId: string, path: string, params: Record<string,
     dispatch(expandTimelineRequest(timelineId, isLoadingMore));
 
     return api(getState).get(path, { params }).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
-      dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore));
+
+      const statusesFromGroups = (response.data as Status[]).filter((status) => !!status.group);
+      dispatch(fetchGroupRelationships(statusesFromGroups.map((status: any) => status.group?.id)));
+
+      dispatch(expandTimelineSuccess(
+        timelineId,
+        response.data,
+        getNextLink(response),
+        getPrevLink(response),
+        response.status === 206,
+        isLoadingRecent,
+        isLoadingMore,
+      ));
       done();
     }).catch(error => {
       dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
@@ -181,9 +208,26 @@ const expandTimeline = (timelineId: string, path: string, params: Record<string,
     });
   };
 
-const expandHomeTimeline = ({ accountId, maxId }: Record<string, any> = {}, done = noOp) => {
-  const endpoint = accountId ? `/api/v1/accounts/${accountId}/statuses` : '/api/v1/timelines/home';
-  const params: any = { max_id: maxId };
+interface ExpandHomeTimelineOpts {
+  accountId?: string
+  maxId?: string
+  url?: string
+}
+
+interface HomeTimelineParams {
+  max_id?: string
+  exclude_replies?: boolean
+  with_muted?: boolean
+}
+
+const expandHomeTimeline = ({ url, accountId, maxId }: ExpandHomeTimelineOpts = {}, done = noOp) => {
+  const endpoint = url || (accountId ? `/api/v1/accounts/${accountId}/statuses` : '/api/v1/timelines/home');
+  const params: HomeTimelineParams = {};
+
+  if (!url && maxId) {
+    params.max_id = maxId;
+  }
+
   if (accountId) {
     params.exclude_replies = true;
     params.with_muted = true;
@@ -192,38 +236,44 @@ const expandHomeTimeline = ({ accountId, maxId }: Record<string, any> = {}, done
   return expandTimeline('home', endpoint, params, done);
 };
 
-const expandPublicTimeline = ({ maxId, onlyMedia }: Record<string, any> = {}, done = noOp) =>
-  expandTimeline(`public${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { max_id: maxId, only_media: !!onlyMedia }, done);
+const expandPublicTimeline = ({ url, maxId, onlyMedia }: Record<string, any> = {}, done = noOp) =>
+  expandTimeline(`public${onlyMedia ? ':media' : ''}`, url || '/api/v1/timelines/public', url ? {} : { max_id: maxId, only_media: !!onlyMedia }, done);
 
-const expandRemoteTimeline = (instance: string, { maxId, onlyMedia }: Record<string, any> = {}, done = noOp) =>
-  expandTimeline(`remote${onlyMedia ? ':media' : ''}:${instance}`, '/api/v1/timelines/public', { local: false, instance: instance, max_id: maxId, only_media: !!onlyMedia }, done);
+const expandRemoteTimeline = (instance: string, { url, maxId, onlyMedia }: Record<string, any> = {}, done = noOp) =>
+  expandTimeline(`remote${onlyMedia ? ':media' : ''}:${instance}`, url || '/api/v1/timelines/public', url ? {} : { local: false, instance: instance, max_id: maxId, only_media: !!onlyMedia }, done);
 
-const expandCommunityTimeline = ({ maxId, onlyMedia }: Record<string, any> = {}, done = noOp) =>
-  expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
+const expandCommunityTimeline = ({ url, maxId, onlyMedia }: Record<string, any> = {}, done = noOp) =>
+  expandTimeline(`community${onlyMedia ? ':media' : ''}`, url || '/api/v1/timelines/public', url ? {} : { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
 
-const expandDirectTimeline = ({ maxId }: Record<string, any> = {}, done = noOp) =>
-  expandTimeline('direct', '/api/v1/timelines/direct', { max_id: maxId }, done);
+const expandDirectTimeline = ({ url, maxId }: Record<string, any> = {}, done = noOp) =>
+  expandTimeline('direct', url || '/api/v1/timelines/direct', url ? {} : { max_id: maxId }, done);
 
-const expandAccountTimeline = (accountId: string, { maxId, withReplies }: Record<string, any> = {}) =>
-  expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, max_id: maxId, with_muted: true });
+const expandAccountTimeline = (accountId: string, { url, maxId, withReplies }: Record<string, any> = {}) =>
+  expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}`, url || `/api/v1/accounts/${accountId}/statuses`, url ? {} : { exclude_replies: !withReplies, max_id: maxId, with_muted: true });
 
 const expandAccountFeaturedTimeline = (accountId: string) =>
   expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, with_muted: true });
 
-const expandAccountMediaTimeline = (accountId: string | number, { maxId }: Record<string, any> = {}) =>
-  expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40, with_muted: true });
+const expandAccountMediaTimeline = (accountId: string | number, { url, maxId }: Record<string, any> = {}) =>
+  expandTimeline(`account:${accountId}:media`, url || `/api/v1/accounts/${accountId}/statuses`, url ? {} : { max_id: maxId, only_media: true, limit: 40, with_muted: true });
 
-const expandListTimeline = (id: string, { maxId }: Record<string, any> = {}, done = noOp) =>
-  expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
+const expandListTimeline = (id: string, { url, maxId }: Record<string, any> = {}, done = noOp) =>
+  expandTimeline(`list:${id}`, url || `/api/v1/timelines/list/${id}`, url ? {} : { max_id: maxId }, done);
 
 const expandGroupTimeline = (id: string, { maxId }: Record<string, any> = {}, done = noOp) =>
   expandTimeline(`group:${id}`, `/api/v1/timelines/group/${id}`, { max_id: maxId }, done);
 
+const expandGroupFeaturedTimeline = (id: string) =>
+  expandTimeline(`group:${id}:pinned`, `/api/v1/timelines/group/${id}`, { pinned: true });
+
+const expandGroupTimelineFromTag = (id: string, tagName: string, { maxId }: Record<string, any> = {}, done = noOp) =>
+  expandTimeline(`group:tags:${id}:${tagName}`, `/api/v1/timelines/group/${id}/tags/${tagName}`, { max_id: maxId }, done);
+
 const expandGroupMediaTimeline = (id: string | number, { maxId }: Record<string, any> = {}) =>
   expandTimeline(`group:${id}:media`, `/api/v1/timelines/group/${id}`, { max_id: maxId, only_media: true, limit: 40, with_muted: true });
 
-const expandHashtagTimeline = (hashtag: string, { maxId, tags }: Record<string, any> = {}, done = noOp) => {
-  return expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`, {
+const expandHashtagTimeline = (hashtag: string, { url, maxId, tags }: Record<string, any> = {}, done = noOp) => {
+  return expandTimeline(`hashtag:${hashtag}`, url || `/api/v1/timelines/tag/${hashtag}`, url ? {} : {
     max_id: maxId,
     any: parseTags(tags, 'any'),
     all: parseTags(tags, 'all'),
@@ -237,11 +287,20 @@ const expandTimelineRequest = (timeline: string, isLoadingMore: boolean) => ({
   skipLoading: !isLoadingMore,
 });
 
-const expandTimelineSuccess = (timeline: string, statuses: APIEntity[], next: string | null, partial: boolean, isLoadingRecent: boolean, isLoadingMore: boolean) => ({
+const expandTimelineSuccess = (
+  timeline: string,
+  statuses: APIEntity[],
+  next: string | undefined,
+  prev: string | undefined,
+  partial: boolean,
+  isLoadingRecent: boolean,
+  isLoadingMore: boolean,
+) => ({
   type: TIMELINE_EXPAND_SUCCESS,
   timeline,
   statuses,
   next,
+  prev,
   partial,
   isLoadingRecent,
   skipLoading: !isLoadingMore,
@@ -278,6 +337,9 @@ const clearFeedAccountId = () => (dispatch: AppDispatch, _getState: () => RootSt
   dispatch({ type: TIMELINE_CLEAR_FEED_ACCOUNT_ID });
 };
 
+// TODO: other actions
+type TimelineAction = TimelineDeleteAction;
+
 export {
   TIMELINE_UPDATE,
   TIMELINE_DELETE,
@@ -312,6 +374,8 @@ export {
   expandAccountMediaTimeline,
   expandListTimeline,
   expandGroupTimeline,
+  expandGroupFeaturedTimeline,
+  expandGroupTimelineFromTag,
   expandGroupMediaTimeline,
   expandHashtagTimeline,
   expandTimelineRequest,
@@ -322,4 +386,5 @@ export {
   scrollTopTimeline,
   insertSuggestionsIntoTimeline,
   clearFeedAccountId,
+  type TimelineAction,
 };

app/soapbox/actions/verification.ts

@@ -31,14 +31,14 @@ const AGE: Challenge = 'age';
 export type Challenge = 'age' | 'sms' | 'email'
 
 type Challenges = {
-  email?: 0 | 1,
-  sms?: 0 | 1,
-  age?: 0 | 1,
+  email?: 0 | 1
+  sms?: 0 | 1
+  age?: 0 | 1
 }
 
 type Verification = {
-  token?: string,
-  challenges?: Challenges,
+  token?: string
+  challenges?: Challenges
   challengeTypes?: Array<'age' | 'sms' | 'email'>
 };
 

app/soapbox/api/__mocks__/index.ts

@@ -1,10 +1,10 @@
-import { jest } from '@jest/globals';
 import MockAdapter from 'axios-mock-adapter';
 import LinkHeader from 'http-link-header';
+import { vi } from 'vitest';
 
 import type { AxiosInstance, AxiosResponse } from 'axios';
 
-const api = jest.requireActual('../index') as Record<string, Function>;
+const api = await vi.importActual('../index') as Record<string, Function>;
 let mocks: Array<Function> = [];
 
 export const __stub = (func: (mock: MockAdapter) => void) => mocks.push(func);
@@ -23,7 +23,12 @@ export const getLinks = (response: AxiosResponse): LinkHeader => {
 
 export const getNextLink = (response: AxiosResponse) => {
   const nextLink = new LinkHeader(response.headers?.link);
-  return nextLink.refs.find((ref) => ref.uri)?.uri;
+  return nextLink.refs.find(link => link.rel === 'next')?.uri;
+};
+
+export const getPrevLink = (response: AxiosResponse) => {
+  const prevLink = new LinkHeader(response.headers?.link);
+  return prevLink.refs.find(link => link.rel === 'prev')?.uri;
 };
 
 export const baseClient = (...params: any[]) => {

app/soapbox/api/hooks/accounts/useAccount.ts

@@ -0,0 +1,58 @@
+import { useEffect, useMemo } from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useFeatures, useLoggedIn } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { type Account, accountSchema } from 'soapbox/schemas';
+
+import { useRelationship } from './useRelationship';
+
+interface UseAccountOpts {
+  withRelationship?: boolean
+}
+
+function useAccount(accountId?: string, opts: UseAccountOpts = {}) {
+  const api = useApi();
+  const history = useHistory();
+  const features = useFeatures();
+  const { me } = useLoggedIn();
+  const { withRelationship } = opts;
+
+  const { entity, isUnauthorized, ...result } = useEntity<Account>(
+    [Entities.ACCOUNTS, accountId!],
+    () => api.get(`/api/v1/accounts/${accountId}`),
+    { schema: accountSchema, enabled: !!accountId },
+  );
+
+  const {
+    relationship,
+    isLoading: isRelationshipLoading,
+  } = useRelationship(accountId, { enabled: withRelationship });
+
+  const isBlocked = entity?.relationship?.blocked_by === true;
+  const isUnavailable = (me === entity?.id) ? false : (isBlocked && !features.blockersVisible);
+
+  const account = useMemo(
+    () => entity ? { ...entity, relationship } : undefined,
+    [entity, relationship],
+  );
+
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
+  return {
+    ...result,
+    isLoading: result.isLoading,
+    isRelationshipLoading,
+    isUnauthorized,
+    isUnavailable,
+    account,
+  };
+}
+
+export { useAccount };

app/soapbox/api/hooks/accounts/useAccountList.ts

@@ -0,0 +1,70 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { Account, accountSchema } from 'soapbox/schemas';
+
+import { useRelationships } from './useRelationships';
+
+import type { EntityFn } from 'soapbox/entity-store/hooks/types';
+
+interface useAccountListOpts {
+  enabled?: boolean
+}
+
+function useAccountList(listKey: string[], entityFn: EntityFn<void>, opts: useAccountListOpts = {}) {
+  const { entities, ...rest } = useEntities(
+    [Entities.ACCOUNTS, ...listKey],
+    entityFn,
+    { schema: accountSchema, enabled: opts.enabled },
+  );
+
+  const { relationships } = useRelationships(
+    listKey,
+    entities.map(({ id }) => id),
+  );
+
+  const accounts: Account[] = entities.map((account) => ({
+    ...account,
+    relationship: relationships[account.id],
+  }));
+
+  return { accounts, ...rest };
+}
+
+function useBlocks() {
+  const api = useApi();
+  return useAccountList(['blocks'], () => api.get('/api/v1/blocks'));
+}
+
+function useMutes() {
+  const api = useApi();
+  return useAccountList(['mutes'], () => api.get('/api/v1/mutes'));
+}
+
+function useFollowing(accountId: string | undefined) {
+  const api = useApi();
+
+  return useAccountList(
+    [accountId!, 'following'],
+    () => api.get(`/api/v1/accounts/${accountId}/following`),
+    { enabled: !!accountId },
+  );
+}
+
+function useFollowers(accountId: string | undefined) {
+  const api = useApi();
+
+  return useAccountList(
+    [accountId!, 'followers'],
+    () => api.get(`/api/v1/accounts/${accountId}/followers`),
+    { enabled: !!accountId },
+  );
+}
+
+export {
+  useAccountList,
+  useBlocks,
+  useMutes,
+  useFollowing,
+  useFollowers,
+};

app/soapbox/api/hooks/accounts/useAccountLookup.ts

@@ -0,0 +1,54 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityLookup } from 'soapbox/entity-store/hooks';
+import { useFeatures, useLoggedIn } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { type Account, accountSchema } from 'soapbox/schemas';
+
+import { useRelationship } from './useRelationship';
+
+interface UseAccountLookupOpts {
+  withRelationship?: boolean
+}
+
+function useAccountLookup(acct: string | undefined, opts: UseAccountLookupOpts = {}) {
+  const api = useApi();
+  const features = useFeatures();
+  const history = useHistory();
+  const { me } = useLoggedIn();
+  const { withRelationship } = opts;
+
+  const { entity: account, isUnauthorized, ...result } = useEntityLookup<Account>(
+    Entities.ACCOUNTS,
+    (account) => account.acct.toLowerCase() === acct?.toLowerCase(),
+    () => api.get(`/api/v1/accounts/lookup?acct=${acct}`),
+    { schema: accountSchema, enabled: !!acct },
+  );
+
+  const {
+    relationship,
+    isLoading: isRelationshipLoading,
+  } = useRelationship(account?.id, { enabled: withRelationship });
+
+  const isBlocked = account?.relationship?.blocked_by === true;
+  const isUnavailable = (me === account?.id) ? false : (isBlocked && !features.blockersVisible);
+
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
+  return {
+    ...result,
+    isLoading: result.isLoading,
+    isRelationshipLoading,
+    isUnauthorized,
+    isUnavailable,
+    account: account ? { ...account, relationship } : undefined,
+  };
+}
+
+export { useAccountLookup };

app/soapbox/api/hooks/accounts/useFollow.ts

@@ -0,0 +1,88 @@
+import { importEntities } from 'soapbox/entity-store/actions';
+import { Entities } from 'soapbox/entity-store/entities';
+import { useTransaction } from 'soapbox/entity-store/hooks';
+import { useAppDispatch, useLoggedIn } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { relationshipSchema } from 'soapbox/schemas';
+
+interface FollowOpts {
+  reblogs?: boolean
+  notify?: boolean
+  languages?: string[]
+}
+
+function useFollow() {
+  const api = useApi();
+  const dispatch = useAppDispatch();
+  const { isLoggedIn } = useLoggedIn();
+  const { transaction } = useTransaction();
+
+  function followEffect(accountId: string) {
+    transaction({
+      Accounts: {
+        [accountId]: (account) => ({
+          ...account,
+          followers_count: account.followers_count + 1,
+        }),
+      },
+      Relationships: {
+        [accountId]: (relationship) => ({
+          ...relationship,
+          following: true,
+        }),
+      },
+    });
+  }
+
+  function unfollowEffect(accountId: string) {
+    transaction({
+      Accounts: {
+        [accountId]: (account) => ({
+          ...account,
+          followers_count: Math.max(0, account.followers_count - 1),
+        }),
+      },
+      Relationships: {
+        [accountId]: (relationship) => ({
+          ...relationship,
+          following: false,
+        }),
+      },
+    });
+  }
+
+  async function follow(accountId: string, options: FollowOpts = {}) {
+    if (!isLoggedIn) return;
+    followEffect(accountId);
+
+    try {
+      const response = await api.post(`/api/v1/accounts/${accountId}/follow`, options);
+      const result = relationshipSchema.safeParse(response.data);
+      if (result.success) {
+        dispatch(importEntities([result.data], Entities.RELATIONSHIPS));
+      }
+    } catch (e) {
+      unfollowEffect(accountId);
+    }
+  }
+
+  async function unfollow(accountId: string) {
+    if (!isLoggedIn) return;
+    unfollowEffect(accountId);
+
+    try {
+      await api.post(`/api/v1/accounts/${accountId}/unfollow`);
+    } catch (e) {
+      followEffect(accountId);
+    }
+  }
+
+  return {
+    follow,
+    unfollow,
+    followEffect,
+    unfollowEffect,
+  };
+}
+
+export { useFollow };

app/soapbox/api/hooks/accounts/usePatronUser.ts

@@ -0,0 +1,18 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { type PatronUser, patronUserSchema } from 'soapbox/schemas';
+
+function usePatronUser(url?: string) {
+  const api = useApi();
+
+  const { entity: patronUser, ...result } = useEntity<PatronUser>(
+    [Entities.PATRON_USERS, url || ''],
+    () => api.get(`/api/patron/v1/accounts/${encodeURIComponent(url!)}`),
+    { schema: patronUserSchema, enabled: !!url },
+  );
+
+  return { patronUser, ...result };
+}
+
+export { usePatronUser };

app/soapbox/api/hooks/accounts/useRelationship.ts

@@ -0,0 +1,28 @@
+import { z } from 'zod';
+
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { type Relationship, relationshipSchema } from 'soapbox/schemas';
+
+interface UseRelationshipOpts {
+  enabled?: boolean
+}
+
+function useRelationship(accountId: string | undefined, opts: UseRelationshipOpts = {}) {
+  const api = useApi();
+  const { enabled = false } = opts;
+
+  const { entity: relationship, ...result } = useEntity<Relationship>(
+    [Entities.RELATIONSHIPS, accountId!],
+    () => api.get(`/api/v1/accounts/relationships?id[]=${accountId}`),
+    {
+      enabled: enabled && !!accountId,
+      schema: z.array(relationshipSchema).nonempty().transform(arr => arr[0]),
+    },
+  );
+
+  return { relationship, ...result };
+}
+
+export { useRelationship };

app/soapbox/api/hooks/accounts/useRelationships.ts

@@ -0,0 +1,26 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useBatchedEntities } from 'soapbox/entity-store/hooks/useBatchedEntities';
+import { useLoggedIn } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { type Relationship, relationshipSchema } from 'soapbox/schemas';
+
+function useRelationships(listKey: string[], ids: string[]) {
+  const api = useApi();
+  const { isLoggedIn } = useLoggedIn();
+
+  function fetchRelationships(ids: string[]) {
+    const q = ids.map((id) => `id[]=${id}`).join('&');
+    return api.get(`/api/v1/accounts/relationships?${q}`);
+  }
+
+  const { entityMap: relationships, ...result } = useBatchedEntities<Relationship>(
+    [Entities.RELATIONSHIPS, ...listKey],
+    ids,
+    fetchRelationships,
+    { schema: relationshipSchema, enabled: isLoggedIn },
+  );
+
+  return { relationships, ...result };
+}
+
+export { useRelationships };

app/soapbox/api/hooks/admin/index.ts

@@ -0,0 +1,2 @@
+export { useSuggest } from './useSuggest';
+export { useVerify } from './useVerify';

app/soapbox/api/hooks/admin/useSuggest.ts

@@ -0,0 +1,58 @@
+import { useTransaction } from 'soapbox/entity-store/hooks';
+import { EntityCallbacks } from 'soapbox/entity-store/hooks/types';
+import { useApi, useGetState } from 'soapbox/hooks';
+import { accountIdsToAccts } from 'soapbox/selectors';
+
+import type { Account } from 'soapbox/schemas';
+
+function useSuggest() {
+  const api = useApi();
+  const getState = useGetState();
+  const { transaction } = useTransaction();
+
+  function suggestEffect(accountIds: string[], suggested: boolean) {
+    const updater = (account: Account): Account => {
+      if (account.pleroma) {
+        account.pleroma.is_suggested = suggested;
+      }
+      return account;
+    };
+
+    transaction({
+      Accounts: accountIds.reduce<Record<string, (account: Account) => Account>>(
+        (result, id) => ({ ...result, [id]: updater }),
+      {}),
+    });
+  }
+
+  async function suggest(accountIds: string[], callbacks?: EntityCallbacks<void, unknown>) {
+    const accts = accountIdsToAccts(getState(), accountIds);
+    suggestEffect(accountIds, true);
+    try {
+      await api.patch('/api/v1/pleroma/admin/users/suggest', { nicknames: accts });
+      callbacks?.onSuccess?.();
+    } catch (e) {
+      callbacks?.onError?.(e);
+      suggestEffect(accountIds, false);
+    }
+  }
+
+  async function unsuggest(accountIds: string[], callbacks?: EntityCallbacks<void, unknown>) {
+    const accts = accountIdsToAccts(getState(), accountIds);
+    suggestEffect(accountIds, false);
+    try {
+      await api.patch('/api/v1/pleroma/admin/users/unsuggest', { nicknames: accts });
+      callbacks?.onSuccess?.();
+    } catch (e) {
+      callbacks?.onError?.(e);
+      suggestEffect(accountIds, true);
+    }
+  }
+
+  return {
+    suggest,
+    unsuggest,
+  };
+}
+
+export { useSuggest };

app/soapbox/api/hooks/admin/useVerify.ts

@@ -0,0 +1,63 @@
+import { useTransaction } from 'soapbox/entity-store/hooks';
+import { EntityCallbacks } from 'soapbox/entity-store/hooks/types';
+import { useApi, useGetState } from 'soapbox/hooks';
+import { accountIdsToAccts } from 'soapbox/selectors';
+
+import type { Account } from 'soapbox/schemas';
+
+function useVerify() {
+  const api = useApi();
+  const getState = useGetState();
+  const { transaction } = useTransaction();
+
+  function verifyEffect(accountIds: string[], verified: boolean) {
+    const updater = (account: Account): Account => {
+      if (account.pleroma) {
+        const tags = account.pleroma.tags.filter((tag) => tag !== 'verified');
+        if (verified) {
+          tags.push('verified');
+        }
+        account.pleroma.tags = tags;
+      }
+      account.verified = verified;
+      return account;
+    };
+
+    transaction({
+      Accounts: accountIds.reduce<Record<string, (account: Account) => Account>>(
+        (result, id) => ({ ...result, [id]: updater }),
+      {}),
+    });
+  }
+
+  async function verify(accountIds: string[], callbacks?: EntityCallbacks<void, unknown>) {
+    const accts = accountIdsToAccts(getState(), accountIds);
+    verifyEffect(accountIds, true);
+    try {
+      await api.put('/api/v1/pleroma/admin/users/tag', { nicknames: accts, tags: ['verified'] });
+      callbacks?.onSuccess?.();
+    } catch (e) {
+      callbacks?.onError?.(e);
+      verifyEffect(accountIds, false);
+    }
+  }
+
+  async function unverify(accountIds: string[], callbacks?: EntityCallbacks<void, unknown>) {
+    const accts = accountIdsToAccts(getState(), accountIds);
+    verifyEffect(accountIds, false);
+    try {
+      await api.delete('/api/v1/pleroma/admin/users/tag', { data: { nicknames: accts, tags: ['verified'] } });
+      callbacks?.onSuccess?.();
+    } catch (e) {
+      callbacks?.onError?.(e);
+      verifyEffect(accountIds, true);
+    }
+  }
+
+  return {
+    verify,
+    unverify,
+  };
+}
+
+export { useVerify };

app/soapbox/api/hooks/groups/__tests__/useGroup.test.ts

@@ -0,0 +1,41 @@
+import { __stub } from 'soapbox/api';
+import { buildGroup } from 'soapbox/jest/factory';
+import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
+
+import { useGroup } from '../useGroup';
+
+const group = buildGroup({ id: '1', display_name: 'soapbox' });
+
+describe('useGroup hook', () => {
+  describe('with a successful request', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/groups/${group.id}`).reply(200, group);
+      });
+    });
+
+    it('is successful', async () => {
+      const { result } = renderHook(() => useGroup(group.id));
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.group?.id).toBe(group.id);
+    });
+  });
+
+  describe('with an unsuccessful query', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/groups/${group.id}`).networkError();
+      });
+    });
+
+    it('is has error state', async() => {
+      const { result } = renderHook(() => useGroup(group.id));
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.group).toBeUndefined();
+    });
+  });
+});

app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts

@@ -0,0 +1,42 @@
+import { __stub } from 'soapbox/api';
+import { buildGroup } from 'soapbox/jest/factory';
+import { renderHook, rootState, waitFor } from 'soapbox/jest/test-helpers';
+
+import { useGroupLookup } from '../useGroupLookup';
+
+const group = buildGroup({ id: '1', slug: 'soapbox' });
+const state = rootState.setIn(['instance', 'version'], '3.4.1 (compatible; TruthSocial 1.0.0)');
+
+describe('useGroupLookup hook', () => {
+  describe('with a successful request', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/groups/lookup?name=${group.slug}`).reply(200, group);
+      });
+    });
+
+    it('is successful', async () => {
+      const { result } = renderHook(() => useGroupLookup(group.slug), undefined, state);
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.entity?.id).toBe(group.id);
+    });
+  });
+
+  describe('with an unsuccessful query', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/groups/lookup?name=${group.slug}`).networkError();
+      });
+    });
+
+    it('is has error state', async() => {
+      const { result } = renderHook(() => useGroupLookup(group.slug), undefined, state);
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.entity).toBeUndefined();
+    });
+  });
+});

app/soapbox/api/hooks/groups/__tests__/useGroupMedia.test.ts

@@ -0,0 +1,44 @@
+import { __stub } from 'soapbox/api';
+import { buildStatus } from 'soapbox/jest/factory';
+import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
+
+import { useGroupMedia } from '../useGroupMedia';
+
+const status = buildStatus();
+const groupId = '1';
+
+describe('useGroupMedia hook', () => {
+  describe('with a successful request', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/timelines/group/${groupId}?only_media=true`).reply(200, [status]);
+      });
+    });
+
+    it('is successful', async () => {
+      const { result } = renderHook(() => useGroupMedia(groupId));
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.entities.length).toBe(1);
+      expect(result.current.entities[0].id).toBe(status.id);
+    });
+  });
+
+  describe('with an unsuccessful query', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/timelines/group/${groupId}?only_media=true`).networkError();
+      });
+    });
+
+    it('is has error state', async() => {
+      const { result } = renderHook(() => useGroupMedia(groupId));
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.entities.length).toBe(0);
+      expect(result.current.isError).toBeTruthy();
+    });
+  });
+});

app/soapbox/api/hooks/groups/__tests__/useGroupMembers.test.ts

@@ -0,0 +1,45 @@
+import { __stub } from 'soapbox/api';
+import { buildGroupMember } from 'soapbox/jest/factory';
+import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
+import { GroupRoles } from 'soapbox/schemas/group-member';
+
+import { useGroupMembers } from '../useGroupMembers';
+
+const groupMember = buildGroupMember();
+const groupId = '1';
+
+describe('useGroupMembers hook', () => {
+  describe('with a successful request', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/groups/${groupId}/memberships?role=${GroupRoles.ADMIN}`).reply(200, [groupMember]);
+      });
+    });
+
+    it('is successful', async () => {
+      const { result } = renderHook(() => useGroupMembers(groupId, GroupRoles.ADMIN));
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.groupMembers.length).toBe(1);
+      expect(result.current.groupMembers[0].id).toBe(groupMember.id);
+    });
+  });
+
+  describe('with an unsuccessful query', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/groups/${groupId}/memberships?role=${GroupRoles.ADMIN}`).networkError();
+      });
+    });
+
+    it('is has error state', async() => {
+      const { result } = renderHook(() => useGroupMembers(groupId, GroupRoles.ADMIN));
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.groupMembers.length).toBe(0);
+      expect(result.current.isError).toBeTruthy();
+    });
+  });
+});

app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts

@@ -0,0 +1,47 @@
+import { __stub } from 'soapbox/api';
+import { buildGroup } from 'soapbox/jest/factory';
+import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
+import { normalizeInstance } from 'soapbox/normalizers';
+
+import { useGroups } from '../useGroups';
+
+const group = buildGroup({ id: '1', display_name: 'soapbox' });
+const store = {
+  instance: normalizeInstance({
+    version: '3.4.1 (compatible; TruthSocial 1.0.0+unreleased)',
+  }),
+};
+
+describe('useGroups hook', () => {
+  describe('with a successful request', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet('/api/v1/groups').reply(200, [group]);
+      });
+    });
+
+    it('is successful', async () => {
+      const { result } = renderHook(useGroups, undefined, store);
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.groups).toHaveLength(1);
+    });
+  });
+
+  describe('with an unsuccessful query', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet('/api/v1/groups').networkError();
+      });
+    });
+
+    it('is has error state', async() => {
+      const { result } = renderHook(useGroups, undefined, store);
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.groups).toHaveLength(0);
+    });
+  });
+});

app/soapbox/api/hooks/groups/__tests__/usePendingGroups.test.ts

@@ -0,0 +1,64 @@
+import { __stub } from 'soapbox/api';
+import { Entities } from 'soapbox/entity-store/entities';
+import { buildAccount, buildGroup } from 'soapbox/jest/factory';
+import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
+import { normalizeInstance } from 'soapbox/normalizers';
+
+import { usePendingGroups } from '../usePendingGroups';
+
+const id = '1';
+const group = buildGroup({ id, display_name: 'soapbox' });
+const store = {
+  instance: normalizeInstance({
+    version: '3.4.1 (compatible; TruthSocial 1.0.0+unreleased)',
+  }),
+  me: '1',
+  entities: {
+    [Entities.ACCOUNTS]: {
+      store: {
+        [id]: buildAccount({
+          id,
+          acct: 'tiger',
+          display_name: 'Tiger',
+          avatar: 'test.jpg',
+          verified: true,
+        }),
+      },
+      lists: {},
+    },
+  },
+};
+
+describe('usePendingGroups hook', () => {
+  describe('with a successful request', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet('/api/v1/groups').reply(200, [group]);
+      });
+    });
+
+    it('is successful', async () => {
+      const { result } = renderHook(usePendingGroups, undefined, store);
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.groups).toHaveLength(1);
+    });
+  });
+
+  describe('with an unsuccessful query', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet('/api/v1/groups').networkError();
+      });
+    });
+
+    it('is has error state', async() => {
+      const { result } = renderHook(usePendingGroups, undefined, store);
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.groups).toHaveLength(0);
+    });
+  });
+});

app/soapbox/api/hooks/groups/useBlockGroupMember.ts

@@ -0,0 +1,15 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityActions } from 'soapbox/entity-store/hooks';
+
+import type { Account, Group, GroupMember } from 'soapbox/schemas';
+
+function useBlockGroupMember(group: Group, account: Account) {
+  const { createEntity } = useEntityActions<GroupMember>(
+    [Entities.GROUP_MEMBERSHIPS, account.id],
+    { post: `/api/v1/groups/${group?.id}/blocks` },
+  );
+
+  return createEntity;
+}
+
+export { useBlockGroupMember };

app/soapbox/api/hooks/groups/useCancelMembershipRequest.ts

@@ -0,0 +1,22 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useCreateEntity } from 'soapbox/entity-store/hooks';
+import { useApi, useOwnAccount } from 'soapbox/hooks';
+
+import type { Group } from 'soapbox/schemas';
+
+function useCancelMembershipRequest(group: Group) {
+  const api = useApi();
+  const { account: me } = useOwnAccount();
+
+  const { createEntity, isSubmitting } = useCreateEntity(
+    [Entities.GROUP_RELATIONSHIPS],
+    () => api.post(`/api/v1/groups/${group.id}/membership_requests/${me?.id}/reject`),
+  );
+
+  return {
+    mutate: createEntity,
+    isSubmitting,
+  };
+}
+
+export { useCancelMembershipRequest };

app/soapbox/api/hooks/groups/useCreateGroup.ts

@@ -0,0 +1,33 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useCreateEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { groupSchema } from 'soapbox/schemas';
+
+interface CreateGroupParams {
+  display_name?: string
+  note?: string
+  avatar?: File
+  header?: File
+  group_visibility?: 'members_only' | 'everyone'
+  discoverable?: boolean
+  tags?: string[]
+}
+
+function useCreateGroup() {
+  const api = useApi();
+
+  const { createEntity, ...rest } = useCreateEntity([Entities.GROUPS, 'search', ''], (params: CreateGroupParams) => {
+    return api.post('/api/v1/groups', params, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    });
+  }, { schema: groupSchema });
+
+  return {
+    createGroup: createEntity,
+    ...rest,
+  };
+}
+
+export { useCreateGroup, type CreateGroupParams };

app/soapbox/api/hooks/groups/useDeleteGroup.ts

@@ -0,0 +1,18 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityActions } from 'soapbox/entity-store/hooks';
+
+import type { Group } from 'soapbox/schemas';
+
+function useDeleteGroup() {
+  const { deleteEntity, isSubmitting } = useEntityActions<Group>(
+    [Entities.GROUPS],
+    { delete: '/api/v1/groups/:id' },
+  );
+
+  return {
+    mutate: deleteEntity,
+    isSubmitting,
+  };
+}
+
+export { useDeleteGroup };

app/soapbox/api/hooks/groups/useDeleteGroupStatus.ts

@@ -0,0 +1,20 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useDeleteEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+
+import type { Group } from 'soapbox/schemas';
+
+function useDeleteGroupStatus(group: Group, statusId: string) {
+  const api = useApi();
+  const { deleteEntity, isSubmitting } = useDeleteEntity(
+    Entities.STATUSES,
+    () => api.delete(`/api/v1/groups/${group.id}/statuses/${statusId}`),
+  );
+
+  return {
+    mutate: deleteEntity,
+    isSubmitting,
+  };
+}
+
+export { useDeleteGroupStatus };

app/soapbox/api/hooks/groups/useDemoteGroupMember.ts

@@ -0,0 +1,19 @@
+import { z } from 'zod';
+
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityActions } from 'soapbox/entity-store/hooks';
+import { groupMemberSchema } from 'soapbox/schemas';
+
+import type { Group, GroupMember } from 'soapbox/schemas';
+
+function useDemoteGroupMember(group: Group, groupMember: GroupMember) {
+  const { createEntity } = useEntityActions<GroupMember>(
+    [Entities.GROUP_MEMBERSHIPS, groupMember.id],
+    { post: `/api/v1/groups/${group.id}/demote` },
+    { schema: z.array(groupMemberSchema).transform((arr) => arr[0]) },
+  );
+
+  return createEntity;
+}
+
+export { useDemoteGroupMember };

app/soapbox/api/hooks/groups/useGroup.ts

@@ -0,0 +1,39 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { type Group, groupSchema } from 'soapbox/schemas';
+
+import { useGroupRelationship } from './useGroupRelationship';
+
+function useGroup(groupId: string, refetch = true) {
+  const api = useApi();
+  const history = useHistory();
+
+  const { entity: group, isUnauthorized, ...result } = useEntity<Group>(
+    [Entities.GROUPS, groupId],
+    () => api.get(`/api/v1/groups/${groupId}`),
+    {
+      schema: groupSchema,
+      refetch,
+      enabled: !!groupId,
+    },
+  );
+  const { groupRelationship: relationship } = useGroupRelationship(groupId);
+
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
+  return {
+    ...result,
+    isUnauthorized,
+    group: group ? { ...group, relationship: relationship || null } : undefined,
+  };
+}
+
+export { useGroup };

app/soapbox/api/hooks/groups/useGroupLookup.ts

@@ -0,0 +1,39 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityLookup } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { useFeatures } from 'soapbox/hooks/useFeatures';
+import { groupSchema } from 'soapbox/schemas';
+
+import { useGroupRelationship } from './useGroupRelationship';
+
+function useGroupLookup(slug: string) {
+  const api = useApi();
+  const features = useFeatures();
+  const history = useHistory();
+
+  const { entity: group, isUnauthorized, ...result } = useEntityLookup(
+    Entities.GROUPS,
+    (group) => group.slug.toLowerCase() === slug.toLowerCase(),
+    () => api.get(`/api/v1/groups/lookup?name=${slug}`),
+    { schema: groupSchema, enabled: features.groups && !!slug },
+  );
+
+  const { groupRelationship: relationship } = useGroupRelationship(group?.id);
+
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
+  return {
+    ...result,
+    isUnauthorized,
+    entity: group ? { ...group, relationship: relationship || null } : undefined,
+  };
+}
+
+export { useGroupLookup };

app/soapbox/api/hooks/groups/useGroupMedia.ts

@@ -0,0 +1,17 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { normalizeStatus } from 'soapbox/normalizers';
+import { toSchema } from 'soapbox/utils/normalizers';
+
+const statusSchema = toSchema(normalizeStatus);
+
+function useGroupMedia(groupId: string) {
+  const api = useApi();
+
+  return useEntities([Entities.STATUSES, 'groupMedia', groupId], () => {
+    return api.get(`/api/v1/timelines/group/${groupId}?only_media=true`);
+  }, { schema: statusSchema });
+}
+
+export { useGroupMedia };

app/soapbox/api/hooks/groups/useGroupMembers.ts

@@ -0,0 +1,23 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { GroupMember, groupMemberSchema } from 'soapbox/schemas';
+import { GroupRoles } from 'soapbox/schemas/group-member';
+
+import { useApi } from '../../../hooks/useApi';
+
+function useGroupMembers(groupId: string, role: GroupRoles) {
+  const api = useApi();
+
+  const { entities, ...result } = useEntities<GroupMember>(
+    [Entities.GROUP_MEMBERSHIPS, groupId, role],
+    () => api.get(`/api/v1/groups/${groupId}/memberships?role=${role}`),
+    { schema: groupMemberSchema },
+  );
+
+  return {
+    ...result,
+    groupMembers: entities,
+  };
+}
+
+export { useGroupMembers };

app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts

@@ -0,0 +1,47 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useDismissEntity, useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { accountSchema } from 'soapbox/schemas';
+import { GroupRoles } from 'soapbox/schemas/group-member';
+
+import { useGroupRelationship } from './useGroupRelationship';
+
+import type { ExpandedEntitiesPath } from 'soapbox/entity-store/hooks/types';
+
+function useGroupMembershipRequests(groupId: string) {
+  const api = useApi();
+  const path: ExpandedEntitiesPath = [Entities.ACCOUNTS, 'membership_requests', groupId];
+
+  const { groupRelationship: relationship } = useGroupRelationship(groupId);
+
+  const { entities, invalidate, fetchEntities, ...rest } = useEntities(
+    path,
+    () => api.get(`/api/v1/groups/${groupId}/membership_requests`),
+    {
+      schema: accountSchema,
+      enabled: relationship?.role === GroupRoles.OWNER || relationship?.role === GroupRoles.ADMIN,
+    },
+  );
+
+  const { dismissEntity: authorize } = useDismissEntity(path, async (accountId: string) => {
+    const response = await api.post(`/api/v1/groups/${groupId}/membership_requests/${accountId}/authorize`);
+    invalidate();
+    return response;
+  });
+
+  const { dismissEntity: reject } = useDismissEntity(path, async (accountId: string) => {
+    const response = await api.post(`/api/v1/groups/${groupId}/membership_requests/${accountId}/reject`);
+    invalidate();
+    return response;
+  });
+
+  return {
+    accounts: entities,
+    refetch: fetchEntities,
+    authorize,
+    reject,
+    ...rest,
+  };
+}
+
+export { useGroupMembershipRequests };

app/soapbox/api/hooks/groups/useGroupMutes.ts

@@ -0,0 +1,25 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useFeatures } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { groupSchema } from 'soapbox/schemas';
+
+import type { Group } from 'soapbox/schemas';
+
+function useGroupMutes() {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<Group>(
+    [Entities.GROUP_MUTES],
+    () => api.get('/api/v1/groups/mutes'),
+    { schema: groupSchema, enabled: features.groupsMuting },
+  );
+
+  return {
+    ...result,
+    mutes: entities,
+  };
+}
+
+export { useGroupMutes };

app/soapbox/api/hooks/groups/useGroupRelationship.ts

@@ -0,0 +1,26 @@
+import { z } from 'zod';
+
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
+
+function useGroupRelationship(groupId: string | undefined) {
+  const api = useApi();
+
+  const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
+    [Entities.GROUP_RELATIONSHIPS, groupId!],
+    () => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
+    {
+      enabled: !!groupId,
+      schema: z.array(groupRelationshipSchema).nonempty().transform(arr => arr[0]),
+    },
+  );
+
+  return {
+    groupRelationship,
+    ...result,
+  };
+}
+
+export { useGroupRelationship };

app/soapbox/api/hooks/groups/useGroupRelationships.ts

@@ -0,0 +1,25 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useBatchedEntities } from 'soapbox/entity-store/hooks/useBatchedEntities';
+import { useApi, useLoggedIn } from 'soapbox/hooks';
+import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
+
+function useGroupRelationships(listKey: string[], ids: string[]) {
+  const api = useApi();
+  const { isLoggedIn } = useLoggedIn();
+
+  function fetchGroupRelationships(ids: string[]) {
+    const q = ids.map((id) => `id[]=${id}`).join('&');
+    return api.get(`/api/v1/groups/relationships?${q}`);
+  }
+
+  const { entityMap: relationships, ...result } = useBatchedEntities<GroupRelationship>(
+    [Entities.RELATIONSHIPS, ...listKey],
+    ids,
+    fetchGroupRelationships,
+    { schema: groupRelationshipSchema, enabled: isLoggedIn },
+  );
+
+  return { relationships, ...result };
+}
+
+export { useGroupRelationships };

app/soapbox/api/hooks/groups/useGroupSearch.ts

@@ -0,0 +1,40 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi, useFeatures } from 'soapbox/hooks';
+import { groupSchema } from 'soapbox/schemas';
+
+import { useGroupRelationships } from './useGroupRelationships';
+
+import type { Group } from 'soapbox/schemas';
+
+function useGroupSearch(search: string) {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<Group>(
+    [Entities.GROUPS, 'discover', 'search', search],
+    () => api.get('/api/v1/groups/search', {
+      params: {
+        q: search,
+      },
+    }),
+    { enabled: features.groupsDiscovery && !!search, schema: groupSchema },
+  );
+
+  const { relationships } = useGroupRelationships(
+    ['discover', 'search', search],
+    entities.map(entity => entity.id),
+  );
+
+  const groups = entities.map((group) => ({
+    ...group,
+    relationship: relationships[group.id] || null,
+  }));
+
+  return {
+    ...result,
+    groups,
+  };
+}
+
+export { useGroupSearch };

app/soapbox/api/hooks/groups/useGroupTag.ts

@@ -0,0 +1,21 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { type GroupTag, groupTagSchema } from 'soapbox/schemas';
+
+function useGroupTag(tagId: string) {
+  const api = useApi();
+
+  const { entity: tag, ...result } = useEntity<GroupTag>(
+    [Entities.GROUP_TAGS, tagId],
+    () => api.get(`/api/v1/tags/${tagId }`),
+    { schema: groupTagSchema },
+  );
+
+  return {
+    ...result,
+    tag,
+  };
+}
+
+export { useGroupTag };

app/soapbox/api/hooks/groups/useGroupTags.ts

@@ -0,0 +1,23 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { groupTagSchema } from 'soapbox/schemas';
+
+import type { GroupTag } from 'soapbox/schemas';
+
+function useGroupTags(groupId: string) {
+  const api = useApi();
+
+  const { entities, ...result } = useEntities<GroupTag>(
+    [Entities.GROUP_TAGS, groupId],
+    () => api.get(`/api/v1/truth/trends/groups/${groupId}/tags`),
+    { schema: groupTagSchema },
+  );
+
+  return {
+    ...result,
+    tags: entities,
+  };
+}
+
+export { useGroupTags };

app/soapbox/api/hooks/groups/useGroupValidation.ts

@@ -0,0 +1,47 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { useApi } from 'soapbox/hooks/useApi';
+import { useFeatures } from 'soapbox/hooks/useFeatures';
+
+type Validation = {
+  error: string
+  message: string
+}
+
+const ValidationKeys = {
+  validation: (name: string) => ['group', 'validation', name] as const,
+};
+
+function useGroupValidation(name: string = '') {
+  const api = useApi();
+  const features = useFeatures();
+
+  const getValidation = async() => {
+    const { data } = await api.get<Validation>('/api/v1/groups/validate', {
+      params: { name },
+    })
+      .catch((error) => {
+        if (error.response.status === 422) {
+          return { data: error.response.data };
+        }
+
+        throw error;
+      });
+
+    return data;
+  };
+
+  const queryInfo = useQuery<Validation>(ValidationKeys.validation(name), getValidation, {
+    enabled: features.groupsValidation && !!name,
+  });
+
+  return {
+    ...queryInfo,
+    data: {
+      ...queryInfo.data,
+      isValid: !queryInfo.data?.error ?? true,
+    },
+  };
+}
+
+export { useGroupValidation };

app/soapbox/api/hooks/groups/useGroups.ts

@@ -0,0 +1,34 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { useFeatures } from 'soapbox/hooks/useFeatures';
+import { groupSchema, type Group } from 'soapbox/schemas/group';
+
+import { useGroupRelationships } from './useGroupRelationships';
+
+function useGroups(q: string = '') {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<Group>(
+    [Entities.GROUPS, 'search', q],
+    () => api.get('/api/v1/groups', { params: { q } }),
+    { enabled: features.groups, schema: groupSchema },
+  );
+  const { relationships } = useGroupRelationships(
+    ['search', q],
+    entities.map(entity => entity.id),
+  );
+
+  const groups = entities.map((group) => ({
+    ...group,
+    relationship: relationships[group.id] || null,
+  }));
+
+  return {
+    ...result,
+    groups,
+  };
+}
+
+export { useGroups };

app/soapbox/api/hooks/groups/useGroupsFromTag.ts

@@ -0,0 +1,38 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi, useFeatures } from 'soapbox/hooks';
+import { groupSchema } from 'soapbox/schemas';
+
+import { useGroupRelationships } from './useGroupRelationships';
+
+import type { Group } from 'soapbox/schemas';
+
+function useGroupsFromTag(tagId: string) {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<Group>(
+    [Entities.GROUPS, 'tags', tagId],
+    () => api.get(`/api/v1/tags/${tagId}/groups`),
+    {
+      schema: groupSchema,
+      enabled: features.groupsDiscovery,
+    },
+  );
+  const { relationships } = useGroupRelationships(
+    ['tags', tagId],
+    entities.map(entity => entity.id),
+  );
+
+  const groups = entities.map((group) => ({
+    ...group,
+    relationship: relationships[group.id] || null,
+  }));
+
+  return {
+    ...result,
+    groups,
+  };
+}
+
+export { useGroupsFromTag };

app/soapbox/api/hooks/groups/useJoinGroup.ts

@@ -0,0 +1,25 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityActions } from 'soapbox/entity-store/hooks';
+import { groupRelationshipSchema } from 'soapbox/schemas';
+
+import { useGroups } from './useGroups';
+
+import type { Group, GroupRelationship } from 'soapbox/schemas';
+
+function useJoinGroup(group: Group) {
+  const { invalidate } = useGroups();
+
+  const { createEntity, isSubmitting } = useEntityActions<GroupRelationship>(
+    [Entities.GROUP_RELATIONSHIPS, group.id],
+    { post: `/api/v1/groups/${group.id}/join` },
+    { schema: groupRelationshipSchema },
+  );
+
+  return {
+    mutate: createEntity,
+    isSubmitting,
+    invalidate,
+  };
+}
+
+export { useJoinGroup };

app/soapbox/api/hooks/groups/useLeaveGroup.ts

@@ -0,0 +1,25 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityActions } from 'soapbox/entity-store/hooks';
+import { groupRelationshipSchema } from 'soapbox/schemas';
+
+import { useGroups } from './useGroups';
+
+import type { Group, GroupRelationship } from 'soapbox/schemas';
+
+function useLeaveGroup(group: Group) {
+  const { invalidate } = useGroups();
+
+  const { createEntity, isSubmitting } = useEntityActions<GroupRelationship>(
+    [Entities.GROUP_RELATIONSHIPS, group.id],
+    { post: `/api/v1/groups/${group.id}/leave` },
+    { schema: groupRelationshipSchema },
+  );
+
+  return {
+    mutate: createEntity,
+    isSubmitting,
+    invalidate,
+  };
+}
+
+export { useLeaveGroup };

app/soapbox/api/hooks/groups/useMuteGroup.ts

@@ -0,0 +1,18 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityActions } from 'soapbox/entity-store/hooks';
+import { type Group, groupRelationshipSchema } from 'soapbox/schemas';
+
+function useMuteGroup(group?: Group) {
+  const { createEntity, isSubmitting } = useEntityActions(
+    [Entities.GROUP_RELATIONSHIPS, group?.id as string],
+    { post: `/api/v1/groups/${group?.id}/mute` },
+    { schema: groupRelationshipSchema },
+  );
+
+  return {
+    mutate: createEntity,
+    isSubmitting,
+  };
+}
+
+export { useMuteGroup };

app/soapbox/api/hooks/groups/usePendingGroups.ts

@@ -0,0 +1,30 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi, useFeatures, useOwnAccount } from 'soapbox/hooks';
+import { Group, groupSchema } from 'soapbox/schemas';
+
+function usePendingGroups() {
+  const api = useApi();
+  const { account } = useOwnAccount();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<Group>(
+    [Entities.GROUPS, account?.id!, 'pending'],
+    () => api.get('/api/v1/groups', {
+      params: {
+        pending: true,
+      },
+    }),
+    {
+      schema: groupSchema,
+      enabled: !!account && features.groupsPending,
+    },
+  );
+
+  return {
+    ...result,
+    groups: entities,
+  };
+}
+
+export { usePendingGroups };

app/soapbox/api/hooks/groups/usePopularGroups.ts

@@ -0,0 +1,36 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { Group, groupSchema } from 'soapbox/schemas';
+
+import { useApi } from '../../../hooks/useApi';
+import { useFeatures } from '../../../hooks/useFeatures';
+
+import { useGroupRelationships } from './useGroupRelationships';
+
+function usePopularGroups() {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<Group>(
+    [Entities.GROUPS, 'popular'],
+    () => api.get('/api/v1/truth/trends/groups'),
+    {
+      schema: groupSchema,
+      enabled: features.groupsDiscovery,
+    },
+  );
+
+  const { relationships } = useGroupRelationships(['popular'], entities.map(entity => entity.id));
+
+  const groups = entities.map((group) => ({
+    ...group,
+    relationship: relationships[group.id] || null,
+  }));
+
+  return {
+    ...result,
+    groups,
+  };
+}
+
+export { usePopularGroups };

app/soapbox/api/hooks/groups/usePopularTags.ts

@@ -0,0 +1,25 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi, useFeatures } from 'soapbox/hooks';
+import { type GroupTag, groupTagSchema } from 'soapbox/schemas';
+
+function usePopularTags() {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<GroupTag>(
+    [Entities.GROUP_TAGS],
+    () => api.get('/api/v1/groups/tags'),
+    {
+      schema: groupTagSchema,
+      enabled: features.groupsDiscovery,
+    },
+  );
+
+  return {
+    ...result,
+    tags: entities,
+  };
+}
+
+export { usePopularTags };