From 93b09d8206a2ea3ff4243a9a068249c0ed0505b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 19 Jan 2023 15:06:17 +0100
Subject: [PATCH 001/298] Add ability to follow hashtags in web UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/actions/tags.ts                   | 120 ++++++++++++++++++
 app/soapbox/components/ui/card/card.tsx       |  18 ++-
 app/soapbox/components/ui/column/column.tsx   |  23 +++-
 .../features/hashtag-timeline/index.tsx       |  28 +++-
 app/soapbox/normalizers/tag.ts                |   1 +
 app/soapbox/reducers/index.ts                 |   2 +
 app/soapbox/reducers/tags.ts                  |  30 +++++
 app/soapbox/utils/features.ts                 |   7 +
 8 files changed, 218 insertions(+), 11 deletions(-)
 create mode 100644 app/soapbox/actions/tags.ts
 create mode 100644 app/soapbox/reducers/tags.ts

diff --git a/app/soapbox/actions/tags.ts b/app/soapbox/actions/tags.ts
new file mode 100644
index 000000000..2c394ba46
--- /dev/null
+++ b/app/soapbox/actions/tags.ts
@@ -0,0 +1,120 @@
+import api 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 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,
+});
+
+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,
+  fetchHashtag,
+  fetchHashtagRequest,
+  fetchHashtagSuccess,
+  fetchHashtagFail,
+  followHashtag,
+  followHashtagRequest,
+  followHashtagSuccess,
+  followHashtagFail,
+  unfollowHashtag,
+  unfollowHashtagRequest,
+  unfollowHashtagSuccess,
+  unfollowHashtagFail,
+};
diff --git a/app/soapbox/components/ui/card/card.tsx b/app/soapbox/components/ui/card/card.tsx
index 6fc85a39a..2cc23b6b4 100644
--- a/app/soapbox/components/ui/card/card.tsx
+++ b/app/soapbox/components/ui/card/card.tsx
@@ -45,6 +45,12 @@ interface ICardHeader {
   backHref?: string,
   onBackClick?: (event: React.MouseEvent) => void
   className?: string
+  /** Callback when the card action is clicked. */
+  onActionClick?: () => void,
+  /** URL to the svg icon for the card action. */
+  actionIcon?: string,
+  /** Text for the action. */
+  actionTitle?: string,
   children?: React.ReactNode
 }
 
@@ -52,7 +58,7 @@ interface ICardHeader {
  * Card header container with back button.
  * Typically holds a CardTitle.
  */
-const CardHeader: React.FC<ICardHeader> = ({ className, children, backHref, onBackClick }): JSX.Element => {
+const CardHeader: React.FC<ICardHeader> = ({ className, children, backHref, onBackClick, onActionClick, actionIcon, actionTitle }): JSX.Element => {
   const intl = useIntl();
 
   const renderBackButton = () => {
@@ -64,7 +70,7 @@ const CardHeader: React.FC<ICardHeader> = ({ className, children, backHref, onBa
     const backAttributes = backHref ? { to: backHref } : { onClick: onBackClick };
 
     return (
-      <Comp {...backAttributes} className='text-gray-900 dark:text-gray-100 focus:ring-primary-500 focus:ring-2' aria-label={intl.formatMessage(messages.back)}>
+      <Comp {...backAttributes} className='p-0.5 -m-0.5 text-gray-900 dark:text-gray-100 focus:ring-primary-500 focus:ring-2 rounded-full' aria-label={intl.formatMessage(messages.back)}>
         <SvgIcon src={require('@tabler/icons/arrow-left.svg')} className='h-6 w-6 rtl:rotate-180' />
         <span className='sr-only' data-testid='back-button'>{intl.formatMessage(messages.back)}</span>
       </Comp>
@@ -76,6 +82,12 @@ const CardHeader: React.FC<ICardHeader> = ({ className, children, backHref, onBa
       {renderBackButton()}
 
       {children}
+
+      {onActionClick && actionIcon && (
+        <button className='p-0.5 -m-0.5 text-gray-900 dark:text-gray-100 focus:ring-primary-500 focus:ring-2 rounded-full' onClick={onActionClick} title={actionTitle}>
+          <SvgIcon src={actionIcon} className='h-6 w-6' />
+        </button>
+      )}
     </HStack>
   );
 };
@@ -86,7 +98,7 @@ interface ICardTitle {
 
 /** A card's title. */
 const CardTitle: React.FC<ICardTitle> = ({ title }): JSX.Element => (
-  <Text size='xl' weight='bold' tag='h1' data-testid='card-title' truncate>{title}</Text>
+  <Text className='grow' size='xl' weight='bold' tag='h1' data-testid='card-title' truncate>{title}</Text>
 );
 
 interface ICardBody {
diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx
index 5ccf3ac42..7099b792d 100644
--- a/app/soapbox/components/ui/column/column.tsx
+++ b/app/soapbox/components/ui/column/column.tsx
@@ -7,10 +7,10 @@ import { useSoapboxConfig } from 'soapbox/hooks';
 
 import { Card, CardBody, CardHeader, CardTitle } from '../card/card';
 
-type IColumnHeader = Pick<IColumn, 'label' | 'backHref' |'className'>;
+type IColumnHeader = Pick<IColumn, 'label' | 'backHref' | 'className' | 'onActionClick' | 'actionIcon' | 'actionTitle'>;
 
 /** Contains the column title with optional back button. */
-const ColumnHeader: React.FC<IColumnHeader> = ({ label, backHref, className }) => {
+const ColumnHeader: React.FC<IColumnHeader> = ({ label, backHref, className, onActionClick, actionIcon, actionTitle }) => {
   const history = useHistory();
 
   const handleBackClick = () => {
@@ -27,7 +27,13 @@ const ColumnHeader: React.FC<IColumnHeader> = ({ label, backHref, className }) =
   };
 
   return (
-    <CardHeader className={className} onBackClick={handleBackClick}>
+    <CardHeader
+      className={className}
+      onBackClick={handleBackClick}
+      onActionClick={onActionClick}
+      actionIcon={actionIcon}
+      actionTitle={actionTitle}
+    >
       <CardTitle title={label} />
     </CardHeader>
   );
@@ -46,13 +52,19 @@ export interface IColumn {
   className?: string,
   /** Ref forwarded to column. */
   ref?: React.Ref<HTMLDivElement>
+  /** Callback when the column action is clicked. */
+  onActionClick?: () => void,
+  /** URL to the svg icon for the column action. */
+  actionIcon?: string,
+  /** Text for the action. */
+  actionTitle?: string,
   /** Children to display in the column. */
   children?: React.ReactNode
 }
 
 /** A backdrop for the main section of the UI. */
 const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedRef<HTMLDivElement>): JSX.Element => {
-  const { backHref, children, label, transparent = false, withHeader = true, className } = props;
+  const { backHref, children, label, transparent = false, withHeader = true, onActionClick, actionIcon, actionTitle, className } = props;
   const soapboxConfig = useSoapboxConfig();
 
   return (
@@ -75,6 +87,9 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
             label={label}
             backHref={backHref}
             className={classNames({ 'px-4 pt-4 sm:p-0': transparent })}
+            onActionClick={onActionClick}
+            actionIcon={actionIcon}
+            actionTitle={actionTitle}
           />
         )}
 
diff --git a/app/soapbox/features/hashtag-timeline/index.tsx b/app/soapbox/features/hashtag-timeline/index.tsx
index 133a96a5f..2587ff374 100644
--- a/app/soapbox/features/hashtag-timeline/index.tsx
+++ b/app/soapbox/features/hashtag-timeline/index.tsx
@@ -2,10 +2,11 @@ import React, { useEffect, useRef } from 'react';
 import { useIntl, defineMessages } from 'react-intl';
 
 import { connectHashtagStream } from 'soapbox/actions/streaming';
+import { fetchHashtag, followHashtag, unfollowHashtag } from 'soapbox/actions/tags';
 import { expandHashtagTimeline, clearTimeline } from 'soapbox/actions/timelines';
 import { Column } from 'soapbox/components/ui';
 import Timeline from 'soapbox/features/ui/components/timeline';
-import { useAppDispatch } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
 
 import type { Tag as TagEntity } from 'soapbox/types/entities';
 
@@ -18,6 +19,8 @@ const messages = defineMessages({
   any: { id: 'hashtag.column_header.tag_mode.any', defaultMessage: 'or {additional}' },
   all: { id: 'hashtag.column_header.tag_mode.all', defaultMessage: 'and {additional}' },
   none: { id: 'hashtag.column_header.tag_mode.none', defaultMessage: 'without {additional}' },
+  followHashtag: { id: 'hashtag.follow', defaultMessage: 'Follow hashtag' },
+  unfollowHashtag: { id: 'hashtag.unfollow', defaultMessage: 'Unfollow hashtag' },
   empty: { id: 'empty_column.hashtag', defaultMessage: 'There is nothing in this hashtag yet.' },
 });
 
@@ -32,9 +35,11 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   const intl = useIntl();
   const id = params?.id || '';
   const tags = params?.tags || { any: [], all: [], none: [] };
-
+  
+  const features = useFeatures();
   const dispatch = useAppDispatch();
   const disconnects = useRef<(() => void)[]>([]);
+  const tag = useAppSelector((state) => state.tags.get(id));
 
   // Mastodon supports displaying results from multiple hashtags.
   // https://github.com/mastodon/mastodon/issues/6359
@@ -88,9 +93,18 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
     dispatch(expandHashtagTimeline(id, { maxId, tags }));
   };
 
+  const handleFollow = () => {
+    if (tag?.following) {
+      dispatch(unfollowHashtag(id));
+    } else {
+      dispatch(followHashtag(id));
+    }
+  };
+
   useEffect(() => {
     subscribe();
     dispatch(expandHashtagTimeline(id, { tags }));
+    dispatch(fetchHashtag(id));
 
     return () => {
       unsubscribe();
@@ -105,7 +119,13 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   }, [id]);
 
   return (
-    <Column label={title()} transparent>
+    <Column
+      label={title()}
+      transparent
+      onActionClick={features.followHashtags ? handleFollow : undefined}
+      actionIcon={tag?.following ? require('@tabler/icons/bell-ringing.svg') : require('@tabler/icons/bell.svg')}
+      actionTitle={intl.formatMessage(tag?.following ? messages.unfollowHashtag : messages.followHashtag)}
+    >
       <Timeline
         scrollKey='hashtag_timeline'
         timelineId={`hashtag:${id}`}
@@ -117,4 +137,4 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   );
 };
 
-export default HashtagTimeline;
\ No newline at end of file
+export default HashtagTimeline;
diff --git a/app/soapbox/normalizers/tag.ts b/app/soapbox/normalizers/tag.ts
index 6d0ebae14..fde58241f 100644
--- a/app/soapbox/normalizers/tag.ts
+++ b/app/soapbox/normalizers/tag.ts
@@ -19,6 +19,7 @@ export const TagRecord = ImmutableRecord({
   name: '',
   url: '',
   history: null as ImmutableList<History> | null,
+  following: false,
 });
 
 const normalizeHistoryList = (tag: ImmutableMap<string, any>) => {
diff --git a/app/soapbox/reducers/index.ts b/app/soapbox/reducers/index.ts
index 5b5cca999..1d1d71802 100644
--- a/app/soapbox/reducers/index.ts
+++ b/app/soapbox/reducers/index.ts
@@ -56,6 +56,7 @@ import status_hover_card from './status-hover-card';
 import status_lists from './status-lists';
 import statuses from './statuses';
 import suggestions from './suggestions';
+import tags from './tags';
 import timelines from './timelines';
 import trending_statuses from './trending-statuses';
 import trends from './trends';
@@ -120,6 +121,7 @@ const reducers = {
   announcements,
   compose_event,
   admin_user_index,
+  tags,
 };
 
 // Build a default state from all reducers: it has the key and `undefined`
diff --git a/app/soapbox/reducers/tags.ts b/app/soapbox/reducers/tags.ts
new file mode 100644
index 000000000..81488bb1e
--- /dev/null
+++ b/app/soapbox/reducers/tags.ts
@@ -0,0 +1,30 @@
+import { Map as ImmutableMap } from 'immutable';
+
+import {
+  HASHTAG_FETCH_SUCCESS,
+  HASHTAG_FOLLOW_REQUEST,
+  HASHTAG_FOLLOW_FAIL,
+  HASHTAG_UNFOLLOW_REQUEST,
+  HASHTAG_UNFOLLOW_FAIL,
+} from 'soapbox/actions/tags';
+import { normalizeTag } from 'soapbox/normalizers';
+
+import type { AnyAction } from 'redux';
+import type { Tag } from 'soapbox/types/entities';
+
+const initialState = ImmutableMap<string, Tag>();
+
+export default function tags(state = initialState, action: AnyAction) {
+  switch (action.type) {
+    case HASHTAG_FETCH_SUCCESS:
+      return state.set(action.name, normalizeTag(action.tag));
+    case HASHTAG_FOLLOW_REQUEST:
+    case HASHTAG_UNFOLLOW_FAIL:
+      return state.setIn([action.name, 'following'], true);
+    case HASHTAG_FOLLOW_FAIL:
+    case HASHTAG_UNFOLLOW_REQUEST:
+      return state.setIn([action.name, 'following'], false);
+    default:
+      return state;
+  }
+}
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 39950a534..2f24c07f4 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -447,6 +447,13 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     focalPoint: v.software === MASTODON && gte(v.compatVersion, '2.3.0'),
 
+    /**
+     * Ability to follow hashtags.
+     * @see POST /api/v1/tags/:name/follow
+     * @see POST /api/v1/tags/:name/unfollow
+     */
+    followHashtags: v.software === MASTODON && gte(v.compatVersion, '4.0.0'),
+
     /**
      * Ability to lock accounts and manually approve followers.
      * @see PATCH /api/v1/accounts/update_credentials

From d891024cb54ab02f6410e4f2766f2e36ca3f887c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Fri, 20 Jan 2023 14:20:50 +0100
Subject: [PATCH 002/298] Update en.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/locales/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 05613e17f..899020207 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -695,6 +695,8 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",

From 0ec5ec712977ef298e0169a4c82652f8a47be812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Fri, 20 Jan 2023 22:32:51 +0100
Subject: [PATCH 003/298] Update CHANGELOG.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cdc24413..8eac50477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Admin: redirect the homepage to any URL.
 - Compatibility: added compatibility with Friendica.
+- Hashtags: let users follow hashtags (Mastodon).
 
 ### Changed
 

From d4bcdf428f65c5f4fcacc20c9d76e9ec6e1f174d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sat, 4 Feb 2023 11:44:12 +0100
Subject: [PATCH 004/298] wip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/utils/features.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 2f24c07f4..0068f17dd 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -463,6 +463,12 @@ const getInstanceFeatures = (instance: Instance) => {
       v.software === PLEROMA,
     ]),
 
+    /**
+     * Ability to list followed hashtags.
+     * @see GET /api/v1/followed_tags
+     */
+    followedHashtagsList: v.software === MASTODON && gte(v.compatVersion, '4.1.0'),
+
     /**
      * Whether client settings can be retrieved from the API.
      * @see GET /api/pleroma/frontend_configurations

From f67f23274c637d8e188902b55e37e2d0da59c41d Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 16 Mar 2023 11:30:46 +0000
Subject: [PATCH 005/298] Translated using Weblate (Spanish)

Currently translated at 100.0% (1524 of 1524 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/es/
---
 app/soapbox/locales/es.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index f8d341c64..521de0979 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -472,7 +472,7 @@
   "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
   "confirmations.block_from_group.confirm": "Bloquear",
   "confirmations.block_from_group.heading": "Miembro de un grupo de bloqueo",
-  "confirmations.block_from_group.message": "¿Estás seguro de que quieres bloquear a @{name} para que no interactúe con este grupo?",
+  "confirmations.block_from_group.message": "¿Estás seguro de que quieres expulsar a @{name} del grupo?",
   "confirmations.cancel.confirm": "Descartar",
   "confirmations.cancel.heading": "Descartar la publicación",
   "confirmations.cancel.message": "¿Está seguro de que desea cancelar esta publicación?",
@@ -770,8 +770,8 @@
   "group.cancel_request": "Cancelar solicitud",
   "group.group_mod_authorize": "Aceptar",
   "group.group_mod_authorize.success": "Aceptado @{name} al grupo",
-  "group.group_mod_block": "Bloquear a @{name} del grupo",
-  "group.group_mod_block.success": "@{name} bloqueado del grupo",
+  "group.group_mod_block": "Expulsar del grupo",
+  "group.group_mod_block.success": "Has bloqueado correctamente a @{name} del grupo",
   "group.group_mod_demote": "Degradar a @{name}",
   "group.group_mod_demote.success": "Degradado a @{name} a usuario del grupo",
   "group.group_mod_kick": "Expulsar a @{name} del grupo",
@@ -793,7 +793,11 @@
   "group.leave.success": "Abandonó el grupo",
   "group.manage": "Gestionar el Grupo",
   "group.privacy.locked": "Privado",
+  "group.privacy.locked.full": "Grupo privado",
+  "group.privacy.locked.info": "Descubrible. Los usuarios pueden unirse después de que se apruebe su solicitud.",
   "group.privacy.public": "Público",
+  "group.privacy.public.full": "Grupo público",
+  "group.privacy.public.info": "Descubrible. Cualquiera puede participar.",
   "group.role.admin": "Administrador",
   "group.role.moderator": "Moderador",
   "group.tabs.all": "Todos",

From 4c7d8029c09a556eb3e63a890cbce67261c11ba5 Mon Sep 17 00:00:00 2001
From: Isabell De Inschnitzel <ghostofcordoba@protonmail.com>
Date: Sat, 18 Mar 2023 12:58:55 +0000
Subject: [PATCH 006/298] Translated using Weblate (German)

Currently translated at 93.1% (1419 of 1524 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/de/
---
 app/soapbox/locales/de.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index b8d18b298..a38f31b42 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -7,7 +7,7 @@
   "account.birthday": "Geburtsdatum {date}",
   "account.birthday_today": "Hat heute Geburtstag!",
   "account.block": "Blockieren",
-  "account.block_domain": "Domäne verstecken",
+  "account.block_domain": "Domain verbergen",
   "account.blocked": "Blockiert",
   "account.chat": "Mit @{name} chatten",
   "account.deactivated": "Deaktiviert",
@@ -304,7 +304,7 @@
   "column.filters.create_error": "Fehler beim Hinzufügen des Filters",
   "column.filters.delete": "Löschen",
   "column.filters.delete_error": "Fehler beim Löschen des Filters",
-  "column.filters.drop_header": "Entfernen statt verstecken",
+  "column.filters.drop_header": "Entfernen statt verbergen",
   "column.filters.drop_hint": "Gefilterte Beiträge bleiben dauerhaft unsichtbar, auch wenn der Filter später entfernt wird",
   "column.filters.expires": "Gültig bis",
   "column.filters.home_timeline": "Persönliche Timeline",
@@ -335,9 +335,9 @@
   "column.pins": "Angeheftete Beiträge",
   "column.preferences": "Einstellungen",
   "column.public": "Föderierte Zeitleiste",
-  "column.quotes": "Zitierte Beiträge",
+  "column.quotes": "Zitiert von",
   "column.reactions": "Reaktionen",
-  "column.reblogs": "Geteilte Beiträge",
+  "column.reblogs": "Geteilt von",
   "column.scheduled_statuses": "Vorbereitete Beiträge",
   "column.search": "Suche",
   "column.settings_store": "Einstellungsspeicher",
@@ -702,7 +702,7 @@
   "filters.context_hint": "Ein oder mehrere Kontexte, auf die der Filter angewendet werden soll",
   "filters.filters_list_context_label": "Kontexte filtern:",
   "filters.filters_list_drop": "Weg damit",
-  "filters.filters_list_hide": "Verstecken",
+  "filters.filters_list_hide": "Verbergen",
   "filters.removed": "Filter gelöscht.",
   "followRecommendations.heading": "Vorgeschlagene Profile",
   "follow_request.authorize": "Bestätigen",
@@ -807,8 +807,8 @@
   "keyboard_shortcuts.reply": "antworten",
   "keyboard_shortcuts.requests": "Liste der Folgeanfragen öffnen",
   "keyboard_shortcuts.search": "Suche fokussieren",
-  "keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verstecken/anzeigen",
-  "keyboard_shortcuts.toggle_sensitivity": "Medien hinter einer Inhaltswarnung verstecken/anzeigen",
+  "keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verbergen/anzeigen",
+  "keyboard_shortcuts.toggle_sensitivity": "Medien hinter einer Inhaltswarnung verbergen/anzeigen",
   "keyboard_shortcuts.toot": "einen neuen Beitrag erstellen",
   "keyboard_shortcuts.unfocus": "Textfeld/die Suche nicht mehr fokussieren",
   "keyboard_shortcuts.up": "sich in der Liste hinauf bewegen",
@@ -905,7 +905,7 @@
   "modals.policy.submit": "Akzeptieren & Weiter",
   "modals.policy.updateTitle": "Du hast die neueste Version von {siteTitle} erhalten! Nimm dir einen Moment Zeit, um die aufregenden neuen Dinge zu sehen, an denen wir gearbeitet haben.",
   "moderation_overlay.contact": "Kontakt",
-  "moderation_overlay.hide": "Inhalt verstecken",
+  "moderation_overlay.hide": "Inhalt verbergen",
   "moderation_overlay.show": "Anzeigen",
   "moderation_overlay.subtitle": "Dieser Beitrag wurde zur Überprüfung an die Moderation geschickt und ist nur für dich sichtbar. Wenn du glaubst, dass dies ein Fehler ist, kontaktiere bitte den Support.",
   "moderation_overlay.title": "Inhalt wird überprüft",

From 21a7fbab9d6e6bf7f400275925f78cea0297bb09 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Sun, 19 Mar 2023 09:13:21 +0000
Subject: [PATCH 007/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1524 of 1524 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index daa933280..99319ece7 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -472,7 +472,7 @@
   "confirmations.block.message": "您确定要屏蔽 {name} 吗？",
   "confirmations.block_from_group.confirm": "屏蔽",
   "confirmations.block_from_group.heading": "屏蔽群组成员",
-  "confirmations.block_from_group.message": "您确定要屏蔽 @{name} 与此群组互动吗？",
+  "confirmations.block_from_group.message": "您确定要从群组中封禁 @{name} 吗？",
   "confirmations.cancel.confirm": "丢弃",
   "confirmations.cancel.heading": "丢弃帖文",
   "confirmations.cancel.message": "您确定要取消创建此帖文吗？",
@@ -770,8 +770,8 @@
   "group.cancel_request": "取消申请",
   "group.group_mod_authorize": "允许",
   "group.group_mod_authorize.success": "已允许 @{name} 加入群组",
-  "group.group_mod_block": "从群组中屏蔽 @{name}",
-  "group.group_mod_block.success": "已从群组中屏蔽 @{name}",
+  "group.group_mod_block": "从群组中封禁 @{name}",
+  "group.group_mod_block.success": "您已成功从群组中封禁 @{name}",
   "group.group_mod_demote": "降级 @{name}",
   "group.group_mod_demote.success": "@{name} 已被降级为群组用户",
   "group.group_mod_kick": "从群组中踢出 @{name}",
@@ -793,7 +793,11 @@
   "group.leave.success": "离开了群组",
   "group.manage": "管理群组",
   "group.privacy.locked": "私有",
+  "group.privacy.locked.full": "私有群组",
+  "group.privacy.locked.info": "可发现。用户可以在其申请被批准后加入。",
   "group.privacy.public": "公开",
+  "group.privacy.public.full": "公开群组",
+  "group.privacy.public.info": "可发现。任何人都可以加入。",
   "group.role.admin": "管理员",
   "group.role.moderator": "监察员",
   "group.tabs.all": "全部",

From ffd11b0aa3e8497146b79089d27cdeecda521a9f Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 20 Mar 2023 21:09:08 +0100
Subject: [PATCH 008/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json    | 4 ----
 app/soapbox/locales/de.json    | 4 ----
 app/soapbox/locales/es.json    | 4 ----
 app/soapbox/locales/it.json    | 4 ----
 app/soapbox/locales/no.json    | 4 ----
 app/soapbox/locales/pl.json    | 3 ---
 app/soapbox/locales/zh-CN.json | 4 ----
 7 files changed, 27 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 7a72e4fa2..9866c01e1 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -495,7 +495,6 @@
   "confirmations.mute.confirm": "كتم",
   "confirmations.mute.heading": "كتم @{name}",
   "confirmations.mute.message": "هل تود حقًا حجب {name}؟",
-  "confirmations.promote_in_group.confirm": "ترقية",
   "confirmations.promote_in_group.message": "هل أنت متأكد أنك تريد الترقية لـ @ {name}؟ لن تكون قادرًا على تخفيض رتبتهم.",
   "confirmations.redraft.confirm": "إزالة و إعادة الصياغة",
   "confirmations.redraft.heading": "إزالة وإعادة الصياغة",
@@ -744,13 +743,10 @@
   "group.group_mod_block": "حظر @{name} من المجموعة",
   "group.group_mod_block.success": "حُظِرَ @{name} من المجموعة",
   "group.group_mod_demote": "خفض الرتبة",
-  "group.group_mod_demote.success": "خفض رتبة @{name} إلى مستخدم المجموعة",
   "group.group_mod_kick": "طرد @{name} من المجموعة",
   "group.group_mod_kick.success": "طُرِدَ @{name} من المجموعة",
-  "group.group_mod_promote_admin": "ترقية @{name} إلى مسؤول المجموعة",
   "group.group_mod_promote_admin.success": "تمت ترقية @{name} إلى مسؤول المجموعة",
   "group.group_mod_promote_mod": "ترقية @{name} إلى مشرف المجموعة",
-  "group.group_mod_promote_mod.success": "تمت ترقية @{name} إلى مشرف المجموعة",
   "group.group_mod_reject": "رفض",
   "group.group_mod_reject.success": "مرفوض @{name} من المجموعة",
   "group.group_mod_unblock": "رفع الحظر",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index a38f31b42..1ba5a5b7d 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -470,7 +470,6 @@
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.mute.heading": "Stummschalten",
   "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?",
-  "confirmations.promote_in_group.confirm": "Befördern",
   "confirmations.promote_in_group.message": "@{name} wirklich befördern? Die Beförderung kann nicht rückgängig gemacht werden.",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.heading": "Löschen und nue erstellen",
@@ -718,13 +717,10 @@
   "group.group_mod_block": "@{name} aus der Gruppe blockieren",
   "group.group_mod_block.success": "@{name} in der Gruppe blockiert",
   "group.group_mod_demote": "@{name} herunterstufen",
-  "group.group_mod_demote.success": "@{name} heruntergestuft",
   "group.group_mod_kick": "@{name} aus der Gruppe werfen",
   "group.group_mod_kick.success": "@{name} aus der Gruppe entfernt",
-  "group.group_mod_promote_admin": "@{name} zum Gruppenadmin ernennen",
   "group.group_mod_promote_admin.success": "@{name} als Gruppen-Admin ernannt",
   "group.group_mod_promote_mod": "@{name} zur Moderator:in der Gruppe ernennen",
-  "group.group_mod_promote_mod.success": "@{name} als Moderator:in ernannt",
   "group.group_mod_reject": "Ablehnen",
   "group.group_mod_reject.success": "@{name} in der Gruppe abgelehnt",
   "group.group_mod_unblock": "Entblocken",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 521de0979..9ed1358a8 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -509,7 +509,6 @@
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.mute.heading": "Mute @{name}",
   "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
-  "confirmations.promote_in_group.confirm": "Promover",
   "confirmations.promote_in_group.message": "¿Estás seguro de que quieres ascender a @{name}? No podrás degradarlo.",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.heading": "Delete & redraft",
@@ -773,13 +772,10 @@
   "group.group_mod_block": "Expulsar del grupo",
   "group.group_mod_block.success": "Has bloqueado correctamente a @{name} del grupo",
   "group.group_mod_demote": "Degradar a @{name}",
-  "group.group_mod_demote.success": "Degradado a @{name} a usuario del grupo",
   "group.group_mod_kick": "Expulsar a @{name} del grupo",
   "group.group_mod_kick.success": "Expulsar a @{name} del grupo",
-  "group.group_mod_promote_admin": "Ascender a @{name} a administrador del grupo",
   "group.group_mod_promote_admin.success": "Ascendió a @{nombre} a administrador del grupo",
   "group.group_mod_promote_mod": "Ascender a @{name} a moderador del grupo",
-  "group.group_mod_promote_mod.success": "Ascendió a @{nombre} a moderador del grupo",
   "group.group_mod_reject": "Rechazar",
   "group.group_mod_reject.success": "Rechazado @{name} del grupo",
   "group.group_mod_unblock": "Desbloquear",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 3217f9243..7985496db 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -495,7 +495,6 @@
   "confirmations.mute.confirm": "Silenzia",
   "confirmations.mute.heading": "Silenzia @{name}",
   "confirmations.mute.message": "Vuoi davvero silenziare {name}?",
-  "confirmations.promote_in_group.confirm": "Promuovi",
   "confirmations.promote_in_group.message": "Vuoi davvero promuovere @{nome}? Non sarai in grado di degradare questa persona.",
   "confirmations.redraft.confirm": "Cancella e riscrivi",
   "confirmations.redraft.heading": "Cancella e riscrivi",
@@ -754,13 +753,10 @@
   "group.group_mod_block": "Blocca @{name} dal gruppo",
   "group.group_mod_block.success": "Hai bloccato @{name} dal gruppo",
   "group.group_mod_demote": "Degrada @{name}",
-  "group.group_mod_demote.success": "Hai degradato @{name} a partecipante del gruppo",
   "group.group_mod_kick": "Espelli @{name} dal gruppo",
   "group.group_mod_kick.success": "Hai espulso @{name} dal gruppo",
-  "group.group_mod_promote_admin": "Promuovi @{name} all'amministrazione del gruppo",
   "group.group_mod_promote_admin.success": "Hai promosso @{name} all'amministrazione del gruppo",
   "group.group_mod_promote_mod": "Promuovi @{name} alla moderazione del gruppo",
-  "group.group_mod_promote_mod.success": "Hai promosso @{name} alla moderazione del gruppo",
   "group.group_mod_reject": "Rifiuta",
   "group.group_mod_reject.success": "Hai rifiutato la partecipazione di @{name} nel gruppo",
   "group.group_mod_unblock": "Sblocca",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 1e1a8bc1c..a5261e0af 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -495,7 +495,6 @@
   "confirmations.mute.confirm": "Demp",
   "confirmations.mute.heading": "Demp @{name}",
   "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
-  "confirmations.promote_in_group.confirm": "Fremhev",
   "confirmations.promote_in_group.message": "Er du sikker på at du vil forfremme @{name}? Du vil ikke kunne degradere dem.",
   "confirmations.redraft.confirm": "Slett & omformuler",
   "confirmations.redraft.heading": "Slett & omformuler",
@@ -744,13 +743,10 @@
   "group.group_mod_block": "Blokker @{name} fra gruppe",
   "group.group_mod_block.success": "Blokkert @{navn} fra gruppe",
   "group.group_mod_demote": "Degradere @{navn}",
-  "group.group_mod_demote.success": "Nedgradert @{name} til gruppebruker",
   "group.group_mod_kick": "Spark ut @{name} fra gruppa",
   "group.group_mod_kick.success": "Sparket ut @{name} fra gruppa",
-  "group.group_mod_promote_admin": "Forfremme @{name} til gruppeadministrator",
   "group.group_mod_promote_admin.success": "Forfremmet @{name} til gruppeadministrator",
   "group.group_mod_promote_mod": "Forfrem @{name} til gruppemoderator",
-  "group.group_mod_promote_mod.success": "Forfremmet @{name} til gruppemoderator",
   "group.group_mod_reject": "Avvis",
   "group.group_mod_reject.success": "Avvist @{navn} fra gruppen",
   "group.group_mod_unblock": "Opphev Blokkering",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index bbaac7998..ad0a162c8 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -473,7 +473,6 @@
   "confirmations.mute.confirm": "Wycisz",
   "confirmations.mute.heading": "Wycisz @{name}",
   "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
-  "confirmations.promote_in_group.confirm": "Promuj",
   "confirmations.promote_in_group.message": "Czy na pewno chcesz promować @{name}? Nie będziesz mógł(-ła) obniżyć ich rangi.",
   "confirmations.redraft.confirm": "Usuń i przeredaguj",
   "confirmations.redraft.heading": "Usuń i przeredaguj",
@@ -717,10 +716,8 @@
   "group.group_mod_block.success": "Zablokowano @{name} z grupy",
   "group.group_mod_kick": "Wyrzuć @{name} z grupy",
   "group.group_mod_kick.success": "Wyrzucono @{name} z grupy",
-  "group.group_mod_promote_admin": "Promuj @{name} na administratora grupy",
   "group.group_mod_promote_admin.success": "Promowano @{name} na administratora grupy",
   "group.group_mod_promote_mod": "Promuj @{name} na moderatora grupy",
-  "group.group_mod_promote_mod.success": "Promowano @{name} na moderatora grupy",
   "group.group_mod_reject": "Odrzuć",
   "group.group_mod_unblock": "Odblokuj",
   "group.header.alt": "Nagłówek grupy",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 99319ece7..4a2b171fb 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -509,7 +509,6 @@
   "confirmations.mute.confirm": "静音",
   "confirmations.mute.heading": "静音 @{name}",
   "confirmations.mute.message": "您确定要静音 {name} 吗？",
-  "confirmations.promote_in_group.confirm": "升级",
   "confirmations.promote_in_group.message": "您确定要升级 @{name} 吗？您将无法将其降级。",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.heading": "删除并重新编辑",
@@ -773,13 +772,10 @@
   "group.group_mod_block": "从群组中封禁 @{name}",
   "group.group_mod_block.success": "您已成功从群组中封禁 @{name}",
   "group.group_mod_demote": "降级 @{name}",
-  "group.group_mod_demote.success": "@{name} 已被降级为群组用户",
   "group.group_mod_kick": "从群组中踢出 @{name}",
   "group.group_mod_kick.success": "已从群组中踢出 @{name}",
-  "group.group_mod_promote_admin": "升级 @{name} 至群组管理员",
   "group.group_mod_promote_admin.success": "已升级 @{name} 至群组管理员",
   "group.group_mod_promote_mod": "升级 @{name} 至群组监察员",
-  "group.group_mod_promote_mod.success": "已升级 @{name} 至群组监察员",
   "group.group_mod_reject": "拒绝",
   "group.group_mod_reject.success": "已拒绝 @{name} 加入群组",
   "group.group_mod_unblock": "解除屏蔽",

From 7b10065e735714662e7c4197670337396dd4eaab Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 20 Mar 2023 22:35:53 +0100
Subject: [PATCH 009/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json    | 2 --
 app/soapbox/locales/de.json    | 2 --
 app/soapbox/locales/es.json    | 2 --
 app/soapbox/locales/it.json    | 2 --
 app/soapbox/locales/no.json    | 2 --
 app/soapbox/locales/pl.json    | 2 --
 app/soapbox/locales/zh-CN.json | 2 --
 7 files changed, 14 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 9866c01e1..020264634 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -495,7 +495,6 @@
   "confirmations.mute.confirm": "كتم",
   "confirmations.mute.heading": "كتم @{name}",
   "confirmations.mute.message": "هل تود حقًا حجب {name}؟",
-  "confirmations.promote_in_group.message": "هل أنت متأكد أنك تريد الترقية لـ @ {name}؟ لن تكون قادرًا على تخفيض رتبتهم.",
   "confirmations.redraft.confirm": "إزالة و إعادة الصياغة",
   "confirmations.redraft.heading": "إزالة وإعادة الصياغة",
   "confirmations.redraft.message": "هل تود حقًّا حذف المنشور وإعادة صياغته؟ ستفقد التفاعلات والمشاركات المتعلّقة به وستظهر الردود كمنشورات منفصلة. ",
@@ -745,7 +744,6 @@
   "group.group_mod_demote": "خفض الرتبة",
   "group.group_mod_kick": "طرد @{name} من المجموعة",
   "group.group_mod_kick.success": "طُرِدَ @{name} من المجموعة",
-  "group.group_mod_promote_admin.success": "تمت ترقية @{name} إلى مسؤول المجموعة",
   "group.group_mod_promote_mod": "ترقية @{name} إلى مشرف المجموعة",
   "group.group_mod_reject": "رفض",
   "group.group_mod_reject.success": "مرفوض @{name} من المجموعة",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 1ba5a5b7d..345f3f6f2 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -470,7 +470,6 @@
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.mute.heading": "Stummschalten",
   "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?",
-  "confirmations.promote_in_group.message": "@{name} wirklich befördern? Die Beförderung kann nicht rückgängig gemacht werden.",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.heading": "Löschen und nue erstellen",
   "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest? Favorisierungen, geteilte Beiträge und Antworten werden verloren gehen.",
@@ -719,7 +718,6 @@
   "group.group_mod_demote": "@{name} herunterstufen",
   "group.group_mod_kick": "@{name} aus der Gruppe werfen",
   "group.group_mod_kick.success": "@{name} aus der Gruppe entfernt",
-  "group.group_mod_promote_admin.success": "@{name} als Gruppen-Admin ernannt",
   "group.group_mod_promote_mod": "@{name} zur Moderator:in der Gruppe ernennen",
   "group.group_mod_reject": "Ablehnen",
   "group.group_mod_reject.success": "@{name} in der Gruppe abgelehnt",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 9ed1358a8..e35b389de 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -509,7 +509,6 @@
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.mute.heading": "Mute @{name}",
   "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
-  "confirmations.promote_in_group.message": "¿Estás seguro de que quieres ascender a @{name}? No podrás degradarlo.",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.heading": "Delete & redraft",
   "confirmations.redraft.message": "Estás seguro de que quieres borrar este estado y volverlo a borrador? Perderás todas las respuestas, impulsos y favoritos asociados a él, y las respuestas a la publicación original quedarán huérfanos.",
@@ -774,7 +773,6 @@
   "group.group_mod_demote": "Degradar a @{name}",
   "group.group_mod_kick": "Expulsar a @{name} del grupo",
   "group.group_mod_kick.success": "Expulsar a @{name} del grupo",
-  "group.group_mod_promote_admin.success": "Ascendió a @{nombre} a administrador del grupo",
   "group.group_mod_promote_mod": "Ascender a @{name} a moderador del grupo",
   "group.group_mod_reject": "Rechazar",
   "group.group_mod_reject.success": "Rechazado @{name} del grupo",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 7985496db..430d85e1d 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -495,7 +495,6 @@
   "confirmations.mute.confirm": "Silenzia",
   "confirmations.mute.heading": "Silenzia @{name}",
   "confirmations.mute.message": "Vuoi davvero silenziare {name}?",
-  "confirmations.promote_in_group.message": "Vuoi davvero promuovere @{nome}? Non sarai in grado di degradare questa persona.",
   "confirmations.redraft.confirm": "Cancella e riscrivi",
   "confirmations.redraft.heading": "Cancella e riscrivi",
   "confirmations.redraft.message": "Vuoi davvero cancellare questo stato e riscriverlo? Perderai tutte le risposte, condivisioni e segnalibri.",
@@ -755,7 +754,6 @@
   "group.group_mod_demote": "Degrada @{name}",
   "group.group_mod_kick": "Espelli @{name} dal gruppo",
   "group.group_mod_kick.success": "Hai espulso @{name} dal gruppo",
-  "group.group_mod_promote_admin.success": "Hai promosso @{name} all'amministrazione del gruppo",
   "group.group_mod_promote_mod": "Promuovi @{name} alla moderazione del gruppo",
   "group.group_mod_reject": "Rifiuta",
   "group.group_mod_reject.success": "Hai rifiutato la partecipazione di @{name} nel gruppo",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index a5261e0af..80574797b 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -495,7 +495,6 @@
   "confirmations.mute.confirm": "Demp",
   "confirmations.mute.heading": "Demp @{name}",
   "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
-  "confirmations.promote_in_group.message": "Er du sikker på at du vil forfremme @{name}? Du vil ikke kunne degradere dem.",
   "confirmations.redraft.confirm": "Slett & omformuler",
   "confirmations.redraft.heading": "Slett & omformuler",
   "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, reposts and favourites to it.",
@@ -745,7 +744,6 @@
   "group.group_mod_demote": "Degradere @{navn}",
   "group.group_mod_kick": "Spark ut @{name} fra gruppa",
   "group.group_mod_kick.success": "Sparket ut @{name} fra gruppa",
-  "group.group_mod_promote_admin.success": "Forfremmet @{name} til gruppeadministrator",
   "group.group_mod_promote_mod": "Forfrem @{name} til gruppemoderator",
   "group.group_mod_reject": "Avvis",
   "group.group_mod_reject.success": "Avvist @{navn} fra gruppen",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index ad0a162c8..672b9b323 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -473,7 +473,6 @@
   "confirmations.mute.confirm": "Wycisz",
   "confirmations.mute.heading": "Wycisz @{name}",
   "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
-  "confirmations.promote_in_group.message": "Czy na pewno chcesz promować @{name}? Nie będziesz mógł(-ła) obniżyć ich rangi.",
   "confirmations.redraft.confirm": "Usuń i przeredaguj",
   "confirmations.redraft.heading": "Usuń i przeredaguj",
   "confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Polubienia i podbicia zostaną utracone, a odpowiedzi do oryginalnego wpisu zostaną osierocone.",
@@ -716,7 +715,6 @@
   "group.group_mod_block.success": "Zablokowano @{name} z grupy",
   "group.group_mod_kick": "Wyrzuć @{name} z grupy",
   "group.group_mod_kick.success": "Wyrzucono @{name} z grupy",
-  "group.group_mod_promote_admin.success": "Promowano @{name} na administratora grupy",
   "group.group_mod_promote_mod": "Promuj @{name} na moderatora grupy",
   "group.group_mod_reject": "Odrzuć",
   "group.group_mod_unblock": "Odblokuj",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 4a2b171fb..d1caa0878 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -509,7 +509,6 @@
   "confirmations.mute.confirm": "静音",
   "confirmations.mute.heading": "静音 @{name}",
   "confirmations.mute.message": "您确定要静音 {name} 吗？",
-  "confirmations.promote_in_group.message": "您确定要升级 @{name} 吗？您将无法将其降级。",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.heading": "删除并重新编辑",
   "confirmations.redraft.message": "您确定要删除此帖文并重新编辑它吗？所有相关的转发和点赞都会被清除，回复将会失去关联。",
@@ -774,7 +773,6 @@
   "group.group_mod_demote": "降级 @{name}",
   "group.group_mod_kick": "从群组中踢出 @{name}",
   "group.group_mod_kick.success": "已从群组中踢出 @{name}",
-  "group.group_mod_promote_admin.success": "已升级 @{name} 至群组管理员",
   "group.group_mod_promote_mod": "升级 @{name} 至群组监察员",
   "group.group_mod_reject": "拒绝",
   "group.group_mod_reject.success": "已拒绝 @{name} 加入群组",

From a685065f1bfe656cf3672d9219d2725c6571fd15 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Tue, 21 Mar 2023 10:54:36 +0000
Subject: [PATCH 010/298] Translated using Weblate (Spanish)

Currently translated at 100.0% (1522 of 1522 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/es/
---
 app/soapbox/locales/es.json | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index e35b389de..cd3819566 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -470,8 +470,8 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.heading": "Block @{name}",
   "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
-  "confirmations.block_from_group.confirm": "Bloquear",
-  "confirmations.block_from_group.heading": "Miembro de un grupo de bloqueo",
+  "confirmations.block_from_group.confirm": "Prohibir al uso",
+  "confirmations.block_from_group.heading": "Expulsión del Grupo",
   "confirmations.block_from_group.message": "¿Estás seguro de que quieres expulsar a @{name} del grupo?",
   "confirmations.cancel.confirm": "Descartar",
   "confirmations.cancel.heading": "Descartar la publicación",
@@ -766,14 +766,15 @@
   "gdpr.title": "{siteTitle} uses cookies",
   "getting_started.open_source_notice": "{code_name} es software libre. Puedes contribuir o reportar errores en {code_link} (v{code_version}).",
   "group.cancel_request": "Cancelar solicitud",
+  "group.demote.user.success": "@{name} es ahora miembro",
   "group.group_mod_authorize": "Aceptar",
   "group.group_mod_authorize.success": "Aceptado @{name} al grupo",
   "group.group_mod_block": "Expulsar del grupo",
-  "group.group_mod_block.success": "Has bloqueado correctamente a @{name} del grupo",
-  "group.group_mod_demote": "Degradar a @{name}",
+  "group.group_mod_block.success": "@{name} ha sido expulsado",
+  "group.group_mod_demote": "Eliminar la función de {role}",
   "group.group_mod_kick": "Expulsar a @{name} del grupo",
   "group.group_mod_kick.success": "Expulsar a @{name} del grupo",
-  "group.group_mod_promote_mod": "Ascender a @{name} a moderador del grupo",
+  "group.group_mod_promote_mod": "Asignar la función de {role}",
   "group.group_mod_reject": "Rechazar",
   "group.group_mod_reject.success": "Rechazado @{name} del grupo",
   "group.group_mod_unblock": "Desbloquear",
@@ -792,6 +793,9 @@
   "group.privacy.public": "Público",
   "group.privacy.public.full": "Grupo público",
   "group.privacy.public.info": "Descubrible. Cualquiera puede participar.",
+  "group.promote.admin.confirmation.message": "¿Estás seguro de que quieres asignar el rol de administrador a @{name}?",
+  "group.promote.admin.confirmation.title": "Asignar la función de administrador",
+  "group.promote.admin.success": "@{name} es ahora un administrador",
   "group.role.admin": "Administrador",
   "group.role.moderator": "Moderador",
   "group.tabs.all": "Todos",
@@ -923,7 +927,7 @@
   "login_external.errors.instance_fail": "The instance returned an error.",
   "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?",
   "login_form.header": "Sign In",
-  "manage_group.blocked_members": "Miembros bloqueados",
+  "manage_group.blocked_members": "Miembros expulsados",
   "manage_group.confirmation.copy": "Copiar el enlace",
   "manage_group.confirmation.info_1": "Como propietario de este grupo, puedes asignar personal, eliminar mensajes y mucho más.",
   "manage_group.confirmation.info_2": "Publica el primer mensaje del grupo y comienza la conversación.",

From 1974655a520534634f4284d2b6c996ca64ff6f6c Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Tue, 21 Mar 2023 12:26:58 +0000
Subject: [PATCH 011/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1522 of 1522 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index d1caa0878..854b6b17b 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -470,8 +470,8 @@
   "confirmations.block.confirm": "屏蔽",
   "confirmations.block.heading": "屏蔽 @{name}",
   "confirmations.block.message": "您确定要屏蔽 {name} 吗？",
-  "confirmations.block_from_group.confirm": "屏蔽",
-  "confirmations.block_from_group.heading": "屏蔽群组成员",
+  "confirmations.block_from_group.confirm": "封禁用户",
+  "confirmations.block_from_group.heading": "从群组中封禁",
   "confirmations.block_from_group.message": "您确定要从群组中封禁 @{name} 吗？",
   "confirmations.cancel.confirm": "丢弃",
   "confirmations.cancel.heading": "丢弃帖文",
@@ -766,14 +766,15 @@
   "gdpr.title": "{siteTitle} 使用cookies",
   "getting_started.open_source_notice": "{code_name} 是开源软件。欢迎前往 GitLab（{code_link} (v{code_version})）贡献代码或反馈问题。",
   "group.cancel_request": "取消申请",
+  "group.demote.user.success": "@{name} 现在是群组成员",
   "group.group_mod_authorize": "允许",
   "group.group_mod_authorize.success": "已允许 @{name} 加入群组",
   "group.group_mod_block": "从群组中封禁 @{name}",
-  "group.group_mod_block.success": "您已成功从群组中封禁 @{name}",
-  "group.group_mod_demote": "降级 @{name}",
+  "group.group_mod_block.success": "@{name} 已封禁",
+  "group.group_mod_demote": "移除 {role} 职务",
   "group.group_mod_kick": "从群组中踢出 @{name}",
   "group.group_mod_kick.success": "已从群组中踢出 @{name}",
-  "group.group_mod_promote_mod": "升级 @{name} 至群组监察员",
+  "group.group_mod_promote_mod": "分配 {role} 职务",
   "group.group_mod_reject": "拒绝",
   "group.group_mod_reject.success": "已拒绝 @{name} 加入群组",
   "group.group_mod_unblock": "解除屏蔽",
@@ -792,6 +793,9 @@
   "group.privacy.public": "公开",
   "group.privacy.public.full": "公开群组",
   "group.privacy.public.info": "可发现。任何人都可以加入。",
+  "group.promote.admin.confirmation.message": "您确定要将管理员职务分配给 @{name} 吗？",
+  "group.promote.admin.confirmation.title": "分配管理员职务",
+  "group.promote.admin.success": "@{name} 现在是管理员",
   "group.role.admin": "管理员",
   "group.role.moderator": "监察员",
   "group.tabs.all": "全部",
@@ -923,7 +927,7 @@
   "login_external.errors.instance_fail": "实例返回了一个错误。",
   "login_external.errors.network_fail": "连接失败。是浏览器扩展程序阻止了连接吗？",
   "login_form.header": "登录",
-  "manage_group.blocked_members": "已屏蔽成员",
+  "manage_group.blocked_members": "已封禁成员",
   "manage_group.confirmation.copy": "复制链接",
   "manage_group.confirmation.info_1": "作为此群组的拥有者，你可以指派管理员，删除帖文等等。",
   "manage_group.confirmation.info_2": "发布群组的第一条帖文，开始对话。",

From 7d3e960d8f824c7af0179545ec3e259e5fec65b5 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 23 Mar 2023 18:05:31 +0100
Subject: [PATCH 012/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json    | 2 --
 app/soapbox/locales/de.json    | 2 --
 app/soapbox/locales/es.json    | 2 --
 app/soapbox/locales/it.json    | 2 --
 app/soapbox/locales/no.json    | 2 --
 app/soapbox/locales/pl.json    | 2 --
 app/soapbox/locales/zh-CN.json | 2 --
 7 files changed, 14 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 020264634..cc750e53a 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -737,7 +737,6 @@
   "gdpr.title": "موقع {siteTitle} يستخدم الكوكيز",
   "getting_started.open_source_notice": "{code_name} هو برنامَج مفتوح المصدر. يمكنك المساهمة أو الإبلاغ عن الأخطاء على {code_link} (الإصدار {code_version}).",
   "group.cancel_request": "إلغاء الطلب",
-  "group.group_mod_authorize": "قبول",
   "group.group_mod_authorize.success": "قُبِلَ @ {name} في المجموعة",
   "group.group_mod_block": "حظر @{name} من المجموعة",
   "group.group_mod_block.success": "حُظِرَ @{name} من المجموعة",
@@ -745,7 +744,6 @@
   "group.group_mod_kick": "طرد @{name} من المجموعة",
   "group.group_mod_kick.success": "طُرِدَ @{name} من المجموعة",
   "group.group_mod_promote_mod": "ترقية @{name} إلى مشرف المجموعة",
-  "group.group_mod_reject": "رفض",
   "group.group_mod_reject.success": "مرفوض @{name} من المجموعة",
   "group.group_mod_unblock": "رفع الحظر",
   "group.group_mod_unblock.success": "أُلْغِيَّ الحظر على @ {name} من المجموعة",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 345f3f6f2..2db9b5b7e 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -711,7 +711,6 @@
   "gdpr.title": "{siteTitle} verwendet Cookies",
   "getting_started.open_source_notice": "{code_name} ist quelloffene Software. Du kannst auf GitLab unter {code_link} (v{code_version}) mitarbeiten oder Probleme melden.",
   "group.cancel_request": "Anfrage zurückziehen",
-  "group.group_mod_authorize": "Annehmen",
   "group.group_mod_authorize.success": "Aufnahmeanfrage von @{name} annehmen",
   "group.group_mod_block": "@{name} aus der Gruppe blockieren",
   "group.group_mod_block.success": "@{name} in der Gruppe blockiert",
@@ -719,7 +718,6 @@
   "group.group_mod_kick": "@{name} aus der Gruppe werfen",
   "group.group_mod_kick.success": "@{name} aus der Gruppe entfernt",
   "group.group_mod_promote_mod": "@{name} zur Moderator:in der Gruppe ernennen",
-  "group.group_mod_reject": "Ablehnen",
   "group.group_mod_reject.success": "@{name} in der Gruppe abgelehnt",
   "group.group_mod_unblock": "Entblocken",
   "group.group_mod_unblock.success": "@{name} in der Gruppe entblockt",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index cd3819566..5087fdc05 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -767,7 +767,6 @@
   "getting_started.open_source_notice": "{code_name} es software libre. Puedes contribuir o reportar errores en {code_link} (v{code_version}).",
   "group.cancel_request": "Cancelar solicitud",
   "group.demote.user.success": "@{name} es ahora miembro",
-  "group.group_mod_authorize": "Aceptar",
   "group.group_mod_authorize.success": "Aceptado @{name} al grupo",
   "group.group_mod_block": "Expulsar del grupo",
   "group.group_mod_block.success": "@{name} ha sido expulsado",
@@ -775,7 +774,6 @@
   "group.group_mod_kick": "Expulsar a @{name} del grupo",
   "group.group_mod_kick.success": "Expulsar a @{name} del grupo",
   "group.group_mod_promote_mod": "Asignar la función de {role}",
-  "group.group_mod_reject": "Rechazar",
   "group.group_mod_reject.success": "Rechazado @{name} del grupo",
   "group.group_mod_unblock": "Desbloquear",
   "group.group_mod_unblock.success": "Desbloquear a @{name} del grupo",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 430d85e1d..69c767db4 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -747,7 +747,6 @@
   "gdpr.title": "{siteTitle} usa i cookie",
   "getting_started.open_source_notice": "{code_name} è un software open source. Puoi contribuire o segnalare errori su GitLab all'indirizzo {code_link} (v{code_version}).",
   "group.cancel_request": "Cancella richiesta",
-  "group.group_mod_authorize": "Accetta",
   "group.group_mod_authorize.success": "Hai accettato @{name} nel gruppo",
   "group.group_mod_block": "Blocca @{name} dal gruppo",
   "group.group_mod_block.success": "Hai bloccato @{name} dal gruppo",
@@ -755,7 +754,6 @@
   "group.group_mod_kick": "Espelli @{name} dal gruppo",
   "group.group_mod_kick.success": "Hai espulso @{name} dal gruppo",
   "group.group_mod_promote_mod": "Promuovi @{name} alla moderazione del gruppo",
-  "group.group_mod_reject": "Rifiuta",
   "group.group_mod_reject.success": "Hai rifiutato la partecipazione di @{name} nel gruppo",
   "group.group_mod_unblock": "Sblocca",
   "group.group_mod_unblock.success": "Hai sbloccato @{name} dal gruppo",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 80574797b..309240ce6 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -737,7 +737,6 @@
   "gdpr.title": "{siteTitle} bruker informasjonskapsler",
   "getting_started.open_source_notice": "{code_name} er fri programvare. Du kan bidra eller rapportere problemer på GitLab på {code_link} (v{code_version}).",
   "group.cancel_request": "Avbryt forespørsel",
-  "group.group_mod_authorize": "Aksepter",
   "group.group_mod_authorize.success": "Aksepter @{name} til gruppe",
   "group.group_mod_block": "Blokker @{name} fra gruppe",
   "group.group_mod_block.success": "Blokkert @{navn} fra gruppe",
@@ -745,7 +744,6 @@
   "group.group_mod_kick": "Spark ut @{name} fra gruppa",
   "group.group_mod_kick.success": "Sparket ut @{name} fra gruppa",
   "group.group_mod_promote_mod": "Forfrem @{name} til gruppemoderator",
-  "group.group_mod_reject": "Avvis",
   "group.group_mod_reject.success": "Avvist @{navn} fra gruppen",
   "group.group_mod_unblock": "Opphev Blokkering",
   "group.group_mod_unblock.success": "Opphevet blokkeringen av @{navn} fra gruppa",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 672b9b323..98755eb9d 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -709,14 +709,12 @@
   "gdpr.title": "{siteTitle} korzysta z ciasteczek",
   "getting_started.open_source_notice": "{code_name} jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitLabie tutaj: {code_link} (v{code_version}).",
   "group.cancel_request": "Anuluj zgłoszenie",
-  "group.group_mod_authorize": "Akceptuj",
   "group.group_mod_authorize.success": "Przyjmij @{name} do grupy",
   "group.group_mod_block": "Zablokuj @{name} z grupy",
   "group.group_mod_block.success": "Zablokowano @{name} z grupy",
   "group.group_mod_kick": "Wyrzuć @{name} z grupy",
   "group.group_mod_kick.success": "Wyrzucono @{name} z grupy",
   "group.group_mod_promote_mod": "Promuj @{name} na moderatora grupy",
-  "group.group_mod_reject": "Odrzuć",
   "group.group_mod_unblock": "Odblokuj",
   "group.header.alt": "Nagłówek grupy",
   "group.join.private": "Poproś o dołączenie do grupy",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 854b6b17b..a4f77c8db 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -767,7 +767,6 @@
   "getting_started.open_source_notice": "{code_name} 是开源软件。欢迎前往 GitLab（{code_link} (v{code_version})）贡献代码或反馈问题。",
   "group.cancel_request": "取消申请",
   "group.demote.user.success": "@{name} 现在是群组成员",
-  "group.group_mod_authorize": "允许",
   "group.group_mod_authorize.success": "已允许 @{name} 加入群组",
   "group.group_mod_block": "从群组中封禁 @{name}",
   "group.group_mod_block.success": "@{name} 已封禁",
@@ -775,7 +774,6 @@
   "group.group_mod_kick": "从群组中踢出 @{name}",
   "group.group_mod_kick.success": "已从群组中踢出 @{name}",
   "group.group_mod_promote_mod": "分配 {role} 职务",
-  "group.group_mod_reject": "拒绝",
   "group.group_mod_reject.success": "已拒绝 @{name} 加入群组",
   "group.group_mod_unblock": "解除屏蔽",
   "group.group_mod_unblock.success": "已从群组中解除屏蔽 @{name}",

From 614b0494e7152b94be0a7f7208869d3886718b8e Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Thu, 23 Mar 2023 17:19:44 +0000
Subject: [PATCH 013/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1523 of 1523 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index a4f77c8db..ceae35dda 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -192,6 +192,7 @@
   "auth.invalid_credentials": "用户名或密码错误",
   "auth.logged_out": "已登出。",
   "auth_layout.register": "创建帐号",
+  "authorize.success": "已批准",
   "backups.actions.create": "创建备份",
   "backups.empty_message": "没有找到备份。{action}",
   "backups.empty_message.action": "现在要备份吗？",
@@ -766,15 +767,16 @@
   "gdpr.title": "{siteTitle} 使用cookies",
   "getting_started.open_source_notice": "{code_name} 是开源软件。欢迎前往 GitLab（{code_link} (v{code_version})）贡献代码或反馈问题。",
   "group.cancel_request": "取消申请",
+  "group.delete.success": "群组已成功删除",
   "group.demote.user.success": "@{name} 现在是群组成员",
-  "group.group_mod_authorize.success": "已允许 @{name} 加入群组",
+  "group.group_mod_authorize.fail": "批准 @{name} 失败",
   "group.group_mod_block": "从群组中封禁 @{name}",
   "group.group_mod_block.success": "@{name} 已封禁",
   "group.group_mod_demote": "移除 {role} 职务",
   "group.group_mod_kick": "从群组中踢出 @{name}",
   "group.group_mod_kick.success": "已从群组中踢出 @{name}",
   "group.group_mod_promote_mod": "分配 {role} 职务",
-  "group.group_mod_reject.success": "已拒绝 @{name} 加入群组",
+  "group.group_mod_reject.fail": "拒绝 @{name} 失败",
   "group.group_mod_unblock": "解除屏蔽",
   "group.group_mod_unblock.success": "已从群组中解除屏蔽 @{name}",
   "group.header.alt": "群组标题",
@@ -1199,6 +1201,7 @@
   "registrations.unprocessable_entity": "此用户名已被占用。",
   "registrations.username.hint": "只能包含字母、数字和下划线",
   "registrations.username.label": "您的用户名",
+  "reject.success": "已拒绝",
   "relative_time.days": "{number}天",
   "relative_time.hours": "{number}时",
   "relative_time.just_now": "刚刚",

From 461a006d02d6fca7b7b4a85787904ab0fdb06d9b Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 24 Mar 2023 15:45:05 +0100
Subject: [PATCH 014/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json | 2 --
 app/soapbox/locales/de.json | 2 --
 app/soapbox/locales/es.json | 2 --
 app/soapbox/locales/it.json | 2 --
 app/soapbox/locales/no.json | 2 --
 app/soapbox/locales/pl.json | 1 -
 6 files changed, 11 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index cc750e53a..74d0ac4f1 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -737,14 +737,12 @@
   "gdpr.title": "موقع {siteTitle} يستخدم الكوكيز",
   "getting_started.open_source_notice": "{code_name} هو برنامَج مفتوح المصدر. يمكنك المساهمة أو الإبلاغ عن الأخطاء على {code_link} (الإصدار {code_version}).",
   "group.cancel_request": "إلغاء الطلب",
-  "group.group_mod_authorize.success": "قُبِلَ @ {name} في المجموعة",
   "group.group_mod_block": "حظر @{name} من المجموعة",
   "group.group_mod_block.success": "حُظِرَ @{name} من المجموعة",
   "group.group_mod_demote": "خفض الرتبة",
   "group.group_mod_kick": "طرد @{name} من المجموعة",
   "group.group_mod_kick.success": "طُرِدَ @{name} من المجموعة",
   "group.group_mod_promote_mod": "ترقية @{name} إلى مشرف المجموعة",
-  "group.group_mod_reject.success": "مرفوض @{name} من المجموعة",
   "group.group_mod_unblock": "رفع الحظر",
   "group.group_mod_unblock.success": "أُلْغِيَّ الحظر على @ {name} من المجموعة",
   "group.header.alt": "غلاف المجموعة",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 2db9b5b7e..53c91bc07 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -711,14 +711,12 @@
   "gdpr.title": "{siteTitle} verwendet Cookies",
   "getting_started.open_source_notice": "{code_name} ist quelloffene Software. Du kannst auf GitLab unter {code_link} (v{code_version}) mitarbeiten oder Probleme melden.",
   "group.cancel_request": "Anfrage zurückziehen",
-  "group.group_mod_authorize.success": "Aufnahmeanfrage von @{name} annehmen",
   "group.group_mod_block": "@{name} aus der Gruppe blockieren",
   "group.group_mod_block.success": "@{name} in der Gruppe blockiert",
   "group.group_mod_demote": "@{name} herunterstufen",
   "group.group_mod_kick": "@{name} aus der Gruppe werfen",
   "group.group_mod_kick.success": "@{name} aus der Gruppe entfernt",
   "group.group_mod_promote_mod": "@{name} zur Moderator:in der Gruppe ernennen",
-  "group.group_mod_reject.success": "@{name} in der Gruppe abgelehnt",
   "group.group_mod_unblock": "Entblocken",
   "group.group_mod_unblock.success": "@{name} in der Gruppe entblockt",
   "group.header.alt": "Gruppentitel",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 5087fdc05..a2fbc31d6 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -767,14 +767,12 @@
   "getting_started.open_source_notice": "{code_name} es software libre. Puedes contribuir o reportar errores en {code_link} (v{code_version}).",
   "group.cancel_request": "Cancelar solicitud",
   "group.demote.user.success": "@{name} es ahora miembro",
-  "group.group_mod_authorize.success": "Aceptado @{name} al grupo",
   "group.group_mod_block": "Expulsar del grupo",
   "group.group_mod_block.success": "@{name} ha sido expulsado",
   "group.group_mod_demote": "Eliminar la función de {role}",
   "group.group_mod_kick": "Expulsar a @{name} del grupo",
   "group.group_mod_kick.success": "Expulsar a @{name} del grupo",
   "group.group_mod_promote_mod": "Asignar la función de {role}",
-  "group.group_mod_reject.success": "Rechazado @{name} del grupo",
   "group.group_mod_unblock": "Desbloquear",
   "group.group_mod_unblock.success": "Desbloquear a @{name} del grupo",
   "group.header.alt": "Encabezado del grupo",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 69c767db4..ce38f3719 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -747,14 +747,12 @@
   "gdpr.title": "{siteTitle} usa i cookie",
   "getting_started.open_source_notice": "{code_name} è un software open source. Puoi contribuire o segnalare errori su GitLab all'indirizzo {code_link} (v{code_version}).",
   "group.cancel_request": "Cancella richiesta",
-  "group.group_mod_authorize.success": "Hai accettato @{name} nel gruppo",
   "group.group_mod_block": "Blocca @{name} dal gruppo",
   "group.group_mod_block.success": "Hai bloccato @{name} dal gruppo",
   "group.group_mod_demote": "Degrada @{name}",
   "group.group_mod_kick": "Espelli @{name} dal gruppo",
   "group.group_mod_kick.success": "Hai espulso @{name} dal gruppo",
   "group.group_mod_promote_mod": "Promuovi @{name} alla moderazione del gruppo",
-  "group.group_mod_reject.success": "Hai rifiutato la partecipazione di @{name} nel gruppo",
   "group.group_mod_unblock": "Sblocca",
   "group.group_mod_unblock.success": "Hai sbloccato @{name} dal gruppo",
   "group.header.alt": "Testata del gruppo",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 309240ce6..13362a7cd 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -737,14 +737,12 @@
   "gdpr.title": "{siteTitle} bruker informasjonskapsler",
   "getting_started.open_source_notice": "{code_name} er fri programvare. Du kan bidra eller rapportere problemer på GitLab på {code_link} (v{code_version}).",
   "group.cancel_request": "Avbryt forespørsel",
-  "group.group_mod_authorize.success": "Aksepter @{name} til gruppe",
   "group.group_mod_block": "Blokker @{name} fra gruppe",
   "group.group_mod_block.success": "Blokkert @{navn} fra gruppe",
   "group.group_mod_demote": "Degradere @{navn}",
   "group.group_mod_kick": "Spark ut @{name} fra gruppa",
   "group.group_mod_kick.success": "Sparket ut @{name} fra gruppa",
   "group.group_mod_promote_mod": "Forfrem @{name} til gruppemoderator",
-  "group.group_mod_reject.success": "Avvist @{navn} fra gruppen",
   "group.group_mod_unblock": "Opphev Blokkering",
   "group.group_mod_unblock.success": "Opphevet blokkeringen av @{navn} fra gruppa",
   "group.header.alt": "Gruppeoverskrift",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 98755eb9d..7e8c50767 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -709,7 +709,6 @@
   "gdpr.title": "{siteTitle} korzysta z ciasteczek",
   "getting_started.open_source_notice": "{code_name} jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitLabie tutaj: {code_link} (v{code_version}).",
   "group.cancel_request": "Anuluj zgłoszenie",
-  "group.group_mod_authorize.success": "Przyjmij @{name} do grupy",
   "group.group_mod_block": "Zablokuj @{name} z grupy",
   "group.group_mod_block.success": "Zablokowano @{name} z grupy",
   "group.group_mod_kick": "Wyrzuć @{name} z grupy",

From 1e76c42ad295481e0b94b9eb26a3f403eb308c1e Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Fri, 24 Mar 2023 15:41:08 +0000
Subject: [PATCH 015/298] Translated using Weblate (Spanish)

Currently translated at 100.0% (1523 of 1523 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/es/
---
 app/soapbox/locales/es.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index a2fbc31d6..594b5d58c 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -192,6 +192,7 @@
   "auth.invalid_credentials": "Nombre de usuario o contraseña incorrectos",
   "auth.logged_out": "Desconectado.",
   "auth_layout.register": "Crear una cuenta",
+  "authorize.success": "Aprobado",
   "backups.actions.create": "Crear copia de seguridad",
   "backups.empty_message": "No se han encontrado copias de seguridad. {acción}",
   "backups.empty_message.action": "¿Crear una ahora?",
@@ -766,13 +767,16 @@
   "gdpr.title": "{siteTitle} uses cookies",
   "getting_started.open_source_notice": "{code_name} es software libre. Puedes contribuir o reportar errores en {code_link} (v{code_version}).",
   "group.cancel_request": "Cancelar solicitud",
+  "group.delete.success": "Grupo eliminado correctamente",
   "group.demote.user.success": "@{name} es ahora miembro",
+  "group.group_mod_authorize.fail": "Error al aprobar @{name}",
   "group.group_mod_block": "Expulsar del grupo",
   "group.group_mod_block.success": "@{name} ha sido expulsado",
   "group.group_mod_demote": "Eliminar la función de {role}",
   "group.group_mod_kick": "Expulsar a @{name} del grupo",
   "group.group_mod_kick.success": "Expulsar a @{name} del grupo",
   "group.group_mod_promote_mod": "Asignar la función de {role}",
+  "group.group_mod_reject.fail": "Error al rechazar @{name}",
   "group.group_mod_unblock": "Desbloquear",
   "group.group_mod_unblock.success": "Desbloquear a @{name} del grupo",
   "group.header.alt": "Encabezado del grupo",
@@ -1197,6 +1201,7 @@
   "registrations.unprocessable_entity": "This username has already been taken.",
   "registrations.username.hint": "May only contain A-Z, 0-9, and underscores",
   "registrations.username.label": "Your username",
+  "reject.success": "Rechazado",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "ahora",

From 54035073aa0ea5876106f8e50a7ab563b0aea59f Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Tue, 28 Mar 2023 12:49:56 +0000
Subject: [PATCH 016/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1526 of 1526 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index ceae35dda..f123ba36b 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -1241,11 +1241,14 @@
   "report.block_hint": "您是否也要屏蔽此帐号呢？",
   "report.chatMessage.context": "当举报一个用户的消息时，被选中的前五条信息和后五条信息将被传递给我们的审核团队以了解情况。",
   "report.chatMessage.title": "举报信息",
-  "report.confirmation.content": "如果我们发现此帐号确实违反了 {link} ，我们会采取进一步的惩罚措施。",
+  "report.confirmation.content": "如果我们发现此 {entity} 确实违反了 {link} ，我们会采取进一步的处罚措施。",
+  "report.confirmation.entity.account": "帐号",
+  "report.confirmation.entity.group": "群组",
   "report.confirmation.title": "感谢您提交的举报。",
   "report.done": "完成",
   "report.forward": "发送举报至 {target}",
   "report.forward_hint": "这名用户来自另一个服务器。是否要向那个服务器发送一条匿名的举报？",
+  "report.group.title": "举报群组",
   "report.next": "下一步",
   "report.otherActions.addAdditional": "您想为此举报添加更多的状态吗？",
   "report.otherActions.addMore": "添加更多",

From 88b0b617dbe73d978486a825dc63f5722d4c281c Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 28 Mar 2023 15:36:00 +0200
Subject: [PATCH 017/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json      | 2 --
 app/soapbox/locales/bs.json      | 2 --
 app/soapbox/locales/ca.json      | 2 --
 app/soapbox/locales/cs.json      | 2 --
 app/soapbox/locales/cy.json      | 2 --
 app/soapbox/locales/de.json      | 2 --
 app/soapbox/locales/el.json      | 2 --
 app/soapbox/locales/en-Shaw.json | 2 --
 app/soapbox/locales/es-AR.json   | 2 --
 app/soapbox/locales/es.json      | 2 --
 app/soapbox/locales/fa.json      | 2 --
 app/soapbox/locales/fr.json      | 2 --
 app/soapbox/locales/ga.json      | 2 --
 app/soapbox/locales/he.json      | 2 --
 app/soapbox/locales/hi.json      | 2 --
 app/soapbox/locales/hr.json      | 2 --
 app/soapbox/locales/hu.json      | 2 --
 app/soapbox/locales/id.json      | 2 --
 app/soapbox/locales/io.json      | 2 --
 app/soapbox/locales/is.json      | 2 --
 app/soapbox/locales/it.json      | 2 --
 app/soapbox/locales/ja.json      | 2 --
 app/soapbox/locales/kk.json      | 2 --
 app/soapbox/locales/ko.json      | 2 --
 app/soapbox/locales/lt.json      | 2 --
 app/soapbox/locales/lv.json      | 2 --
 app/soapbox/locales/mk.json      | 2 --
 app/soapbox/locales/ms.json      | 2 --
 app/soapbox/locales/nn.json      | 2 --
 app/soapbox/locales/no.json      | 2 --
 app/soapbox/locales/oc.json      | 2 --
 app/soapbox/locales/pl.json      | 2 --
 app/soapbox/locales/pt-BR.json   | 2 --
 app/soapbox/locales/pt.json      | 2 --
 app/soapbox/locales/ro.json      | 2 --
 app/soapbox/locales/ru.json      | 2 --
 app/soapbox/locales/sk.json      | 2 --
 app/soapbox/locales/sl.json      | 2 --
 app/soapbox/locales/sr-Latn.json | 2 --
 app/soapbox/locales/sr.json      | 2 --
 app/soapbox/locales/sv.json      | 2 --
 app/soapbox/locales/ta.json      | 2 --
 app/soapbox/locales/te.json      | 2 --
 app/soapbox/locales/th.json      | 2 --
 app/soapbox/locales/tr.json      | 2 --
 app/soapbox/locales/uk.json      | 2 --
 app/soapbox/locales/zh-CN.json   | 2 --
 app/soapbox/locales/zh-HK.json   | 2 --
 app/soapbox/locales/zh-TW.json   | 2 --
 49 files changed, 98 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 74d0ac4f1..fa6030b5f 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -91,9 +91,7 @@
   "admin.announcements.edit": "تعديل",
   "admin.announcements.ends_at": "ينتهي عند:",
   "admin.announcements.starts_at": "يبدأ عند:",
-  "admin.awaiting_approval.approved_message": "تمت الموافقة على {acct}!",
   "admin.awaiting_approval.empty_message": "ليس هناك حسابات جديدة للموافقة عليها. عندما يقوم شخص ما بالتسجيل، ستتمكن من مراجعة الحساب هنا.",
-  "admin.awaiting_approval.rejected_message": "رُفِضَ {acct}!",
   "admin.dashboard.registration_mode.approval_hint": "يمكن للمستخدمين إنشاء الحسابات، لكن تُفعَّل حساباتهم عند قبولها من طرف المدير.",
   "admin.dashboard.registration_mode.approval_label": "يتطلب الموافقة",
   "admin.dashboard.registration_mode.closed_hint": "لا يمكن لأحد إنشاء حساب جديد، ولكن مازال بإمكانك دعوتهم.",
diff --git a/app/soapbox/locales/bs.json b/app/soapbox/locales/bs.json
index b12e24a8e..435b42b98 100644
--- a/app/soapbox/locales/bs.json
+++ b/app/soapbox/locales/bs.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Potražite profil",
   "actualStatus.edited": "Uređeno {datum}",
   "actualStatuses.quote_tombstone": "Objava je nedostupna.",
-  "admin.awaiting_approval.approved_message": "{acct} je odobren!",
   "admin.awaiting_approval.empty_message": "Niko ne čeka na odobrenje. Kada se novi korisnik prijavi, možete ga pregledati ovdje.",
-  "admin.awaiting_approval.rejected_message": "{acct} je odbijen.",
   "admin.dashboard.registration_mode.approval_hint": "Korisnici se mogu registrovati, ali njihov račun se aktivira tek kada administrator to odobri.",
   "admin.dashboard.registration_mode.approval_label": "Čeka odobrenje",
   "admin.dashboard.registration_mode.closed_hint": "Registracija novih članova isključena. I dalje možete pozvati ljude.",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index d04d62c64..62f495db5 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -45,9 +45,7 @@
   "account_moderation_modal.roles.admin": "Admin",
   "account_moderation_modal.roles.user": "User",
   "account_note.target": "Note for @{target}",
-  "admin.awaiting_approval.approved_message": "{acct} ha estat aprovat!",
   "admin.awaiting_approval.empty_message": "Ningú espera l'aprovació. Quan un nou usuari s'inicia sessió, podeu revisar-los aquí.",
-  "admin.awaiting_approval.rejected_message": "{acct} ha estat rebutjat.",
   "admin.dashboard.registration_mode.approval_hint": "Els usuaris poden registrar-se, però el seu compte només s'activa quan un administrador l'aprova.",
   "admin.dashboard.registration_mode.approval_label": "Cal una aprovació",
   "admin.dashboard.registration_mode.closed_hint": "Ningú pot registrar-se. Segueixes podent invitar gent.",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index a04e9f7ce..0811858bd 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -67,9 +67,7 @@
   "account_note.save": "Uložit",
   "account_note.target": "Note for @{target}",
   "actualStatuses.quote_tombstone": "Příspěvek není dostupný.",
-  "admin.awaiting_approval.approved_message": "Účet {acct} byl schválen!",
   "admin.awaiting_approval.empty_message": "Na schválení nikdo nečeká. Až se nějaký nový uživatel zaregistruje, tady si můžete jeho žádost prohlédnout.",
-  "admin.awaiting_approval.rejected_message": "Účet {acct} byl odmítnut.",
   "admin.dashboard.registration_mode.approval_hint": "Uživatelé se mohou zaregistrovat, ale jejich účet se aktivuje až když ho schválí administrátor",
   "admin.dashboard.registration_mode.approval_label": "Pouze po schválení",
   "admin.dashboard.registration_mode.closed_hint": "Zaregistrovat se nemůže nikdo. Ale vy můžete lidi pozvat.",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index 062786bb4..1b202dc0b 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 53c91bc07..386a30081 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Nach einem Account suchen",
   "actualStatus.edited": "Bearbeitet {date}",
   "actualStatuses.quote_tombstone": "Beitrag ist nicht verfügbar.",
-  "admin.awaiting_approval.approved_message": "{acct} bestätigt!",
   "admin.awaiting_approval.empty_message": "Keine neuen Nutzer zur Prüfung und Bestätigung vorhanden. Wenn sich ein neuer Nutzer anmeldet, kann er hier überprüft werden.",
-  "admin.awaiting_approval.rejected_message": "{acct} abgelehnt.",
   "admin.dashboard.registration_mode.approval_hint": "Neue Nutzer können sich anmelden, müssen aber erst vom Adminstrator geprüft und aktiviert werden.",
   "admin.dashboard.registration_mode.approval_label": "Bestätigung erforderlich",
   "admin.dashboard.registration_mode.closed_hint": "Neuanmeldungen sind zurzeit ausgesetzt. Einladungen sind weiterhin möglich.",
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index 5b6ec8d7b..359ce8ce0 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/en-Shaw.json b/app/soapbox/locales/en-Shaw.json
index 5cfbd5caa..b2e169b4c 100644
--- a/app/soapbox/locales/en-Shaw.json
+++ b/app/soapbox/locales/en-Shaw.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "𐑕𐑻𐑗 𐑓 𐑩𐑯 𐑩𐑒𐑬𐑯𐑑",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} 𐑢𐑪𐑟 𐑩𐑐𐑮𐑵𐑝𐑛!",
   "admin.awaiting_approval.empty_message": "𐑞𐑺 𐑦𐑟 𐑯𐑴𐑚𐑪𐑛𐑦 𐑢𐑱𐑑𐑦𐑙 𐑓 𐑩𐑐𐑮𐑵𐑝𐑩𐑤. 𐑢𐑧𐑯 𐑩 𐑯𐑿 𐑿𐑟𐑼 𐑕𐑲𐑯𐑟 𐑳𐑐, 𐑿 𐑒𐑨𐑯 𐑮𐑦𐑝𐑿 𐑞𐑧𐑥 𐑣𐑽.",
-  "admin.awaiting_approval.rejected_message": "{acct} 𐑢𐑪𐑟 𐑮𐑦𐑡𐑧𐑒𐑑𐑩𐑛.",
   "admin.dashboard.registration_mode.approval_hint": "𐑿𐑟𐑼𐑟 𐑒𐑨𐑯 𐑕𐑲𐑯 𐑳𐑐, 𐑚𐑳𐑑 𐑞𐑺 𐑩𐑒𐑬𐑯𐑑 𐑴𐑯𐑤𐑦 𐑜𐑧𐑑𐑕 𐑨𐑒𐑑𐑦𐑝𐑱𐑑𐑩𐑛 𐑢𐑧𐑯 𐑩𐑯 𐑨𐑛𐑥𐑦𐑯 𐑩𐑐𐑮𐑵𐑝𐑟 𐑦𐑑.",
   "admin.dashboard.registration_mode.approval_label": "𐑩𐑐𐑮𐑵𐑝𐑩𐑤 𐑮𐑦𐑒𐑢𐑲𐑼𐑛",
   "admin.dashboard.registration_mode.closed_hint": "𐑯𐑴𐑚𐑪𐑛𐑦 𐑒𐑨𐑯 𐑕𐑲𐑯 𐑳𐑐. 𐑿 𐑒𐑨𐑯 𐑕𐑑𐑦𐑤 𐑦𐑯𐑝𐑲𐑑 𐑐𐑰𐑐𐑩𐑤.",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index e0ee51f98..1af32095e 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 594b5d58c..5b3f58dda 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -91,9 +91,7 @@
   "admin.announcements.edit": "Editar",
   "admin.announcements.ends_at": "Acaba en:",
   "admin.announcements.starts_at": "Empieza en:",
-  "admin.awaiting_approval.approved_message": "¡{acct} ha sido aprobado!",
   "admin.awaiting_approval.empty_message": "No hay nadie esperando aprobación. Cuando se registre un nuevo usuario, puedes revisarlo aquí.",
-  "admin.awaiting_approval.rejected_message": "{acct} fue rechazado.",
   "admin.dashboard.registration_mode.approval_hint": "Los usuarios pueden registrarse, pero su cuenta sólo se activa cuando un administrador la aprueba.",
   "admin.dashboard.registration_mode.approval_label": "Aprobación requerida",
   "admin.dashboard.registration_mode.closed_hint": "Nadie puede inscribirse. Aún puedes invitar a más gente.",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index d748cf7a5..ca1f611ea 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index 9eb36afb0..7a4f9730c 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Rechercher un compte",
   "actualStatus.edited": "Edité le {date}",
   "actualStatuses.quote_tombstone": "Publication indisponible.",
-  "admin.awaiting_approval.approved_message": "{acct} a été approuvé !",
   "admin.awaiting_approval.empty_message": "Personne n'attend d'approbation. Quand un nouveau compte s'affiche, vous pouvez l'examiner ici.",
-  "admin.awaiting_approval.rejected_message": "Le compte {acct} a été rejeté.",
   "admin.dashboard.registration_mode.approval_hint": "Tout le monde peut s'inscrire, mais leur compte ne s'active qu'après approbation.",
   "admin.dashboard.registration_mode.approval_label": "Approbation requise",
   "admin.dashboard.registration_mode.closed_hint": "Personne ne peut s'inscrire. Vous pouvez toujours inviter des gens.",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index 69c576437..bfdeb9469 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index 67d668745..13b3636a3 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "חפש משתמש",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} הואשר!",
   "admin.awaiting_approval.empty_message": "אף אחד לא מחכה לאישור. כאשר משתמש חדש יירשם, תוכל לבחון אותו פה.",
-  "admin.awaiting_approval.rejected_message": "{acct} נדחה",
   "admin.dashboard.registration_mode.approval_hint": "משתמשים יכולים להרשם, אבל החשבון שלהם מופעל רק כשמנהל יאשר אותו.",
   "admin.dashboard.registration_mode.approval_label": "נדרש אישור",
   "admin.dashboard.registration_mode.closed_hint": "אף אחד לא יכול להרשם. אתה עדיין יכול להזמין אנשים.",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index 1abb37855..6607823e2 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index d44f3bb68..e1d08b7f0 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Potražite račun",
   "actualStatus.edited": "Uređeno {datum}",
   "actualStatuses.quote_tombstone": "Objava je nedostupna.",
-  "admin.awaiting_approval.approved_message": "{acct} je odobren!",
   "admin.awaiting_approval.empty_message": "Nitko ne čeka odobrenje. Kada se novi korisnik prijavi, možete ga pregledati ovdje.",
-  "admin.awaiting_approval.rejected_message": "{acct} je odbijen.",
   "admin.dashboard.registration_mode.approval_hint": "Korisnici se mogu prijaviti, ali njihov račun se aktivira tek kada ga administrator odobri.",
   "admin.dashboard.registration_mode.approval_label": "Potrebno odobrenje",
   "admin.dashboard.registration_mode.closed_hint": "Nitko se ne može prijaviti. I dalje možete pozvati ljude.",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index 8bc1105a8..3465572d8 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index 76d9bfeb3..04ce194e6 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index 76b9f135c..c272f8a1a 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/is.json b/app/soapbox/locales/is.json
index 7e7d1a49c..0f36a744b 100644
--- a/app/soapbox/locales/is.json
+++ b/app/soapbox/locales/is.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Leita að notanda",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} var samþykktur!",
   "admin.awaiting_approval.empty_message": "Það er enginn að bíða eftir samþykki. Þegar nýr notandi skráir sig geturðu skoðað hann hér.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Notendur geta skráð sig, en reikningurinn þeirra verður aðeins virkur þegar stjórnandi samþykkir það.",
   "admin.dashboard.registration_mode.approval_label": "Samþykki Krefst",
   "admin.dashboard.registration_mode.closed_hint": "Enginn getur skráð sig. Þú getur samt boðið fólki inn.",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index ce38f3719..eed0a69ab 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -91,9 +91,7 @@
   "admin.announcements.edit": "Modifica",
   "admin.announcements.ends_at": "Termina alle:",
   "admin.announcements.starts_at": "Inizia alle:",
-  "admin.awaiting_approval.approved_message": "Approvazione per {acct}!",
   "admin.awaiting_approval.empty_message": "Nessuno aspetta l'approvazione. Quando nuove persone si iscrivono, puoi approvarle da qui.",
-  "admin.awaiting_approval.rejected_message": "Rifiuto per {acct}.",
   "admin.dashboard.registration_mode.approval_hint": "Iscrizioni aperte ma l'attivazione previa approvazione dagli amministratori.",
   "admin.dashboard.registration_mode.approval_label": "Richiesta di approvazione",
   "admin.dashboard.registration_mode.closed_hint": "Iscrizioni chiuse. Puoi comunque invitare persone.",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index 71ca077ea..c012a65e4 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -85,9 +85,7 @@
   "account_search.placeholder": "アカウントを検索",
   "actualStatus.edited": "{date}に編集済",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index 310ef90c9..048c7d26a 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index 68c2830bd..dc71d944f 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index b22ebb49c..f7a6feb0a 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index 1c1bf54fc..1273f390d 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index 2f63b155b..4a8280b12 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index 7089527c3..ef8885c64 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index 49f2523ba..e3339e389 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 13362a7cd..72fc9bc4c 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -91,9 +91,7 @@
   "admin.announcements.edit": "Rediger",
   "admin.announcements.ends_at": "Slutter på:",
   "admin.announcements.starts_at": "Starter på:",
-  "admin.awaiting_approval.approved_message": "{acct} ble godkjent!",
   "admin.awaiting_approval.empty_message": "Det er ingen som venter på godkjenning. Når en ny bruker registrerer seg, kan du se dem her.",
-  "admin.awaiting_approval.rejected_message": "{acct} ble avslått.",
   "admin.dashboard.registration_mode.approval_hint": "Brukere kan registrere seg, men kontoen deres blir bare aktivert når en administrator godkjenner den.",
   "admin.dashboard.registration_mode.approval_label": "Godkjenning kreves",
   "admin.dashboard.registration_mode.closed_hint": "Ingen kan registrere seg. Men du kan invitere personer.",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index db7fde4a6..a4ce6b548 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 7e8c50767..ff3d39cbd 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -91,9 +91,7 @@
   "admin.announcements.edit": "Edytuj",
   "admin.announcements.ends_at": "Kończy się:",
   "admin.announcements.starts_at": "Rozpoczyna się:",
-  "admin.awaiting_approval.approved_message": "Przyjęto {acct}!",
   "admin.awaiting_approval.empty_message": "Nikt nie oczekuje przyjęcia. Gdy zarejestruje się nowy użytkownik, możesz zatwierdzić go tutaj.",
-  "admin.awaiting_approval.rejected_message": "Odrzucono {acct}!",
   "admin.dashboard.registration_mode.approval_hint": "Użytkownicy mogą zarejestrować się, ale ich konto aktywuje się dopiero gdy zostanie ono zatwierdzone przez administratora.",
   "admin.dashboard.registration_mode.approval_label": "Wymagane przyjęcie",
   "admin.dashboard.registration_mode.closed_hint": "Nikt nie może się zarejestrować. Wciąż możesz zapraszać ludzi.",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index 5d7b0bbfd..79ebcaab9 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index 88a0764b0..e3fc41a9d 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} foi aprovada!",
   "admin.awaiting_approval.empty_message": "Não há ninguém à espera de aprovação. Quando um utilizador novo se registar, podes analisá-lo aqui.",
-  "admin.awaiting_approval.rejected_message": "{acct} foi rejeitada.",
   "admin.dashboard.registration_mode.approval_hint": "Utilizadores podem se registar, mas a conta só é ativada quando um administrador a aprovar.",
   "admin.dashboard.registration_mode.approval_label": "Aprovação necessária",
   "admin.dashboard.registration_mode.closed_hint": "Ninguém pode se registar. Ainda podes convidar pessoas.",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 5bf350b2f..b089675ba 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 323d514cd..818f1092d 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} одобрен!",
   "admin.awaiting_approval.empty_message": "Сейчас здесь пусто. Записи на одобрение появятся, когда кто-нибудь зарегистрируется.",
-  "admin.awaiting_approval.rejected_message": "{acct} отклонён.",
   "admin.dashboard.registration_mode.approval_hint": "Пользователи могут зарегистрироваться, но одобрение проводится администратором.",
   "admin.dashboard.registration_mode.approval_label": "Требуется Одобрение",
   "admin.dashboard.registration_mode.closed_hint": "Регистрация закрыта. Вы можете высылать приглашения.",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index ed613b438..6093583a3 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index 995a22835..2267c1b6b 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index eab81148b..51157cb08 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index 229f60a3c..a411c3451 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index d4f460dd8..208627c1d 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index a8c261c0c..c9584dfed 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index 702553df6..963317686 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index 4c27161b4..ce698efb5 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 4f27ce2ec..5694eb65b 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index b4feaa481..915397a47 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -84,9 +84,7 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
-  "admin.awaiting_approval.approved_message": "{acct} was approved!",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.awaiting_approval.rejected_message": "{acct} was rejected.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
   "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index f123ba36b..0de608147 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -91,9 +91,7 @@
   "admin.announcements.edit": "编辑",
   "admin.announcements.ends_at": "结束于：",
   "admin.announcements.starts_at": "开始于：",
-  "admin.awaiting_approval.approved_message": "{acct} 的注册申请已通过！",
   "admin.awaiting_approval.empty_message": "没有未处理的注册申请，如果有新的申请，它就会显示在这里。",
-  "admin.awaiting_approval.rejected_message": "{acct} 的注册请求已拒绝。",
   "admin.dashboard.registration_mode.approval_hint": "用户可以注册，但帐户只有在管理员批准后才会被激活。",
   "admin.dashboard.registration_mode.approval_label": "需要批准",
   "admin.dashboard.registration_mode.closed_hint": "用户不可以注册。但您仍可以邀请别人。",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index 64dcefcf1..a007447e8 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -73,9 +73,7 @@
   "account_search.placeholder": "搜尋使用者",
   "actualStatus.edited": "在 {date} 時編輯",
   "actualStatuses.quote_tombstone": "帖文不可用",
-  "admin.awaiting_approval.approved_message": "{acct} 已經通過審核！",
   "admin.awaiting_approval.empty_message": "沒有新使用者等待審核，如果有新的申請，它就會顯示在這裏。",
-  "admin.awaiting_approval.rejected_message": "{acct} 的註冊請求被拒絕！",
   "admin.dashboard.registration_mode.approval_hint": "在管理員同意註冊申請後才可加入。",
   "admin.dashboard.registration_mode.approval_label": "需要審核",
   "admin.dashboard.registration_mode.closed_hint": "公開註冊已經關閉，但已註冊用户仍然可以邀請其他人加入。",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index f8c3025e8..788c8cdab 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -73,9 +73,7 @@
   "account_search.placeholder": "搜尋使用者",
   "actualStatus.edited": "在 {date} 時編輯",
   "actualStatuses.quote_tombstone": "帖文不可用",
-  "admin.awaiting_approval.approved_message": "{acct} 已經通過審核！",
   "admin.awaiting_approval.empty_message": "沒有新使用者等待審核，如果有新的申請，它就會顯示在這裏。",
-  "admin.awaiting_approval.rejected_message": "{acct} 的註冊請求被拒絕！",
   "admin.dashboard.registration_mode.approval_hint": "在管理員同意註冊申請後才可加入。",
   "admin.dashboard.registration_mode.approval_label": "需要審核",
   "admin.dashboard.registration_mode.closed_hint": "公開註冊已經關閉，但已註冊用戶仍然可以邀請其他人加入。",

From 291d2e62c5a847ef01ce65977060fa693e0b36f9 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Tue, 28 Mar 2023 16:14:00 +0000
Subject: [PATCH 018/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1525 of 1525 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 0de608147..f15984173 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -823,6 +823,7 @@
   "groups.pending.empty.title": "暂无待处理的申请",
   "groups.pending.label": "待处理的申请",
   "groups.popular.label": "推荐群组",
+  "groups.search.placeholder": "搜索我的群组",
   "hashtag.column_header.tag_mode.all": "以及{additional}",
   "hashtag.column_header.tag_mode.any": "或是{additional}",
   "hashtag.column_header.tag_mode.none": "而不用{additional}",

From 8300559eba1f2efa1179635cb96d511e66085216 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Wed, 29 Mar 2023 04:10:18 +0000
Subject: [PATCH 019/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1531 of 1531 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index f15984173..836656583 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -316,6 +316,7 @@
   "column.developers.service_worker": "服务工作进程",
   "column.direct": "私信",
   "column.directory": "发现更多",
+  "column.dislikes": "踩",
   "column.domain_blocks": "已屏蔽的站点",
   "column.edit_profile": "编辑个人资料",
   "column.event_map": "活动地点",
@@ -661,6 +662,7 @@
   "empty_column.bookmarks": "您还没有任何书签，一旦您将帖文加入书签，它就会显示在这里。",
   "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
   "empty_column.direct": "您还没有使用过私信。当您发出或者收到私信时，它会在这里显示。",
+  "empty_column.dislikes": "没有人踩过此帖文。若有，则会显示在这里。",
   "empty_column.domain_blocks": "目前没有被隐藏的站点。",
   "empty_column.event_participant_requests": "目前没有待处理的活动参与申请。",
   "empty_column.event_participants": "没有人加入过此活动。若有，则会显示在这里。",
@@ -1214,6 +1216,8 @@
   "remote_instance.pin_host": "置顶 {host}",
   "remote_instance.unpin_host": "取消置顶 {host}",
   "remote_interaction.account_placeholder": "输入您想采取行动的帐号（格式：用户名@域名）",
+  "remote_interaction.dislike": "前去点踩",
+  "remote_interaction.dislike_title": "远程点踩帖文",
   "remote_interaction.divider": "或",
   "remote_interaction.event_join": "前去参加",
   "remote_interaction.event_join_title": "远程参加事件",
@@ -1397,6 +1401,7 @@
   "status.detailed_status": "详细对话视图",
   "status.direct": "发送私信给 @{name}",
   "status.disabled_replies.group_membership": "仅群组成员可以回复",
+  "status.disfavourite": "踩",
   "status.edit": "编辑",
   "status.embed": "嵌入帖文",
   "status.external": "查看帖文于 {domain}",
@@ -1406,6 +1411,7 @@
   "status.group_mod_block": "从群组中屏蔽 @{name}",
   "status.group_mod_delete": "将帖文移出群组",
   "status.group_mod_kick": "从群组中踢出 @{name}",
+  "status.interactions.dislikes": "次点踩",
   "status.interactions.favourites": "次点赞",
   "status.interactions.quotes": "次引用",
   "status.interactions.reblogs": "次转发",

From 5e6d054f65c55a55d5fad08ea9dcd1695a63cd11 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Wed, 29 Mar 2023 16:37:20 +0000
Subject: [PATCH 020/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1531 of 1531 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 836656583..a3425c945 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -316,7 +316,7 @@
   "column.developers.service_worker": "服务工作进程",
   "column.direct": "私信",
   "column.directory": "发现更多",
-  "column.dislikes": "踩",
+  "column.dislikes": "点踩",
   "column.domain_blocks": "已屏蔽的站点",
   "column.edit_profile": "编辑个人资料",
   "column.event_map": "活动地点",
@@ -662,7 +662,7 @@
   "empty_column.bookmarks": "您还没有任何书签，一旦您将帖文加入书签，它就会显示在这里。",
   "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
   "empty_column.direct": "您还没有使用过私信。当您发出或者收到私信时，它会在这里显示。",
-  "empty_column.dislikes": "没有人踩过此帖文。若有，则会显示在这里。",
+  "empty_column.dislikes": "没有人点踩过此帖文。若有，则会显示在这里。",
   "empty_column.domain_blocks": "目前没有被隐藏的站点。",
   "empty_column.event_participant_requests": "目前没有待处理的活动参与申请。",
   "empty_column.event_participants": "没有人加入过此活动。若有，则会显示在这里。",
@@ -1042,7 +1042,7 @@
   "new_group_panel.action": "创建群组",
   "new_group_panel.subtitle": "找不到您要找的东西？开始您自己的私有或公共群组。",
   "new_group_panel.title": "创建群组",
-  "notification.favourite": "{name} 赞了您的帖文",
+  "notification.favourite": "{name} 点赞了您的帖文",
   "notification.follow": "{name} 开始关注您",
   "notification.follow_request": "{name} 请求关注您",
   "notification.mention": "{name} 提及了您",
@@ -1386,7 +1386,7 @@
   "soapbox_config.verified_can_edit_name_label": "允许经过验证的用户编辑他们自己的昵称。",
   "sponsored.info.message": "{siteTitle} 展示广告以使服务可持续运行。",
   "sponsored.info.title": "为何我会看到此广告？",
-  "sponsored.subtitle": "赞助",
+  "sponsored.subtitle": "赞助帖文",
   "status.admin_account": "管理用户 @{name}",
   "status.admin_status": "在审核界面打开此帖",
   "status.approval.pending": "等待批准",
@@ -1401,7 +1401,7 @@
   "status.detailed_status": "详细对话视图",
   "status.direct": "发送私信给 @{name}",
   "status.disabled_replies.group_membership": "仅群组成员可以回复",
-  "status.disfavourite": "踩",
+  "status.disfavourite": "点踩",
   "status.edit": "编辑",
   "status.embed": "嵌入帖文",
   "status.external": "查看帖文于 {domain}",
@@ -1433,7 +1433,7 @@
   "status.read_more": "阅读全文",
   "status.reblog": "转发",
   "status.reblog_private": "转发（可见范围不变）",
-  "status.reblogged_by": "{name} 已转发",
+  "status.reblogged_by": "{name} 转发了",
   "status.reblogs.empty": "没有人转发过此条帖文。若有，则会显示在这里。",
   "status.redraft": "删除并重新编辑",
   "status.remove_account_from_group": "将帐号移出群组",

From 721c85f10811114ec6ec7b1db217a0c51e04ac35 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Thu, 30 Mar 2023 13:00:26 +0000
Subject: [PATCH 021/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1532 of 1532 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index a3425c945..f1c6e05ca 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -1481,6 +1481,7 @@
   "tabs_bar.profile": "个人资料",
   "tabs_bar.search": "搜索",
   "tabs_bar.settings": "设置",
+  "textarea.counter.label": "剩余 {count} 个字符",
   "theme_editor.Reset": "重置",
   "theme_editor.export": "导出主题",
   "theme_editor.import": "导入主题",

From 83b80dc48c9021753fa0dfe2e7f715811a187345 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Thu, 30 Mar 2023 15:37:20 +0000
Subject: [PATCH 022/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1538 of 1538 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index f1c6e05ca..66829b3d1 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -378,7 +378,7 @@
   "column.search": "搜索",
   "column.settings_store": "设置储存",
   "column.soapbox_config": "Soapbox 设置",
-  "column.test": "测试时间线",
+  "column.test": "测试时间轴",
   "column_forbidden.body": "您没有权限访问此页面。",
   "column_forbidden.title": "无权访问",
   "common.cancel": "取消",
@@ -554,7 +554,7 @@
   "developers.navigation.service_worker_label": "服务工作进程",
   "developers.navigation.settings_store_label": "设置储存",
   "developers.navigation.show_toast": "触发推送",
-  "developers.navigation.test_timeline_label": "测试时间线",
+  "developers.navigation.test_timeline_label": "测试时间轴",
   "developers.settings_store.advanced": "高级设置",
   "developers.settings_store.hint": "您可以在此处直接编辑您的用户设置。当心！编辑此部分可能会破坏您的帐号，您将只能通过 API 恢复。",
   "direct.search_placeholder": "发送私信给……",
@@ -692,7 +692,7 @@
   "empty_column.search.groups": "无群组匹配 \"{term}\"",
   "empty_column.search.hashtags": "无标签匹配 \"{term}\"",
   "empty_column.search.statuses": "无帖文匹配 \"{term}\"",
-  "empty_column.test": "测试时间线是空的。",
+  "empty_column.test": "测试时间轴是空的。",
   "event.banner": "活动横幅",
   "event.copy": "复制链接到活动",
   "event.date": "日期",
@@ -732,7 +732,7 @@
   "export_data.success.blocks": "屏蔽列表导出完毕",
   "export_data.success.followers": "关注列表导出完毕",
   "export_data.success.mutes": "静音列表导出完毕",
-  "federation_restriction.federated_timeline_removal": "从联邦宇宙时间线移除",
+  "federation_restriction.federated_timeline_removal": "从联邦宇宙时间轴移除",
   "federation_restriction.followers_only": "仅关注者可见",
   "federation_restriction.full_media_removal": "完全移除媒体",
   "federation_restriction.media_nsfw": "附件标注为 NSFW",
@@ -787,6 +787,9 @@
   "group.leave": "离开群组",
   "group.leave.success": "离开了群组",
   "group.manage": "管理群组",
+  "group.popover.action": "查看群组",
+  "group.popover.summary": "您必须是群组成员才能回复此状态。",
+  "group.popover.title": "需要成员身份",
   "group.privacy.locked": "私有",
   "group.privacy.locked.full": "私有群组",
   "group.privacy.locked.info": "可发现。用户可以在其申请被批准后加入。",
@@ -940,9 +943,12 @@
   "manage_group.done": "完成",
   "manage_group.edit_group": "编辑群组",
   "manage_group.edit_success": "群组已编辑",
+  "manage_group.fields.cannot_change_hint": "创建群组后此设置将无法更改。",
   "manage_group.fields.description_label": "描述",
   "manage_group.fields.description_placeholder": "描述",
+  "manage_group.fields.name_help": "创建群组后此设置将无法更改。",
   "manage_group.fields.name_label": "群组名称（必填）",
+  "manage_group.fields.name_label_optional": "群组名称",
   "manage_group.fields.name_placeholder": "群组名称",
   "manage_group.get_started": "让我们开始吧！",
   "manage_group.next": "下一步",
@@ -1085,7 +1091,7 @@
   "onboarding.fediverse.its_you": "这是您！ 其他人可以通过使用您的全名 @-handle 从其他服务器关注您。",
   "onboarding.fediverse.message": "联邦宇宙是一个由成千上万个不同的、独立运行的社交媒体网站（又称 \"服务器\"）组成的社交网络。您可以关注大多数其它联邦宇宙服务器的用户--以及点赞、转发和回复帖子，因为他们可以与 {siteTitle} 沟通。",
   "onboarding.fediverse.next": "下一步",
-  "onboarding.fediverse.other_instances": "当浏览您的时间线时，注意第二个 @ 符号后的完整用户名，以了解帖文来自哪个服务器。",
+  "onboarding.fediverse.other_instances": "当浏览您的时间轴时，注意第二个 @ 符号后的完整用户名，以了解帖文来自哪个服务器。",
   "onboarding.fediverse.title": "{siteTitle} 只是联邦宇宙的一部分",
   "onboarding.fediverse.trailer": "因为它是分布式的，任何人都可以运行自己的服务器，所以联邦宇宙是有弹性和开放的。如果您选择加入另一个服务器或建立自己的服务器，您可以与相同的人互动，并继续在同一个社会图谱上。",
   "onboarding.finished.message": "我们非常高兴地欢迎您加入我们的社区！ 点击下面的按钮，让我们开始吧。",
@@ -1099,7 +1105,7 @@
   "onboarding.skip": "现在跳过",
   "onboarding.suggestions.subtitle": "以下是几个受欢迎的帐号，您可能会喜欢。",
   "onboarding.suggestions.title": "推荐帐号",
-  "onboarding.view_feed": "浏览列表",
+  "onboarding.view_feed": "查看时间轴",
   "password_reset.confirmation": "请查阅确认邮件。",
   "password_reset.fields.username_placeholder": "电子邮件或用户名",
   "password_reset.header": "重置密码",
@@ -1122,8 +1128,8 @@
   "poll_button.remove_poll": "移除投票",
   "preferences.fields.auto_play_gif_label": "自动播放GIF动图",
   "preferences.fields.auto_play_video_label": "自动播放视频",
-  "preferences.fields.autoload_more_label": "滚动到时间线底部时自动加载更多帖文",
-  "preferences.fields.autoload_timelines_label": "滚动到时间线顶部时自动加载新帖",
+  "preferences.fields.autoload_more_label": "滚动到时间轴底部时自动加载更多帖文",
+  "preferences.fields.autoload_timelines_label": "滚动到时间轴顶部时自动加载新帖",
   "preferences.fields.boost_modal_label": "转发前确认",
   "preferences.fields.content_type_label": "默认帖文格式",
   "preferences.fields.delete_modal_label": "删除帖文前确认",
@@ -1186,7 +1192,7 @@
   "registration.password_mismatch": "密码不匹配。",
   "registration.privacy": "隐私政策",
   "registration.reason": "您为什么想要注册本站？",
-  "registration.reason_hint": "认真填写将会加快您通过的速度",
+  "registration.reason_hint": "这将有助于我们审核您的申请",
   "registration.sign_up": "注册",
   "registration.tos": "用户条款",
   "registration.username_unavailable": "用户名已被占用。",
@@ -1369,7 +1375,7 @@
   "soapbox_config.hints.promo_panel_icons.link": "Soapbox 图标列表",
   "soapbox_config.home_footer.meta_fields.label_placeholder": "标签",
   "soapbox_config.home_footer.meta_fields.url_placeholder": "链接",
-  "soapbox_config.media_preview_hint": "一些后端提供了媒体的优化版本，以便在时间线上显示。然而，如果没有额外的配置，这些预览图像可能太小。",
+  "soapbox_config.media_preview_hint": "一些后端提供了媒体的优化版本，以便在时间轴上显示。然而，如果没有额外的配置，这些预览图像可能太小。",
   "soapbox_config.media_preview_label": "倾向于预览媒体的缩略图",
   "soapbox_config.promo_panel.meta_fields.icon_placeholder": "图标",
   "soapbox_config.promo_panel.meta_fields.label_placeholder": "标签",

From 0cc1b8af0973f01e5b191595b290a48b48efe0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 31 Mar 2023 03:38:58 +0000
Subject: [PATCH 023/298] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 95.2% (1465 of 1538 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/nb_NO/
---
 app/soapbox/locales/no.json | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 72fc9bc4c..7cbc5810f 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -190,6 +190,7 @@
   "auth.invalid_credentials": "Feil brukernavn eller passord",
   "auth.logged_out": "Logget ut.",
   "auth_layout.register": "Opprett en konto",
+  "authorize.success": "Godkjent",
   "backups.actions.create": "Opprett sikkerhetskopi",
   "backups.empty_message": "Ingen sikkerhetskopier funnet. {action}",
   "backups.empty_message.action": "Opprette en nå?",
@@ -281,6 +282,13 @@
   "chats.main.blankslate_with_chats.subtitle": "Velg fra en av de åpne samtalene dine, eller opprett en ny melding.",
   "chats.main.blankslate_with_chats.title": "Velg en samtale",
   "chats.search_placeholder": "Start a chat with…",
+  "colum.filters.expiration.1800": "30 minutter",
+  "colum.filters.expiration.21600": "6 timer",
+  "colum.filters.expiration.3600": "1 time",
+  "colum.filters.expiration.43200": "12 timer",
+  "colum.filters.expiration.604800": "1 uke",
+  "colum.filters.expiration.86400": "1 dag",
+  "colum.filters.expiration.never": "Aldri",
   "column.admin.announcements": "Kunngjøring",
   "column.admin.awaiting_approval": "Avventer godkjenning",
   "column.admin.create_announcement": "Opprett kunngjøring",
@@ -319,6 +327,7 @@
   "column.favourites": "Liker",
   "column.federation_restrictions": "Føderasjonsrestriksjoner",
   "column.filters": "Dempede ord",
+  "column.filters.accounts": "Kontoer",
   "column.filters.add_new": "Legg til nytt filter",
   "column.filters.conversations": "Samtaler",
   "column.filters.create_error": "Feil ved tilføying av filter",
@@ -326,7 +335,9 @@
   "column.filters.delete_error": "Feil ved sletting av filter",
   "column.filters.drop_header": "Slipp i stedet for å gjemme",
   "column.filters.drop_hint": "Filtrerte innlegg forsvinner irreversibelt, selv om filteret senere fjernes",
+  "column.filters.edit": "Rediger",
   "column.filters.expires": "Utløper etter",
+  "column.filters.hide_header": "Skjul fullstendig",
   "column.filters.home_timeline": "Hjemmetidslinje",
   "column.filters.keyword": "Nøkkelord eller frase",
   "column.filters.notifications": "Varslinger",
@@ -623,6 +634,8 @@
   "emoji_button.recent": "Hyppig brukt",
   "emoji_button.search": "Søk…",
   "emoji_button.search_results": "Søkeresultat",
+  "emoji_button.skins_1": "Forvalg",
+  "emoji_button.skins_2": "",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
   "empty_column.account_blocked": "Du er blokkert av @{accountUsername}.",
@@ -722,9 +735,13 @@
   "filters.added": "Filter lagt til.",
   "filters.context_header": "Filtrer kontekster",
   "filters.context_hint": "En eller flere kontekster der filteret skal brukes",
+  "filters.create_filter": "Opprett filter",
   "filters.filters_list_context_label": "Filtrer kontekster:",
   "filters.filters_list_drop": "Fjern",
+  "filters.filters_list_expired": "Utløpt",
   "filters.filters_list_hide": "Skjul",
+  "filters.filters_list_hide_completely": "Skjul innhold",
+  "filters.filters_list_warn": "Vis advarsel",
   "filters.removed": "Filter slettet.",
   "followRecommendations.heading": "Foreslåtte Profiler",
   "follow_request.authorize": "Autorisér",
@@ -744,19 +761,37 @@
   "group.group_mod_unblock": "Opphev Blokkering",
   "group.group_mod_unblock.success": "Opphevet blokkeringen av @{navn} fra gruppa",
   "group.header.alt": "Gruppeoverskrift",
+  "group.join.private": "Forespør tilgang",
+  "group.join.public": "Ta del i gruppe",
   "group.join.request_success": "Har bedt om å bli med i gruppa",
   "group.join.success": "Ble med i gruppa",
   "group.leave": "Forlat gruppa",
   "group.leave.success": "Forlot gruppa",
   "group.manage": "Behandle gruppe",
+  "group.popover.action": "Vis gruppe",
+  "group.popover.title": "Medlemskap kreves",
   "group.privacy.locked": "Privat",
+  "group.privacy.locked.full": "Privat gruppe",
   "group.privacy.public": "Offentlig",
+  "group.privacy.public.full": "Offentlig gruppe",
   "group.role.admin": "Administrator",
   "group.role.moderator": "Moderator",
   "group.tabs.all": "Alle",
   "group.tabs.members": "Medlemmer",
+  "group.upload_banner": "Last opp bilde",
+  "groups.discover.popular.show_more": "Vis mer",
+  "groups.discover.popular.title": "Populære grupper",
+  "groups.discover.search.error.subtitle": "Prøv igjen senere.",
+  "groups.discover.search.placeholder": "Søk",
+  "groups.discover.search.recent_searches.blankslate.title": "Ingen nylige søk",
+  "groups.discover.search.recent_searches.clear_all": "Tøm alt",
+  "groups.discover.search.recent_searches.title": "Nylige søk",
+  "groups.discover.search.results.groups": "Grupper",
+  "groups.discover.suggested.show_more": "Vis mer",
+  "groups.discover.suggested.title": "Foreslått for deg",
   "groups.empty.subtitle": "Begynn å oppdage grupper du kan bli med i, eller opprett din egen.",
   "groups.empty.title": "Ingen grupper ennå",
+  "groups.popular.label": "Foreslåtte grupper",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "uten {additional}",

From 8eba32a20c4448fcddf8564b540f3ae18d9e0d1e Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 31 Mar 2023 05:41:00 +0200
Subject: [PATCH 024/298] Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/no.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 7cbc5810f..21bb11751 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -635,7 +635,6 @@
   "emoji_button.search": "Søk…",
   "emoji_button.search_results": "Søkeresultat",
   "emoji_button.skins_1": "Forvalg",
-  "emoji_button.skins_2": "",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
   "empty_column.account_blocked": "Du er blokkert av @{accountUsername}.",

From 4134557e0dc05cacd035a9ea1ff9583e4e8341fd Mon Sep 17 00:00:00 2001
From: Ahmad Dakhlallah <ahmad@linuxarabia.co>
Date: Fri, 31 Mar 2023 07:45:07 +0000
Subject: [PATCH 025/298] Translated using Weblate (Arabic)

Currently translated at 94.2% (1450 of 1538 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ar/
---
 app/soapbox/locales/ar.json | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index fa6030b5f..11f93b9b1 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -119,7 +119,7 @@
   "admin.edit_announcement.fields.start_time_placeholder": "الإعلان يبدأ في:",
   "admin.edit_announcement.save": "حفظ",
   "admin.edit_announcement.updated": "عُدِّلَ الإعلان",
-  "admin.latest_accounts_panel.more": "إضغط لعرض {count} {count, plural, one {حساب} other {حسابات}}",
+  "admin.latest_accounts_panel.more": "إضغط لعرض {count, plural, one {# حساب} other {# حسابات}}",
   "admin.latest_accounts_panel.title": "أحدث الحسابات",
   "admin.moderation_log.empty_message": "لم تنفِّذ أيّ عملية إشرافٍ بعد. عندما تفعل سيظهر سجلٌّ لها هنا.",
   "admin.reports.actions.close": "إغلاق",
@@ -190,6 +190,7 @@
   "auth.invalid_credentials": "اسم المستخدم أو كلمة المرور خاطئة",
   "auth.logged_out": "سُجِّل الخروج.",
   "auth_layout.register": "إنشاء حساب",
+  "authorize.success": "موافق عليه",
   "backups.actions.create": "إنشاء نسخة إحتياطية",
   "backups.empty_message": "لم يتم العثور على نسخ احتياطية. {action}",
   "backups.empty_message.action": "إنشاء نسخة احتياطية الآن؟",
@@ -281,6 +282,13 @@
   "chats.main.blankslate_with_chats.subtitle": "اختر من إحدى الدردشات المفتوحة أو أنشئ رسالة جديدة.",
   "chats.main.blankslate_with_chats.title": "اختيار دردشة",
   "chats.search_placeholder": "بَدْء دردشة مع…",
+  "colum.filters.expiration.1800": "30 دقيقة",
+  "colum.filters.expiration.21600": "6 ساعات",
+  "colum.filters.expiration.3600": "ساعة",
+  "colum.filters.expiration.43200": "12 ساعة",
+  "colum.filters.expiration.604800": "أسبوع",
+  "colum.filters.expiration.86400": "يوم",
+  "colum.filters.expiration.never": "أبداً",
   "column.admin.announcements": "الإعلانات",
   "column.admin.awaiting_approval": "في انتظار الموافقة",
   "column.admin.create_announcement": "إنشاء إعلان",
@@ -319,6 +327,7 @@
   "column.favourites": "الإعجابات",
   "column.federation_restrictions": "القيود على الفيدرالية",
   "column.filters": "الكلمات المُرشِّحة",
+  "column.filters.accounts": "الحسابات",
   "column.filters.add_new": "إضافة مُرشّح جديد",
   "column.filters.conversations": "المحادثات",
   "column.filters.create_error": "حدث خطأ في أثناء إضافة المُرشّح",
@@ -326,12 +335,18 @@
   "column.filters.delete_error": "حدث خطأ في أثناء حذف المُرشّح",
   "column.filters.drop_header": "الحظر بدلا من الإخفاء",
   "column.filters.drop_hint": "ستختفي المنشورات التي تم ترشيحُها بشكل نهائي، حتى لو أُزيل المُرشّح لاحقًا",
+  "column.filters.edit": "تحرير",
   "column.filters.expires": "ينتهي خلال",
+  "column.filters.hide_header": "إخفاء بالكامل",
+  "column.filters.hide_hint": "إخفاء المحتوى الذي تمت تصفيته تمامًا ، بدلاً من إظهار تحذير",
   "column.filters.home_timeline": "المنشورات الرئيسية",
   "column.filters.keyword": "كلمة دلالية أو جملة",
+  "column.filters.keywords": "كلمات أو عبارات",
   "column.filters.notifications": "الإشعارات",
   "column.filters.public_timeline": "المنشورات العامة",
   "column.filters.subheading_add_new": "إضافة مُرشّح جديد",
+  "column.filters.title": "عنوان",
+  "column.filters.whole_word": "الكلمة كلّها",
   "column.follow_requests": "طلبات المتابعة",
   "column.followers": "المتابعين",
   "column.following": "يتابع",
@@ -368,7 +383,7 @@
   "common.cancel": "إلغاء",
   "common.error": "هناك خطب ما. حاول إعادة تحميل الصفحة.",
   "compare_history_modal.header": "تعديل السِّجل",
-  "compose.character_counter.title": "تم استخدام {chars} حرف من {maxChars}",
+  "compose.character_counter.title": "أُستخدم {chars} حرف من أصل {maxChars} {maxChars, plural, one {حروف} other {حروف}}",
   "compose.edit_success": "تم تعديل المنشور",
   "compose.invalid_schedule": "يجب عليك جدولة منشور بمدة لا تقل عن 5 دقائق.",
   "compose.submit_success": "تم إرسال المنشور",
@@ -454,9 +469,9 @@
   "confirmations.block.confirm": "حجب",
   "confirmations.block.heading": "حجب @{name}",
   "confirmations.block.message": "هل تود حقًا حظر {name}؟",
-  "confirmations.block_from_group.confirm": "حظر",
-  "confirmations.block_from_group.heading": "حظر عضو المجموعة",
-  "confirmations.block_from_group.message": "هل أنت متأكد من أنك تريد منع @{name} من التفاعل مع هذه المجموعة؟",
+  "confirmations.block_from_group.confirm": "حجب المستخدم",
+  "confirmations.block_from_group.heading": "حظر من المجموعة",
+  "confirmations.block_from_group.message": "متأكد من حظر @{name} من التفاعل مع هذه المجموعة؟",
   "confirmations.cancel.confirm": "تجاهل",
   "confirmations.cancel.heading": "تجاهل المنشور",
   "confirmations.cancel.message": "هل أنت متأكد أنك تريد إلغاء إنشاء هذا المنشور؟",
@@ -513,7 +528,7 @@
   "confirmations.unfollow.confirm": "إلغاء المتابعة",
   "crypto_donate.explanation_box.message": "{siteTitle} يقبل العملات الرقمية . بإمكانك التبرع عبر أي من هذه العناوين في الأسفل . شكرا لدعمك!",
   "crypto_donate.explanation_box.title": "يتم إرسال العملات الرقمية",
-  "crypto_donate_panel.actions.view": "انقر لإظهار {count} {count, plural, one {wallet} other {wallets}}",
+  "crypto_donate_panel.actions.view": "اضغط لعرض {count, plural, one {# محفظة} other {# محفظة}}",
   "crypto_donate_panel.heading": "تبرّع بالعملات الرقمية",
   "crypto_donate_panel.intro.message": "يقبل {siteTitle} العملات الرقمية لدعم تواجه . شكراً لدعمك!",
   "datepicker.day": "يوم",
@@ -612,6 +627,7 @@
   "email_verifilcation.exists": "هذا البريد الإلكتروني مستخدم بالفعل.",
   "embed.instructions": "يمكنكم إدراج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
   "emoji_button.activity": "الأنشطة",
+  "emoji_button.add_custom": "أضف إيموجي مخصص",
   "emoji_button.custom": "مخصص",
   "emoji_button.flags": "الأعلام",
   "emoji_button.food": "الطعام والشراب",
@@ -619,10 +635,16 @@
   "emoji_button.nature": "الطبيعة",
   "emoji_button.not_found": "ليس هناك رموز تعبيرية ┻━┻︵╯  (°□°╰）",
   "emoji_button.objects": "أشياء",
+  "emoji_button.oh_no": "أوه لا!",
   "emoji_button.people": "الناس",
+  "emoji_button.pick": "اختر رمزًا تعبيريًا …",
   "emoji_button.recent": "الشائعة الاستخدام",
   "emoji_button.search": "البحث...",
   "emoji_button.search_results": "نتائج البحث",
+  "emoji_button.skins_1": "الإفتراضي",
+  "emoji_button.skins_2": "فاتح",
+  "emoji_button.skins_3": "ضوء المتوسط",
+  "emoji_button.skins_4": "متوسط",
   "emoji_button.symbols": "رموز",
   "emoji_button.travel": "الأماكن والسفر",
   "empty_column.account_blocked": "تم حظرك بواسطة @{accountUsername}.",
@@ -1370,7 +1392,7 @@
   "status.unbookmark": "تمت الإزالة من المحفوظات",
   "status.unbookmarked": "أُزيلت بنجاح.",
   "status.unmute_conversation": "إلغاء كتم المحادثة",
-  "status.unpin": "إزالة التثبيت من الملف الشخصي",
+  "status.unpin": "إلغاء التثبيت",
   "status_list.queue_label": "إضغط لترى {count} {count, plural, one {post} other {posts}} جديدة",
   "statuses.quote_tombstone": "المنشور غير متوفر.",
   "statuses.tombstone": "هناك منشور أو أكثر غير متاحين.",

From d7e76743d79991695073dcff184b66b4b7d3154e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 31 Mar 2023 03:41:14 +0000
Subject: [PATCH 026/298] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 95.8% (1474 of 1538 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/nb_NO/
---
 app/soapbox/locales/no.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 21bb11751..fc6f6a76d 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -791,6 +791,7 @@
   "groups.empty.subtitle": "Begynn å oppdage grupper du kan bli med i, eller opprett din egen.",
   "groups.empty.title": "Ingen grupper ennå",
   "groups.popular.label": "Foreslåtte grupper",
+  "groups.search.placeholder": "Søk i mine grupper",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "uten {additional}",
@@ -894,8 +895,11 @@
   "login_external.errors.network_fail": "Tilkoblingen mislyktes. Blokkerer en nettleserutvidelse den?",
   "login_form.header": "Sign In",
   "manage_group.blocked_members": "Blokkerte medlemmer",
+  "manage_group.confirmation.copy": "Kopier lenke",
+  "manage_group.confirmation.share": "Del denne gruppen",
   "manage_group.create": "Opprette",
   "manage_group.delete_group": "Slett gruppe",
+  "manage_group.done": "Ferdig",
   "manage_group.edit_group": "Rediger gruppe",
   "manage_group.edit_success": "Gruppen ble redigert",
   "manage_group.fields.description_label": "Beskrivelse",
@@ -1160,6 +1164,7 @@
   "registrations.unprocessable_entity": "Dette brukernavnet er allerede tatt.",
   "registrations.username.hint": "Kan bare inneholde A-Z, 0-9 og understreker",
   "registrations.username.label": "Brukernavnet ditt",
+  "reject.success": "Avslått",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "nå",
@@ -1200,10 +1205,13 @@
   "report.chatMessage.context": "Når du rapporterer en brukers melding, sendes de fem meldingene før og fem meldinger etter den valgte til modereringsteamet vårt for konteks.",
   "report.chatMessage.title": "Rapporter melding",
   "report.confirmation.content": "Hvis vi finner ut at denne kontoen bryter med {link}, vil vi iverksette ytterligere tiltak i saken.",
+  "report.confirmation.entity.account": "konto",
+  "report.confirmation.entity.group": "gruppe",
   "report.confirmation.title": "Takk for at du sendte inn rapporten.",
   "report.done": "Ferdig",
   "report.forward": "Videresend til {target}",
   "report.forward_hint": "Kontoen er fra en annen server. Sende en kopi av rapporten dit også?",
+  "report.group.title": "Rapporter gruppe",
   "report.next": "Next",
   "report.otherActions.addAdditional": "Ønsker du å legge til flere statuser i denne rapporten?",
   "report.otherActions.addMore": "Legg til mer",
@@ -1394,6 +1402,7 @@
   "status.sensitive_warning": "Følsomt innhold",
   "status.sensitive_warning.subtitle": "Dette innholdet er kanskje ikke egnet for alle målgrupper.",
   "status.share": "Del",
+  "status.show_filter_reason": "Vis uansett",
   "status.show_less_all": "Vis mindre for alle",
   "status.show_more_all": "Vis mer for alle",
   "status.show_original": "Vis originalen",
@@ -1430,6 +1439,7 @@
   "tabs_bar.profile": "Profil",
   "tabs_bar.search": "Søk",
   "tabs_bar.settings": "Innstillinger",
+  "textarea.counter.label": "{count} tegn gjenstår",
   "theme_editor.Reset": "Tilbakestill",
   "theme_editor.export": "Eksporter tema",
   "theme_editor.import": "Importer tema",

From 828e9a881c8cbebe10e35dedfda5a73d33a93d7f Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 31 Mar 2023 13:44:51 +0200
Subject: [PATCH 027/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json    | 1 -
 app/soapbox/locales/de.json    | 1 -
 app/soapbox/locales/es.json    | 1 -
 app/soapbox/locales/it.json    | 1 -
 app/soapbox/locales/no.json    | 1 -
 app/soapbox/locales/pl.json    | 1 -
 app/soapbox/locales/zh-CN.json | 1 -
 7 files changed, 7 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 11f93b9b1..7fed9acf5 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -774,7 +774,6 @@
   "group.privacy.locked": "خاص",
   "group.privacy.public": "عام",
   "group.role.admin": "مسؤول",
-  "group.role.moderator": "مشرف",
   "group.tabs.all": "الكل",
   "group.tabs.members": "الأعضاء",
   "groups.empty.subtitle": "ابدأ في اكتشاف مجموعات للانضمام إليها أو إنشاء مجموعاتك الخاصة.",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 386a30081..b56492a3f 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -728,7 +728,6 @@
   "group.privacy.locked": "Privat",
   "group.privacy.public": "Öffentlich",
   "group.role.admin": "Administrator:in",
-  "group.role.moderator": "Moderator:in",
   "group.tabs.all": "Alle",
   "group.tabs.members": "Mitglieder",
   "groups.empty.subtitle": "Entdecke Gruppen zum teilnehmen oder erstelle deine eigene.",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 5b3f58dda..2a3734796 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -795,7 +795,6 @@
   "group.promote.admin.confirmation.title": "Asignar la función de administrador",
   "group.promote.admin.success": "@{name} es ahora un administrador",
   "group.role.admin": "Administrador",
-  "group.role.moderator": "Moderador",
   "group.tabs.all": "Todos",
   "group.tabs.members": "Miembros",
   "group.upload_banner": "Subir una foto",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index eed0a69ab..5b23d5e5c 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -764,7 +764,6 @@
   "group.privacy.locked": "Privato",
   "group.privacy.public": "Pubblico",
   "group.role.admin": "Amministrazione",
-  "group.role.moderator": "Moderazione",
   "group.tabs.all": "Tutto",
   "group.tabs.members": "Partecipanti",
   "groups.discover.search.no_results.subtitle": "Prova a cercare un altro gruppo.",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index fc6f6a76d..2c36a887b 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -774,7 +774,6 @@
   "group.privacy.public": "Offentlig",
   "group.privacy.public.full": "Offentlig gruppe",
   "group.role.admin": "Administrator",
-  "group.role.moderator": "Moderator",
   "group.tabs.all": "Alle",
   "group.tabs.members": "Medlemmer",
   "group.upload_banner": "Last opp bilde",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index ff3d39cbd..9ed7732f4 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -722,7 +722,6 @@
   "group.privacy.locked": "Prywatna",
   "group.privacy.public": "Publiczna",
   "group.role.admin": "Administrator",
-  "group.role.moderator": "Moderator",
   "group.tabs.all": "Wszystko",
   "group.tabs.members": "Członkowie",
   "groups.empty.subtitle": "Odkrywaj grupy do których możesz dołączyć lub utwórz własną.",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 66829b3d1..4a8535742 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -800,7 +800,6 @@
   "group.promote.admin.confirmation.title": "分配管理员职务",
   "group.promote.admin.success": "@{name} 现在是管理员",
   "group.role.admin": "管理员",
-  "group.role.moderator": "监察员",
   "group.tabs.all": "全部",
   "group.tabs.members": "成员",
   "group.upload_banner": "已上传照片",

From 2a3586ba24a5c01afe6fa3096e8a827d1a204a8a Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Fri, 31 Mar 2023 16:25:09 +0000
Subject: [PATCH 028/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1539 of 1539 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 4a8535742..fa77dd456 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -799,7 +799,9 @@
   "group.promote.admin.confirmation.message": "您确定要将管理员职务分配给 @{name} 吗？",
   "group.promote.admin.confirmation.title": "分配管理员职务",
   "group.promote.admin.success": "@{name} 现在是管理员",
+  "group.report.label": "举报",
   "group.role.admin": "管理员",
+  "group.role.owner": "拥有者",
   "group.tabs.all": "全部",
   "group.tabs.members": "成员",
   "group.upload_banner": "已上传照片",

From 7dde47f5a1f9eaf4219ce9f7dbd99302122666f0 Mon Sep 17 00:00:00 2001
From: Isabell De Inschnitzel <ghostofcordoba@protonmail.com>
Date: Sat, 1 Apr 2023 09:32:40 +0000
Subject: [PATCH 029/298] Translated using Weblate (German)

Currently translated at 90.9% (1400 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/de/
---
 app/soapbox/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index b56492a3f..e311c8b6a 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -1293,7 +1293,7 @@
   "status.disabled_replies.group_membership": "Nur Gruppenmitglieder können antworten",
   "status.edit": "Bearbeiten",
   "status.embed": "Einbetten",
-  "status.external": "Öffne auf Heimatdomäne",
+  "status.external": "Auf Originalseite öffnen",
   "status.favourite": "Favorisieren",
   "status.filtered": "Gefiltert",
   "status.group": "Gepostet in {group}",

From 6c2887e8b3be729b67b7b540dcb691271767bd8f Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Sat, 1 Apr 2023 04:55:59 +0000
Subject: [PATCH 030/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1540 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index fa77dd456..7d1bd916d 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -443,6 +443,7 @@
   "compose_form.spoiler_placeholder": "折叠部分的警告消息",
   "compose_form.spoiler_remove": "移除敏感标记",
   "compose_form.spoiler_title": "敏感内容",
+  "compose_group.share_to_followers": "与我的关注者分享",
   "confirmation_modal.cancel": "取消",
   "confirmations.admin.deactivate_user.confirm": "停用帐号 @{name}",
   "confirmations.admin.deactivate_user.heading": "停用帐号 @{acct}",

From d558fb9f610c634b94a2c6edca394378f277183f Mon Sep 17 00:00:00 2001
From: jonnysemon <johndevand@tutanota.com>
Date: Sat, 1 Apr 2023 19:47:50 +0000
Subject: [PATCH 031/298] Translated using Weblate (Arabic)

Currently translated at 99.1% (1527 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ar/
---
 app/soapbox/locales/ar.json | 93 ++++++++++++++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 7fed9acf5..b82546511 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -316,6 +316,7 @@
   "column.developers.service_worker": "Service Worker",
   "column.direct": "الرسائل الخاصة",
   "column.directory": "تصفح الحسابات",
+  "column.dislikes": "عدم الإعجاب",
   "column.domain_blocks": "النطاقات المخفية",
   "column.edit_profile": "تعديل المِلف الشخصي",
   "column.event_map": "موقع الحدث",
@@ -442,6 +443,7 @@
   "compose_form.spoiler_placeholder": "تنبيه عن المحتوى",
   "compose_form.spoiler_remove": "إزالة الحساسية",
   "compose_form.spoiler_title": "محتوى حسَّاس",
+  "compose_group.share_to_followers": "شارك مع متابعيني",
   "confirmation_modal.cancel": "إلغاء",
   "confirmations.admin.deactivate_user.confirm": "تعطيل @{name}",
   "confirmations.admin.deactivate_user.heading": "تعطيل @{acct}",
@@ -633,7 +635,7 @@
   "emoji_button.food": "الطعام والشراب",
   "emoji_button.label": "أدرج رمز تعبيري",
   "emoji_button.nature": "الطبيعة",
-  "emoji_button.not_found": "ليس هناك رموز تعبيرية ┻━┻︵╯  (°□°╰）",
+  "emoji_button.not_found": "لم يتم العثور على رموز تعبيرية.",
   "emoji_button.objects": "أشياء",
   "emoji_button.oh_no": "أوه لا!",
   "emoji_button.people": "الناس",
@@ -645,6 +647,9 @@
   "emoji_button.skins_2": "فاتح",
   "emoji_button.skins_3": "ضوء المتوسط",
   "emoji_button.skins_4": "متوسط",
+  "emoji_button.skins_5": "داكن-متوسط",
+  "emoji_button.skins_6": "داكن",
+  "emoji_button.skins_choose": "اختر لون البشرة الافتراضي",
   "emoji_button.symbols": "رموز",
   "emoji_button.travel": "الأماكن والسفر",
   "empty_column.account_blocked": "تم حظرك بواسطة @{accountUsername}.",
@@ -658,6 +663,7 @@
   "empty_column.bookmarks": "ليس لديك أي علامات ، ستظهر هنا عند اضافتها.",
   "empty_column.community": " لا توجد منشورات في بسّام بعد. أكتب شيئا ما للعامة كبداية!",
   "empty_column.direct": "لم تتلقَ أي رسالة خاصة مباشرة بعد. ستعرض الرسائل المباشرة هنا في حال أرسلت أو تلقيت بعضها.",
+  "empty_column.dislikes": "لا أحد قام بعدم إعجاب هذا المنشور حتى الآن. عندما يفعل شخص ما ، سيظهرون هنا.",
   "empty_column.domain_blocks": "ليس هناك نطاقات مخفية بعد.",
   "empty_column.event_participant_requests": "لا توجد طلبات معلقة للمشاركة في الحدث.",
   "empty_column.event_participants": "لم ينضم أحد إلى هذا الحدث حتى الآن. عندما يفعل شخص ما ، سوف يظهر هنا.",
@@ -744,9 +750,14 @@
   "filters.added": "أُضيف المُرشّح.",
   "filters.context_header": "سياق المُرشِّح",
   "filters.context_hint": "سياق واحد أو أكثر حيث يجب تطبيق المُرشِّح",
+  "filters.create_filter": "إنشاء عامل تصفية",
   "filters.filters_list_context_label": "سياق المُرشِّح:",
   "filters.filters_list_drop": "إسقاط",
+  "filters.filters_list_expired": "انتهت الصلاحية",
   "filters.filters_list_hide": "إخفاء",
+  "filters.filters_list_hide_completely": "إخفاء المحتوى",
+  "filters.filters_list_phrases_label": "كلمة دلالية أو جملة:",
+  "filters.filters_list_warn": "عرض تحذير",
   "filters.removed": "حُذف المُرشِّح.",
   "followRecommendations.heading": "الحسابات المقترحة",
   "follow_request.authorize": "ترخيص بالوصول",
@@ -757,27 +768,67 @@
   "gdpr.title": "موقع {siteTitle} يستخدم الكوكيز",
   "getting_started.open_source_notice": "{code_name} هو برنامَج مفتوح المصدر. يمكنك المساهمة أو الإبلاغ عن الأخطاء على {code_link} (الإصدار {code_version}).",
   "group.cancel_request": "إلغاء الطلب",
-  "group.group_mod_block": "حظر @{name} من المجموعة",
-  "group.group_mod_block.success": "حُظِرَ @{name} من المجموعة",
-  "group.group_mod_demote": "خفض الرتبة",
+  "group.delete.success": "تم حذف المجموعة بنجاح",
+  "group.demote.user.success": "@{name} اصبح عضو الآن",
+  "group.group_mod_authorize.fail": "فشلت الموافقة على @{name}",
+  "group.group_mod_block": "حظر من المجموعة",
+  "group.group_mod_block.success": "تم حظر @{name}",
+  "group.group_mod_demote": "حذف {role} الرتبة",
   "group.group_mod_kick": "طرد @{name} من المجموعة",
   "group.group_mod_kick.success": "طُرِدَ @{name} من المجموعة",
-  "group.group_mod_promote_mod": "ترقية @{name} إلى مشرف المجموعة",
+  "group.group_mod_promote_mod": "ترقية {role} الرتبة",
+  "group.group_mod_reject.fail": "فشل الرفض @{name}",
   "group.group_mod_unblock": "رفع الحظر",
   "group.group_mod_unblock.success": "أُلْغِيَّ الحظر على @ {name} من المجموعة",
   "group.header.alt": "غلاف المجموعة",
+  "group.join.private": "طلب الدخول",
+  "group.join.public": "الإنضمام إلى المجموعة",
   "group.join.request_success": "طلب الانضمام للمجموعة",
-  "group.join.success": "الإنضمام إلى المجموعة",
+  "group.join.success": "تم الإنضمام إلى المجموعة بنجاح",
   "group.leave": "غادر المجموعة",
   "group.leave.success": "غادر المجموعة",
   "group.manage": "إدارة المجموعة",
+  "group.popover.action": "عرض المجموعة",
+  "group.popover.summary": "يجب أن تكون عضوًا في المجموعة للرد على هذه الحالة.",
+  "group.popover.title": "العضوية مطلوبة",
   "group.privacy.locked": "خاص",
+  "group.privacy.locked.full": "مجموعة خاصة",
+  "group.privacy.locked.info": "قابل للاكتشاف. يمكن للمستخدمين الانضمام بعد الموافقة على طلبهم.",
   "group.privacy.public": "عام",
+  "group.privacy.public.full": "مجموعة عامة",
+  "group.privacy.public.info": "قابل للاكتشاف. يمكن لأي شخص الانضمام.",
+  "group.promote.admin.confirmation.message": "هل تريد بالتأكيد تعيين دور المسؤول إلى @{name}؟",
+  "group.promote.admin.confirmation.title": "تعيين دور المسؤول",
+  "group.promote.admin.success": "@{name} هو الآن مسؤول",
+  "group.report.label": "تبليغ",
   "group.role.admin": "مسؤول",
+  "group.role.owner": "مالك",
   "group.tabs.all": "الكل",
   "group.tabs.members": "الأعضاء",
+  "group.upload_banner": "رفع الصورة",
+  "groups.discover.popular.show_more": "عرض المزيد",
+  "groups.discover.popular.title": "مجموعات شعبية",
+  "groups.discover.search.error.subtitle": "الرجاء إعادة المحاولة في وقت لاحق.",
+  "groups.discover.search.error.title": "حدث خطأ",
+  "groups.discover.search.no_results.subtitle": "حاول البحث عن مجموعة أخرى.",
+  "groups.discover.search.no_results.title": "لم يتم العثور على نتائج",
+  "groups.discover.search.placeholder": "بحث",
+  "groups.discover.search.recent_searches.blankslate.title": "لا توجد عمليات بحث حديثة",
+  "groups.discover.search.recent_searches.clear_all": "امسح الكل",
+  "groups.discover.search.recent_searches.title": "عمليات البحث الأخيرة",
+  "groups.discover.search.results.groups": "المجموعات",
+  "groups.discover.search.results.member_count": "{members, plural, one {member} other {members}}",
+  "groups.discover.suggested.empty": "تعذر جلب المجموعات المقترحة في الوقت الحالي. يرجى التحقق مرة أخرى في وقت لاحق.",
+  "groups.discover.suggested.show_more": "عرض المزيد",
+  "groups.discover.suggested.title": "مقترح لك",
   "groups.empty.subtitle": "ابدأ في اكتشاف مجموعات للانضمام إليها أو إنشاء مجموعاتك الخاصة.",
   "groups.empty.title": "لا توجد مجموعات حتى الآن",
+  "groups.pending.count": "{number, plural, one {# pending request} other {# pending requests}}",
+  "groups.pending.empty.subtitle": "ليس لديك طلبات قيده الانتظار في هذا الوقت.",
+  "groups.pending.empty.title": "لا توجد طلبات قيد الانتظار",
+  "groups.pending.label": "طلبات قيد الانتظار",
+  "groups.popular.label": "المجموعات المقترحة",
+  "groups.search.placeholder": "ابحث في مجموعاتي",
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "أو {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
@@ -881,13 +932,23 @@
   "login_external.errors.network_fail": "فشل الاتصال، ربما هناك إضافة في متصفحك تقوم بحظر الاتصال؟",
   "login_form.header": "تسجيل الدخول",
   "manage_group.blocked_members": "الأعضاء المحظورين",
+  "manage_group.confirmation.copy": "نسخ الرابط",
+  "manage_group.confirmation.info_1": "بصفتك مالك هذه المجموعة ، يمكنك تعيين موظفين وحذف المنشورات وأكثر بكثير..",
+  "manage_group.confirmation.info_2": "انشر أول مشاركة للمجموعة وابدأ المحادثة.",
+  "manage_group.confirmation.info_3": "شارك مجموعتك الجديدة مع الأصدقاء والعائلة والمتابعين لتنمية عضويتها.",
+  "manage_group.confirmation.share": "شارك هذه المجموعة",
+  "manage_group.confirmation.title": "أنت الآن على أتم استعداد!",
   "manage_group.create": "إنشاء",
   "manage_group.delete_group": "حذف المجموعة",
+  "manage_group.done": "‏‎‏‪إنتهى",
   "manage_group.edit_group": "تحرير المجموعة",
   "manage_group.edit_success": "تم تحرير المجموعة",
+  "manage_group.fields.cannot_change_hint": "لا يمكن تغيير هذا بعد إنشاء المجموعة.",
   "manage_group.fields.description_label": "الوصف",
   "manage_group.fields.description_placeholder": "الوصف",
+  "manage_group.fields.name_help": "لا يمكن تغيير هذا بعد إنشاء المجموعة.",
   "manage_group.fields.name_label": "اسم المجموعة (مطلوبة)",
+  "manage_group.fields.name_label_optional": "اسم المجموعة",
   "manage_group.fields.name_placeholder": "اسم المجموعة",
   "manage_group.get_started": "لنبدأ!",
   "manage_group.next": "التالي",
@@ -986,7 +1047,7 @@
   "new_event_panel.title": "إنشاء حدث جديد",
   "new_group_panel.action": "إنشاء مجموعة",
   "new_group_panel.subtitle": "ألا تستطيع إيجاد ما تبحث عنه؟ ابدأ مجموعتك الخاصة أو العامة.",
-  "new_group_panel.title": "إنشاء مجموعة جديدة",
+  "new_group_panel.title": "إنشاء مجموعة",
   "notification.favourite": "أُعجِب {name} بمنشورك",
   "notification.follow": "قام {name} بمتابعتك",
   "notification.follow_request": "طلب {name} متابعتك",
@@ -994,7 +1055,7 @@
   "notification.mentioned": " {name} أشار إليك",
   "notification.move": "{name} تغير إلى {targetName}",
   "notification.name": "{link}{others}",
-  "notification.others": "+ {count} {count, plural, one {other} other {others}}",
+  "notification.others": " + {count, plural, one {# other} other {# others}}",
   "notification.pleroma:chat_mention": "{name} أرسل لك رسالة",
   "notification.pleroma:emoji_reaction": "تفاعل {name} مع منشورك",
   "notification.pleroma:event_reminder": "يبدأ الحدث الذي تشارك فيه قريبًا",
@@ -1013,7 +1074,7 @@
   "notifications.filter.mentions": "الإشارات",
   "notifications.filter.polls": "نتائج استطلاع الرأي",
   "notifications.filter.statuses": "تحديثات من أشخاص تتابعهم",
-  "notifications.group": "{count} إشعار",
+  "notifications.group": "{count, plural, one {# notification} other {# notifications}}",
   "notifications.queue_label": "إضفط لترى {count} {count, plural, one {notification} other {notifications}} جديدة",
   "oauth_consumer.tooltip": "تسجيل الدخول من خلال {provider}",
   "oauth_consumers.title": "طرق أخرى لتسجيل الدخول",
@@ -1147,6 +1208,7 @@
   "registrations.unprocessable_entity": "هذا الاسم محجوز.",
   "registrations.username.hint": "يجب أن تحتوى أحرف من بين A-Z، أرقام ما بين 0-9 و شرطة سفلية",
   "registrations.username.label": "اسم المستخدم",
+  "reject.success": "مرفوض",
   "relative_time.days": "{number} يوم",
   "relative_time.hours": "{number} ساعة",
   "relative_time.just_now": "الآن",
@@ -1160,6 +1222,8 @@
   "remote_instance.pin_host": "تثبيت {host}.",
   "remote_instance.unpin_host": "إزالة تثبيت {host}.",
   "remote_interaction.account_placeholder": "أدخل اسم المستخدم@عنوان الخادم الذي تريد التفاعل منه",
+  "remote_interaction.dislike": "إكمل عدم الاعجاب",
+  "remote_interaction.dislike_title": "عدم إعجاب المنشور عن بعد",
   "remote_interaction.divider": "أو",
   "remote_interaction.event_join": "المتابعة في الانضمام",
   "remote_interaction.event_join_title": "الانضمام إلى حدث عن بعد",
@@ -1186,11 +1250,14 @@
   "report.block_hint": "أتريد حظر هذا الحساب أيضًا؟",
   "report.chatMessage.context": "عند الإبلاغ عن رسالة مستخدم، سيتم تمرير الرسائل الخمس السابقة والخمس التي تليها إلى فريق الإشراف لدينا لمعرفة السياق.",
   "report.chatMessage.title": "التبليغ عن الرسالة",
-  "report.confirmation.content": "في حال وجدنا أن هذا الحساب ينتهك {link}، سوف نتخذ أجراءات أخرى. ",
+  "report.confirmation.content": "في حال وجدنا أن هذا {entity} ينتهك {link}، سوف نتخذ أجراءات أخرى.",
+  "report.confirmation.entity.account": "حساب",
+  "report.confirmation.entity.group": "مجموعة",
   "report.confirmation.title": "شكرًا لتقديمك للبلاغ.",
   "report.done": "إنتهى",
   "report.forward": "الإرسال أيضاً إلى {target}",
   "report.forward_hint": "هذا الحساب موجود في خادم آخر. هل ترغب في إرسال نسخة مجهولة من البلاغ إلى ذلك الخادم؟ ",
+  "report.group.title": "الابلاغ عن المجموعة",
   "report.next": "التالي",
   "report.otherActions.addAdditional": "هل ترغب في إضافة معلومات أخرى لهذا التقرير؟",
   "report.otherActions.addMore": "والمزيد",
@@ -1340,6 +1407,7 @@
   "status.detailed_status": "عرض مُفصّل للمحادثة",
   "status.direct": "رسالة خاصة إلى @{name}",
   "status.disabled_replies.group_membership": "يمكن لأعضاء المجموعة فقط الرد",
+  "status.disfavourite": "عدم الاعجاب",
   "status.edit": "تحرير",
   "status.embed": "تضمين",
   "status.external": "العرض على {domain}",
@@ -1349,6 +1417,7 @@
   "status.group_mod_block": "حظر @{name} من المجموعة",
   "status.group_mod_delete": "حذف المشاركة من المجموعة",
   "status.group_mod_kick": "طرد @{name} من المجموعة",
+  "status.interactions.dislikes": "{count, plural, one {Dislike} other {Dislikes}}",
   "status.interactions.favourites": "{count, plural, one {إعجاب واحد} other {إعجاب}}",
   "status.interactions.quotes": "{count, plural, one {# صوت} other {# أصوات}}",
   "status.interactions.reblogs": "{count, plural, one {مشاركة} other {مشاركات}}",
@@ -1381,6 +1450,7 @@
   "status.sensitive_warning": "محتوى حساس",
   "status.sensitive_warning.subtitle": "قد لا يكون هذا المنشور ملائم للجميع.",
   "status.share": "مشاركة",
+  "status.show_filter_reason": "عرض على أي حال",
   "status.show_less_all": "طي الكل",
   "status.show_more_all": "توسيع الكل",
   "status.show_original": "عرض الأصل",
@@ -1417,6 +1487,7 @@
   "tabs_bar.profile": "الملف الشخصي",
   "tabs_bar.search": "البحث",
   "tabs_bar.settings": "الإعدادات",
+  "textarea.counter.label": "{count} الأحرف المتبقية",
   "theme_editor.Reset": "إعادة تعيين",
   "theme_editor.export": "تصدير السمة",
   "theme_editor.import": "استيراد السمة",
@@ -1447,7 +1518,7 @@
   "upload_error.image_size_limit": "الصورة تجاوزت الحجم المسموح به: ({limt})",
   "upload_error.limit": "لقد تم بلوغ الحد الأقصى المسموح به لإرسال الملفات.",
   "upload_error.poll": "لا يمكن إرفاق ملفات في التصويت",
-  "upload_error.video_duration_limit": "المقطع تجاوز المدة المسموح بها: ({limt} ثانية)",
+  "upload_error.video_duration_limit": "يتجاوز الفيديو حد المدة الحالي ({limit, plural, one {# second} other {# seconds}})",
   "upload_error.video_size_limit": "المقطع تجاوز الحجم المسموح به: ({limt})",
   "upload_form.description": "وصف لمن لديهم إعاقة بصرية",
   "upload_form.preview": "مراجعة",

From 43ffceabacb9ddf371ca87f00006ca851a5b7862 Mon Sep 17 00:00:00 2001
From: Tassoman <tassoman@gmail.com>
Date: Sun, 2 Apr 2023 18:12:40 +0000
Subject: [PATCH 032/298] Translated using Weblate (Italian)

Currently translated at 94.4% (1454 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/it/
---
 app/soapbox/locales/it.json | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 5b23d5e5c..343257e05 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -1158,13 +1158,15 @@
   "remote_instance.federation_panel.some_restrictions_message": "{siteTitle} ha impostato alcune restrizioni per {host}.",
   "remote_instance.pin_host": "Pin {host}",
   "remote_instance.unpin_host": "Unpin {host}",
-  "remote_interaction.account_placeholder": "Digita il nome utente con cui vuoi interagire, es: username@dominio",
-  "remote_interaction.divider": "or",
+  "remote_interaction.account_placeholder": "Indica il tuo nome utente (es: me@istanza) da cui vuoi interagire",
+  "remote_interaction.dislike": "Procedi togliendo il Like",
+  "remote_interaction.dislike_title": "Togli Like da remoto",
+  "remote_interaction.divider": "oppure",
   "remote_interaction.event_join": "Richiedi partecipazione",
   "remote_interaction.event_join_title": "Partecipa ad un evento da remoto",
   "remote_interaction.favourite": "Procedi con il Like",
-  "remote_interaction.favourite_title": "Metti Like a una pubblicazione da remoto",
-  "remote_interaction.follow": "Procedi con il Follow",
+  "remote_interaction.favourite_title": "Metti Like da remoto",
+  "remote_interaction.follow": "Segui da remoto",
   "remote_interaction.follow_title": "Segui {user} da remoto",
   "remote_interaction.poll_vote": "Procedi col voto",
   "remote_interaction.poll_vote_title": "Vota in un sondaggio da remoto",
@@ -1172,7 +1174,7 @@
   "remote_interaction.reblog_title": "Ripubblica da remoto",
   "remote_interaction.reply": "Procedi con la risposta",
   "remote_interaction.reply_title": "Rispondi da remoto ad una pubblicazione",
-  "remote_interaction.user_not_found_error": "Impossibile trovare l'utenza",
+  "remote_interaction.user_not_found_error": "Impossibile trovare il profilo",
   "remote_timeline.filter_message": "Stai leggendo la timeline di {instance}.",
   "reply_indicator.cancel": "Annulla",
   "reply_mentions.account.add": "Aggiungi alle menzioni",

From 2bc6ff3fa3d70f3778970412513185fb6dfe3aab Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Apr 2023 18:32:50 -0500
Subject: [PATCH 033/298] Use Link header for home timeline pagination

---
 app/soapbox/actions/timelines.ts              | 56 ++++++++++++++++---
 .../features/feed-filtering/feed-carousel.tsx |  2 +-
 app/soapbox/features/home-timeline/index.tsx  |  5 +-
 app/soapbox/features/test-timeline/index.tsx  |  2 +-
 app/soapbox/reducers/timelines.ts             | 24 +++++++-
 5 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/app/soapbox/actions/timelines.ts b/app/soapbox/actions/timelines.ts
index 7ae023338..cafaa6aa5 100644
--- a/app/soapbox/actions/timelines.ts
+++ b/app/soapbox/actions/timelines.ts
@@ -4,7 +4,7 @@ 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 { importFetchedStatus, importFetchedStatuses } from './importer';
 
@@ -139,7 +139,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 +162,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 +176,16 @@ 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));
+      dispatch(expandTimelineSuccess(
+        timelineId,
+        response.data,
+        getNextLink(response),
+        getPrevLink(response),
+        response.status === 206,
+        isLoadingRecent,
+        isLoadingMore,
+      ));
       done();
     }).catch(error => {
       dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
@@ -181,9 +193,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;
@@ -237,11 +266,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,
diff --git a/app/soapbox/features/feed-filtering/feed-carousel.tsx b/app/soapbox/features/feed-filtering/feed-carousel.tsx
index af6cb47bb..9d62538ce 100644
--- a/app/soapbox/features/feed-filtering/feed-carousel.tsx
+++ b/app/soapbox/features/feed-filtering/feed-carousel.tsx
@@ -30,7 +30,7 @@ const CarouselItem = React.forwardRef((
     setLoading(true);
 
     if (isSelected) {
-      dispatch(replaceHomeTimeline(null, { maxId: null }, () => setLoading(false)));
+      dispatch(replaceHomeTimeline(undefined, { maxId: null }, () => setLoading(false)));
 
       if (onPinned) {
         onPinned(null);
diff --git a/app/soapbox/features/home-timeline/index.tsx b/app/soapbox/features/home-timeline/index.tsx
index aaaec2bb3..611fcf7ce 100644
--- a/app/soapbox/features/home-timeline/index.tsx
+++ b/app/soapbox/features/home-timeline/index.tsx
@@ -27,9 +27,10 @@ const HomeTimeline: React.FC = () => {
   const isPartial = useAppSelector(state => state.timelines.get('home')?.isPartial === true);
   const currentAccountId = useAppSelector(state => state.timelines.get('home')?.feedAccountId as string | undefined);
   const currentAccountRelationship = useAppSelector(state => currentAccountId ? state.relationships.get(currentAccountId) : null);
+  const next = useAppSelector(state => state.timelines.get('home')?.next);
 
   const handleLoadMore = (maxId: string) => {
-    dispatch(expandHomeTimeline({ maxId, accountId: currentAccountId }));
+    dispatch(expandHomeTimeline({ url: next, maxId, accountId: currentAccountId }));
   };
 
   // Mastodon generates the feed in Redis, and can return a partial timeline
@@ -52,7 +53,7 @@ const HomeTimeline: React.FC = () => {
   };
 
   const handleRefresh = () => {
-    return dispatch(expandHomeTimeline({ maxId: null, accountId: currentAccountId }));
+    return dispatch(expandHomeTimeline({ accountId: currentAccountId }));
   };
 
   useEffect(() => {
diff --git a/app/soapbox/features/test-timeline/index.tsx b/app/soapbox/features/test-timeline/index.tsx
index 51ab1491e..136d0d324 100644
--- a/app/soapbox/features/test-timeline/index.tsx
+++ b/app/soapbox/features/test-timeline/index.tsx
@@ -35,7 +35,7 @@ const TestTimeline: React.FC = () => {
 
   React.useEffect(() => {
     dispatch(importFetchedStatuses(MOCK_STATUSES));
-    dispatch(expandTimelineSuccess(timelineId, MOCK_STATUSES, null, false, false, false));
+    dispatch(expandTimelineSuccess(timelineId, MOCK_STATUSES, undefined, undefined, false, false, false));
   }, []);
 
   return (
diff --git a/app/soapbox/reducers/timelines.ts b/app/soapbox/reducers/timelines.ts
index 1713ee964..b5fe0e049 100644
--- a/app/soapbox/reducers/timelines.ts
+++ b/app/soapbox/reducers/timelines.ts
@@ -46,6 +46,8 @@ const TimelineRecord = ImmutableRecord({
   top: true,
   isLoading: false,
   hasMore: true,
+  next: undefined as string | undefined,
+  prev: undefined as string | undefined,
   items: ImmutableOrderedSet<string>(),
   queuedItems: ImmutableOrderedSet<string>(), //max= MAX_QUEUED_ITEMS
   feedAccountId: null,
@@ -87,13 +89,23 @@ const setFailed = (state: State, timelineId: string, failed: boolean) => {
   return state.update(timelineId, TimelineRecord(), timeline => timeline.set('loadingFailed', failed));
 };
 
-const expandNormalizedTimeline = (state: State, timelineId: string, statuses: ImmutableList<ImmutableMap<string, any>>, next: string | null, isPartial: boolean, isLoadingRecent: boolean) => {
+const expandNormalizedTimeline = (
+  state: State,
+  timelineId: string,
+  statuses: ImmutableList<ImmutableMap<string, any>>,
+  next: string | undefined,
+  prev: string | undefined,
+  isPartial: boolean,
+  isLoadingRecent: boolean,
+) => {
   const newIds = getStatusIds(statuses);
 
   return state.update(timelineId, TimelineRecord(), timeline => timeline.withMutations(timeline => {
     timeline.set('isLoading', false);
     timeline.set('loadingFailed', false);
     timeline.set('isPartial', isPartial);
+    timeline.set('next', next);
+    timeline.set('prev', prev);
 
     if (!next && !isLoadingRecent) timeline.set('hasMore', false);
 
@@ -322,7 +334,15 @@ export default function timelines(state: State = initialState, action: AnyAction
     case TIMELINE_EXPAND_FAIL:
       return handleExpandFail(state, action.timeline);
     case TIMELINE_EXPAND_SUCCESS:
-      return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses) as ImmutableList<ImmutableMap<string, any>>, action.next, action.partial, action.isLoadingRecent);
+      return expandNormalizedTimeline(
+        state,
+        action.timeline,
+        fromJS(action.statuses) as ImmutableList<ImmutableMap<string, any>>,
+        action.next,
+        action.prev,
+        action.partial,
+        action.isLoadingRecent,
+      );
     case TIMELINE_UPDATE:
       return updateTimeline(state, action.timeline, action.statusId);
     case TIMELINE_UPDATE_QUEUE:

From 2240952b8f09eee26e708a8ea20ba3fd079c569f Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 09:51:22 -0400
Subject: [PATCH 034/298] Add animation to AuthorizeRejectButton comp

---
 .../components/authorize-reject-buttons.tsx   | 83 ++++++++++++++-----
 1 file changed, 62 insertions(+), 21 deletions(-)

diff --git a/app/soapbox/components/authorize-reject-buttons.tsx b/app/soapbox/components/authorize-reject-buttons.tsx
index 9edd44189..a785c31ea 100644
--- a/app/soapbox/components/authorize-reject-buttons.tsx
+++ b/app/soapbox/components/authorize-reject-buttons.tsx
@@ -14,6 +14,23 @@ interface IAuthorizeRejectButtons {
 const AuthorizeRejectButtons: React.FC<IAuthorizeRejectButtons> = ({ onAuthorize, onReject, countdown }) => {
   const [state, setState] = useState<'authorizing' | 'rejecting' | 'authorized' | 'rejected' | 'pending'>('pending');
   const timeout = useRef<NodeJS.Timeout>();
+  const interval = useRef<ReturnType<typeof setInterval>>();
+
+  const [progress, setProgress] = useState<number>(0);
+
+  const startProgressInterval = () => {
+    let startValue = 1;
+    interval.current = setInterval(() => {
+      startValue++;
+      const newValue = startValue * 3.6; // get to 360 (deg)
+      setProgress(newValue);
+
+      if (newValue >= 360) {
+        clearInterval(interval.current as NodeJS.Timeout);
+        setProgress(0);
+      }
+    }, (countdown as number) / 100);
+  };
 
   function handleAction(
     present: 'authorizing' | 'rejecting',
@@ -21,6 +38,9 @@ const AuthorizeRejectButtons: React.FC<IAuthorizeRejectButtons> = ({ onAuthorize
     action: () => Promise<unknown> | unknown,
   ): void {
     if (state === present) {
+      if (interval.current) {
+        clearInterval(interval.current);
+      }
       if (timeout.current) {
         clearTimeout(timeout.current);
       }
@@ -37,6 +57,7 @@ const AuthorizeRejectButtons: React.FC<IAuthorizeRejectButtons> = ({ onAuthorize
       if (typeof countdown === 'number') {
         setState(present);
         timeout.current = setTimeout(doAction, countdown);
+        startProgressInterval();
       } else {
         doAction();
       }
@@ -46,11 +67,28 @@ const AuthorizeRejectButtons: React.FC<IAuthorizeRejectButtons> = ({ onAuthorize
   const handleAuthorize = async () => handleAction('authorizing', 'authorized', onAuthorize);
   const handleReject = async () => handleAction('rejecting', 'rejected', onReject);
 
+  const renderStyle = (selectedState: typeof state) => {
+    if (state === 'authorizing' && selectedState === 'authorizing') {
+      return {
+        background: `conic-gradient(rgb(var(--color-primary-500)) ${progress}deg, rgb(var(--color-primary-500) / 0.1) 0deg)`,
+      };
+    } else if (state === 'rejecting' && selectedState === 'rejecting') {
+      return {
+        background: `conic-gradient(rgb(var(--color-danger-600)) ${progress}deg, rgb(var(--color-danger-600) / 0.1) 0deg)`,
+      };
+    }
+
+    return {};
+  };
+
   useEffect(() => {
     return () => {
       if (timeout.current) {
         clearTimeout(timeout.current);
       }
+      if (interval.current) {
+        clearInterval(interval.current);
+      }
     };
   }, []);
 
@@ -72,6 +110,7 @@ const AuthorizeRejectButtons: React.FC<IAuthorizeRejectButtons> = ({ onAuthorize
             action={handleReject}
             isLoading={state === 'rejecting'}
             disabled={state === 'authorizing'}
+            style={renderStyle('rejecting')}
           />
           <AuthorizeRejectButton
             theme='primary'
@@ -79,6 +118,7 @@ const AuthorizeRejectButtons: React.FC<IAuthorizeRejectButtons> = ({ onAuthorize
             action={handleAuthorize}
             isLoading={state === 'authorizing'}
             disabled={state === 'rejecting'}
+            style={renderStyle('authorizing')}
           />
         </HStack>
       );
@@ -105,33 +145,34 @@ interface IAuthorizeRejectButton {
   action(): void
   isLoading?: boolean
   disabled?: boolean
+  style: React.CSSProperties
 }
 
-const AuthorizeRejectButton: React.FC<IAuthorizeRejectButton> = ({ theme, icon, action, isLoading, disabled }) => {
+const AuthorizeRejectButton: React.FC<IAuthorizeRejectButton> = ({ theme, icon, action, isLoading, style, disabled }) => {
   return (
     <div className='relative'>
-      <IconButton
-        src={isLoading ? require('@tabler/icons/player-stop-filled.svg') : icon}
-        onClick={action}
-        theme='seamless'
-        className={clsx('h-10 w-10 items-center justify-center border-2', {
-          'border-primary-500/10 hover:border-primary-500': theme === 'primary',
-          'border-danger-600/10 hover:border-danger-600': theme === 'danger',
-        })}
-        iconClassName={clsx('h-6 w-6', {
-          'text-primary-500': theme === 'primary',
-          'text-danger-600': theme === 'danger',
-        })}
-        disabled={disabled}
-      />
-      {(isLoading) && (
-        <div
-          className={clsx('pointer-events-none absolute inset-0 h-10 w-10 animate-spin rounded-full border-2 border-transparent', {
-            'border-t-primary-500': theme === 'primary',
-            'border-t-danger-600': theme === 'danger',
+      <div
+        style={style}
+        className={
+          clsx({
+            'flex h-11 w-11 items-center justify-center rounded-full': true,
+            'bg-danger-600/10': theme === 'danger',
+            'bg-primary-500/10': theme === 'primary',
+          })
+        }
+      >
+        <IconButton
+          src={isLoading ? require('@tabler/icons/player-stop-filled.svg') : icon}
+          onClick={action}
+          theme='seamless'
+          className='h-10 w-10 items-center justify-center bg-gray-900'
+          iconClassName={clsx('h-6 w-6', {
+            'text-primary-500': theme === 'primary',
+            'text-danger-600': theme === 'danger',
           })}
+          disabled={disabled}
         />
-      )}
+      </div>
     </div>
   );
 };

From 485213972e95f8fe3a909f18928953a0cc67cbee Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 12:13:41 -0400
Subject: [PATCH 035/298] Update banned members design

---
 .../features/group/group-blocked-members.tsx   | 18 +++++++++---------
 app/soapbox/locales/en.json                    |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/soapbox/features/group/group-blocked-members.tsx b/app/soapbox/features/group/group-blocked-members.tsx
index 8931575ef..a82f889c1 100644
--- a/app/soapbox/features/group/group-blocked-members.tsx
+++ b/app/soapbox/features/group/group-blocked-members.tsx
@@ -15,9 +15,9 @@ import ColumnForbidden from '../ui/components/column-forbidden';
 type RouteParams = { id: string };
 
 const messages = defineMessages({
-  heading: { id: 'column.group_blocked_members', defaultMessage: 'Blocked members' },
-  unblock: { id: 'group.group_mod_unblock', defaultMessage: 'Unblock' },
-  unblocked: { id: 'group.group_mod_unblock.success', defaultMessage: 'Unblocked @{name} from group' },
+  heading: { id: 'column.group_blocked_members', defaultMessage: 'Banned Members' },
+  unblock: { id: 'group.group_mod_unblock', defaultMessage: 'Unban' },
+  unblocked: { id: 'group.group_mod_unblock.success', defaultMessage: 'Unbanned @{name} from group' },
 });
 
 interface IBlockedMember {
@@ -36,18 +36,17 @@ const BlockedMember: React.FC<IBlockedMember> = ({ accountId, groupId }) => {
   if (!account) return null;
 
   const handleUnblock = () =>
-    dispatch(groupUnblock(groupId, accountId)).then(() => {
-      toast.success(intl.formatMessage(messages.unblocked, { name: account.acct }));
-    });
+    dispatch(groupUnblock(groupId, accountId))
+      .then(() => toast.success(intl.formatMessage(messages.unblocked, { name: account.acct })));
 
   return (
     <HStack space={1} alignItems='center' justifyContent='between' className='p-2.5'>
       <div className='w-full'>
         <Account account={account} withRelationship={false} />
       </div>
+
       <Button
-        theme='danger'
-        size='sm'
+        theme='secondary'
         text={intl.formatMessage(messages.unblock)}
         onClick={handleUnblock}
       />
@@ -84,13 +83,14 @@ const GroupBlockedMembers: React.FC<IGroupBlockedMembers> = ({ params }) => {
     return (<ColumnForbidden />);
   }
 
-  const emptyMessage = <FormattedMessage id='empty_column.group_blocks' defaultMessage="The group hasn't blocked any users yet." />;
+  const emptyMessage = <FormattedMessage id='empty_column.group_blocks' defaultMessage="The group hasn't banned any users yet." />;
 
   return (
     <Column label={intl.formatMessage(messages.heading)} backHref={`/groups/${id}/manage`}>
       <ScrollableList
         scrollKey='group_blocks'
         emptyMessage={emptyMessage}
+        emptyMessageCard={false}
       >
         {accountIds.map((accountId) =>
           <BlockedMember key={accountId} accountId={accountId} groupId={id} />,
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index c819a1f22..d00ce2430 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -351,7 +351,7 @@
   "column.follow_requests": "Follow requests",
   "column.followers": "Followers",
   "column.following": "Following",
-  "column.group_blocked_members": "Blocked members",
+  "column.group_blocked_members": "Banned Members",
   "column.group_pending_requests": "Pending requests",
   "column.groups": "Groups",
   "column.home": "Home",
@@ -673,7 +673,7 @@
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.group": "There are no posts in this group yet.",
-  "empty_column.group_blocks": "The group hasn't blocked any users yet.",
+  "empty_column.group_blocks": "The group hasn't banned any users yet.",
   "empty_column.group_membership_requests": "There are no pending membership requests for this group.",
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
   "empty_column.home": "Or you can visit {public} to get started and meet other users.",
@@ -778,8 +778,8 @@
   "group.group_mod_kick.success": "Kicked @{name} from group",
   "group.group_mod_promote_mod": "Assign {role} role",
   "group.group_mod_reject.fail": "Failed to reject @{name}",
-  "group.group_mod_unblock": "Unblock",
-  "group.group_mod_unblock.success": "Unblocked @{name} from group",
+  "group.group_mod_unblock": "Unban",
+  "group.group_mod_unblock.success": "Unbanned @{name} from group",
   "group.header.alt": "Group header",
   "group.join.private": "Request Access",
   "group.join.public": "Join Group",

From c67d5712baa9d1499d82253eef06aeab94b3bb47 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 12:17:29 -0400
Subject: [PATCH 036/298] Fix weight of List Item text

---
 app/soapbox/components/list.tsx                               | 2 +-
 .../modals/manage-group-modal/steps/privacy-step.tsx          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/components/list.tsx b/app/soapbox/components/list.tsx
index ee04b2d92..e1b8cdcd9 100644
--- a/app/soapbox/components/list.tsx
+++ b/app/soapbox/components/list.tsx
@@ -63,7 +63,7 @@ const ListItem: React.FC<IListItem> = ({ label, hint, children, onClick, onSelec
       {...linkProps}
     >
       <div className='flex flex-col py-1.5 pr-4 rtl:pl-4 rtl:pr-0'>
-        <LabelComp className='font-medium text-gray-900 dark:text-gray-100' htmlFor={domId}>{label}</LabelComp>
+        <LabelComp className='text-gray-900 dark:text-gray-100' htmlFor={domId}>{label}</LabelComp>
 
         {hint ? (
           <span className='text-sm text-gray-700 dark:text-gray-600'>{hint}</span>
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
index 2920de493..2ba2cc7c6 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
@@ -31,14 +31,14 @@ const PrivacyStep = () => {
         >
           <List>
             <ListItem
-              label={<FormattedMessage id='manage_group.privacy.public.label' defaultMessage='Public' />}
+              label={<Text weight='medium'><FormattedMessage id='manage_group.privacy.public.label' defaultMessage='Public' /></Text>}
               hint={<FormattedMessage id='manage_group.privacy.public.hint' defaultMessage='Discoverable. Anyone can join.' />}
               onSelect={() => onChangePrivacy(false)}
               isSelected={!locked}
             />
 
             <ListItem
-              label={<FormattedMessage id='manage_group.privacy.private.label' defaultMessage='Private (Owner approval required)' />}
+              label={<Text weight='medium'><FormattedMessage id='manage_group.privacy.private.label' defaultMessage='Private (Owner approval required)' /></Text>}
               hint={<FormattedMessage id='manage_group.privacy.private.hint' defaultMessage='Discoverable. Users can join after their request is approved.' />}
               onSelect={() => onChangePrivacy(true)}
               isSelected={locked}

From 607e91e8cff768ea1f80e8bde250d1ba37debeb3 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 12:56:29 -0400
Subject: [PATCH 037/298] Refactor Group Layout selection

---
 .../components/discover/layout-buttons.tsx    | 42 +++++++++++++++++++
 .../components/discover/search/results.tsx    | 42 +++++--------------
 app/soapbox/features/groups/popular.tsx       | 40 ++++--------------
 app/soapbox/features/groups/suggested.tsx     | 40 ++++--------------
 4 files changed, 68 insertions(+), 96 deletions(-)
 create mode 100644 app/soapbox/features/groups/components/discover/layout-buttons.tsx

diff --git a/app/soapbox/features/groups/components/discover/layout-buttons.tsx b/app/soapbox/features/groups/components/discover/layout-buttons.tsx
new file mode 100644
index 000000000..eecdfaf83
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/layout-buttons.tsx
@@ -0,0 +1,42 @@
+import clsx from 'clsx';
+import React from 'react';
+
+import { HStack, Icon } from 'soapbox/components/ui';
+
+enum GroupLayout {
+  LIST = 'LIST',
+  GRID = 'GRID'
+}
+
+interface ILayoutButtons {
+  layout: GroupLayout
+  onSelect(layout: GroupLayout): void
+}
+
+const LayoutButtons = ({ layout, onSelect }: ILayoutButtons) => (
+  <HStack alignItems='center' space={1}>
+    <button onClick={() => onSelect(GroupLayout.LIST)}>
+      <Icon
+        src={require('@tabler/icons/layout-list.svg')}
+        className={
+          clsx('h-5 w-5 text-gray-600', {
+            'text-primary-600': layout === GroupLayout.LIST,
+          })
+        }
+      />
+    </button>
+
+    <button onClick={() => onSelect(GroupLayout.GRID)}>
+      <Icon
+        src={require('@tabler/icons/layout-grid.svg')}
+        className={
+          clsx('h-5 w-5 text-gray-600', {
+            'text-primary-600': layout === GroupLayout.GRID,
+          })
+        }
+      />
+    </button>
+  </HStack>
+);
+
+export { LayoutButtons as default, GroupLayout };
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/search/results.tsx b/app/soapbox/features/groups/components/discover/search/results.tsx
index 14e1e5a67..9df350375 100644
--- a/app/soapbox/features/groups/components/discover/search/results.tsx
+++ b/app/soapbox/features/groups/components/discover/search/results.tsx
@@ -3,22 +3,19 @@ import React, { useCallback, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
-import { HStack, Icon, Stack, Text } from 'soapbox/components/ui';
+import { HStack, Stack, Text } from 'soapbox/components/ui';
 import { useGroupSearch } from 'soapbox/hooks/api';
-import { Group } from 'soapbox/types/entities';
 
 import GroupGridItem from '../group-grid-item';
 import GroupListItem from '../group-list-item';
+import LayoutButtons, { GroupLayout } from '../layout-buttons';
+
+import type { Group } from 'soapbox/types/entities';
 
 interface Props {
   groupSearchResult: ReturnType<typeof useGroupSearch>
 }
 
-enum Layout {
-  LIST = 'LIST',
-  GRID = 'GRID'
-}
-
 const GridList: Components['List'] = React.forwardRef((props, ref) => {
   const { context, ...rest } = props;
   return <div ref={ref} {...rest} className='flex flex-wrap' />;
@@ -27,7 +24,7 @@ const GridList: Components['List'] = React.forwardRef((props, ref) => {
 export default (props: Props) => {
   const { groupSearchResult } = props;
 
-  const [layout, setLayout] = useState<Layout>(Layout.LIST);
+  const [layout, setLayout] = useState<GroupLayout>(GroupLayout.LIST);
 
   const { groups, hasNextPage, isFetching, fetchNextPage } = groupSearchResult;
 
@@ -65,32 +62,13 @@ export default (props: Props) => {
           />
         </Text>
 
-        <HStack alignItems='center'>
-          <button onClick={() => setLayout(Layout.LIST)}>
-            <Icon
-              src={require('@tabler/icons/layout-list.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.LIST,
-                })
-              }
-            />
-          </button>
-
-          <button onClick={() => setLayout(Layout.GRID)}>
-            <Icon
-              src={require('@tabler/icons/layout-grid.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.GRID,
-                })
-              }
-            />
-          </button>
-        </HStack>
+        <LayoutButtons
+          layout={layout}
+          onSelect={(selectedLayout) => setLayout(selectedLayout)}
+        />
       </HStack>
 
-      {layout === Layout.LIST ? (
+      {layout === GroupLayout.LIST ? (
         <Virtuoso
           useWindowScroll
           data={groups}
diff --git a/app/soapbox/features/groups/popular.tsx b/app/soapbox/features/groups/popular.tsx
index 61d030173..7f2d43a64 100644
--- a/app/soapbox/features/groups/popular.tsx
+++ b/app/soapbox/features/groups/popular.tsx
@@ -3,11 +3,12 @@ import React, { useCallback, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
-import { Column, HStack, Icon } from 'soapbox/components/ui';
+import { Column } from 'soapbox/components/ui';
 import { usePopularGroups } from 'soapbox/hooks/api/usePopularGroups';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';
+import LayoutButtons, { GroupLayout } from './components/discover/layout-buttons';
 
 import type { Group } from 'soapbox/schemas';
 
@@ -15,21 +16,15 @@ const messages = defineMessages({
   label: { id: 'groups.popular.label', defaultMessage: 'Popular Groups' },
 });
 
-enum Layout {
-  LIST = 'LIST',
-  GRID = 'GRID'
-}
-
 const GridList: Components['List'] = React.forwardRef((props, ref) => {
   const { context, ...rest } = props;
   return <div ref={ref} {...rest} className='flex flex-wrap' />;
 });
 
-
 const Popular: React.FC = () => {
   const intl = useIntl();
 
-  const [layout, setLayout] = useState<Layout>(Layout.LIST);
+  const [layout, setLayout] = useState<GroupLayout>(GroupLayout.LIST);
 
   const { groups, hasNextPage, fetchNextPage } = usePopularGroups();
 
@@ -61,32 +56,13 @@ const Popular: React.FC = () => {
     <Column
       label={intl.formatMessage(messages.label)}
       action={
-        <HStack alignItems='center'>
-          <button onClick={() => setLayout(Layout.LIST)}>
-            <Icon
-              src={require('@tabler/icons/layout-list.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.LIST,
-                })
-              }
-            />
-          </button>
-
-          <button onClick={() => setLayout(Layout.GRID)}>
-            <Icon
-              src={require('@tabler/icons/layout-grid.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.GRID,
-                })
-              }
-            />
-          </button>
-        </HStack>
+        <LayoutButtons
+          layout={layout}
+          onSelect={(selectedLayout) => setLayout(selectedLayout)}
+        />
       }
     >
-      {layout === Layout.LIST ? (
+      {layout === GroupLayout.LIST ? (
         <Virtuoso
           useWindowScroll
           data={groups}
diff --git a/app/soapbox/features/groups/suggested.tsx b/app/soapbox/features/groups/suggested.tsx
index 8c17fc0af..5c52f678b 100644
--- a/app/soapbox/features/groups/suggested.tsx
+++ b/app/soapbox/features/groups/suggested.tsx
@@ -3,11 +3,12 @@ import React, { useCallback, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
-import { Column, HStack, Icon } from 'soapbox/components/ui';
+import { Column } from 'soapbox/components/ui';
 import { useSuggestedGroups } from 'soapbox/hooks/api/useSuggestedGroups';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';
+import LayoutButtons, { GroupLayout } from './components/discover/layout-buttons';
 
 import type { Group } from 'soapbox/schemas';
 
@@ -15,21 +16,15 @@ const messages = defineMessages({
   label: { id: 'groups.popular.label', defaultMessage: 'Suggested Groups' },
 });
 
-enum Layout {
-  LIST = 'LIST',
-  GRID = 'GRID'
-}
-
 const GridList: Components['List'] = React.forwardRef((props, ref) => {
   const { context, ...rest } = props;
   return <div ref={ref} {...rest} className='flex flex-wrap' />;
 });
 
-
 const Suggested: React.FC = () => {
   const intl = useIntl();
 
-  const [layout, setLayout] = useState<Layout>(Layout.LIST);
+  const [layout, setLayout] = useState<GroupLayout>(GroupLayout.LIST);
 
   const { groups, hasNextPage, fetchNextPage } = useSuggestedGroups();
 
@@ -61,32 +56,13 @@ const Suggested: React.FC = () => {
     <Column
       label={intl.formatMessage(messages.label)}
       action={
-        <HStack alignItems='center'>
-          <button onClick={() => setLayout(Layout.LIST)}>
-            <Icon
-              src={require('@tabler/icons/layout-list.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.LIST,
-                })
-              }
-            />
-          </button>
-
-          <button onClick={() => setLayout(Layout.GRID)}>
-            <Icon
-              src={require('@tabler/icons/layout-grid.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.GRID,
-                })
-              }
-            />
-          </button>
-        </HStack>
+        <LayoutButtons
+          layout={layout}
+          onSelect={(selectedLayout) => setLayout(selectedLayout)}
+        />
       }
     >
-      {layout === Layout.LIST ? (
+      {layout === GroupLayout.LIST ? (
         <Virtuoso
           useWindowScroll
           data={groups}

From d844ee4e54235b1eb5ff273aff2145b3878e5051 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Apr 2023 12:03:59 -0500
Subject: [PATCH 038/298] Remove deprecated Tailwind line-clamp plugin (now
 bundled with v3.3)

---
 package.json        | 1 -
 tailwind.config.cjs | 1 -
 yarn.lock           | 5 -----
 3 files changed, 7 deletions(-)

diff --git a/package.json b/package.json
index 50d1409c3..47af605e4 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,6 @@
     "@sentry/tracing": "^7.37.2",
     "@tabler/icons": "^2.0.0",
     "@tailwindcss/forms": "^0.5.3",
-    "@tailwindcss/line-clamp": "^0.4.4",
     "@tailwindcss/typography": "^0.5.9",
     "@tanstack/react-query": "^4.0.10",
     "@testing-library/react": "^14.0.0",
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 10270a77f..a59998396 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -98,7 +98,6 @@ module.exports = {
   },
   plugins: [
     require('@tailwindcss/forms'),
-    require('@tailwindcss/line-clamp'),
     require('@tailwindcss/typography'),
     require('@tailwindcss/aspect-ratio'),
   ],
diff --git a/yarn.lock b/yarn.lock
index 646742846..e2baefa40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3853,11 +3853,6 @@
   dependencies:
     mini-svg-data-uri "^1.2.3"
 
-"@tailwindcss/line-clamp@^0.4.4":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@tailwindcss/line-clamp/-/line-clamp-0.4.4.tgz#767cf8e5d528a5d90c9740ca66eb079f5e87d423"
-  integrity sha512-5U6SY5z8N42VtrCrKlsTAA35gy2VSyYtHWCsg1H87NU1SXnEfekTVlrga9fzUDrrHcGi2Lb5KenUWb4lRQT5/g==
-
 "@tailwindcss/typography@^0.5.9":
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.9.tgz#027e4b0674929daaf7c921c900beee80dbad93e8"

From 1b9c070a201909532b36d5447d5cfe5b2c03dfdf Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Apr 2023 14:26:31 -0500
Subject: [PATCH 039/298] EditGroup: move AvatarPicker and HeaderPicker into
 their own components

---
 .../group/components/group-avatar-picker.tsx  | 45 +++++++++++
 .../group/components/group-header-picker.tsx  | 52 ++++++++++++
 app/soapbox/features/group/edit-group.tsx     | 81 +------------------
 3 files changed, 101 insertions(+), 77 deletions(-)
 create mode 100644 app/soapbox/features/group/components/group-avatar-picker.tsx
 create mode 100644 app/soapbox/features/group/components/group-header-picker.tsx

diff --git a/app/soapbox/features/group/components/group-avatar-picker.tsx b/app/soapbox/features/group/components/group-avatar-picker.tsx
new file mode 100644
index 000000000..4e2851e33
--- /dev/null
+++ b/app/soapbox/features/group/components/group-avatar-picker.tsx
@@ -0,0 +1,45 @@
+import clsx from 'clsx';
+import React from 'react';
+
+import Icon from 'soapbox/components/icon';
+import { Avatar, HStack } from 'soapbox/components/ui';
+
+interface IMediaInput {
+  src: string | undefined
+  accept: string
+  onChange: React.ChangeEventHandler<HTMLInputElement>
+  disabled: boolean
+}
+
+const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
+  return (
+    <label className='absolute bottom-0 left-1/2 h-20 w-20 -translate-x-1/2 translate-y-1/2 cursor-pointer rounded-full bg-primary-500 ring-2 ring-white dark:ring-primary-900'>
+      {src && <Avatar src={src} size={80} />}
+      <HStack
+        alignItems='center'
+        justifyContent='center'
+
+        className={clsx('absolute left-0 top-0 h-full w-full rounded-full transition-opacity', {
+          'opacity-0 hover:opacity-90 bg-primary-500': src,
+        })}
+      >
+        <Icon
+          src={require('@tabler/icons/camera-plus.svg')}
+          className='h-5 w-5 text-white'
+        />
+      </HStack>
+      <span className='sr-only'>Upload avatar</span>
+      <input
+        ref={ref}
+        name='avatar'
+        type='file'
+        accept={accept}
+        onChange={onChange}
+        disabled={disabled}
+        className='hidden'
+      />
+    </label>
+  );
+});
+
+export default AvatarPicker;
\ No newline at end of file
diff --git a/app/soapbox/features/group/components/group-header-picker.tsx b/app/soapbox/features/group/components/group-header-picker.tsx
new file mode 100644
index 000000000..7fcdae688
--- /dev/null
+++ b/app/soapbox/features/group/components/group-header-picker.tsx
@@ -0,0 +1,52 @@
+import clsx from 'clsx';
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+import Icon from 'soapbox/components/icon';
+import { HStack, Text } from 'soapbox/components/ui';
+
+interface IMediaInput {
+  src: string | undefined
+  accept: string
+  onChange: React.ChangeEventHandler<HTMLInputElement>
+  disabled: boolean
+}
+
+const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
+  return (
+    <label
+      className='dark:sm:shadow-inset relative h-24 w-full cursor-pointer overflow-hidden rounded-lg bg-primary-100 text-primary-500 dark:bg-gray-800 dark:text-accent-blue sm:h-36 sm:shadow'
+    >
+      {src && <img className='h-full w-full object-cover' src={src} alt='' />}
+      <HStack
+        className={clsx('absolute top-0 h-full w-full transition-opacity', {
+          'opacity-0 hover:opacity-90 bg-primary-100 dark:bg-gray-800': src,
+        })}
+        space={1.5}
+        alignItems='center'
+        justifyContent='center'
+      >
+        <Icon
+          src={require('@tabler/icons/photo-plus.svg')}
+          className='h-4.5 w-4.5'
+        />
+
+        <Text size='md' theme='primary' weight='semibold'>
+          <FormattedMessage id='group.upload_banner' defaultMessage='Upload photo' />
+        </Text>
+
+        <input
+          ref={ref}
+          name='header'
+          type='file'
+          accept={accept}
+          onChange={onChange}
+          disabled={disabled}
+          className='hidden'
+        />
+      </HStack>
+    </label>
+  );
+});
+
+export default HeaderPicker;
\ No newline at end of file
diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index d385fb580..23ff9ed98 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -1,100 +1,27 @@
-import clsx from 'clsx';
 import React, { useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import Icon from 'soapbox/components/icon';
-import { Avatar, Button, Column, Form, FormActions, FormGroup, HStack, Input, Spinner, Text, Textarea } from 'soapbox/components/ui';
+import { Button, Column, Form, FormActions, FormGroup, Input, Spinner, Textarea } from 'soapbox/components/ui';
 import { useAppSelector, useInstance } from 'soapbox/hooks';
 import { useGroup, useUpdateGroup } from 'soapbox/hooks/api';
 import { useImageField, useTextField } from 'soapbox/hooks/forms';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
 
+import AvatarPicker from './components/group-avatar-picker';
+import HeaderPicker from './components/group-header-picker';
+
 import type { List as ImmutableList } from 'immutable';
 
 const nonDefaultAvatar = (url: string | undefined) => url && isDefaultAvatar(url) ? undefined : url;
 const nonDefaultHeader = (url: string | undefined) => url && isDefaultHeader(url) ? undefined : url;
 
-interface IMediaInput {
-  src: string | undefined
-  accept: string
-  onChange: React.ChangeEventHandler<HTMLInputElement>
-  disabled: boolean
-}
-
 const messages = defineMessages({
   heading: { id: 'navigation_bar.edit_group', defaultMessage: 'Edit Group' },
   groupNamePlaceholder: { id: 'manage_group.fields.name_placeholder', defaultMessage: 'Group Name' },
   groupDescriptionPlaceholder: { id: 'manage_group.fields.description_placeholder', defaultMessage: 'Description' },
 });
 
-const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
-  return (
-    <label
-      className='dark:sm:shadow-inset relative h-24 w-full cursor-pointer overflow-hidden rounded-lg bg-primary-100 text-primary-500 dark:bg-gray-800 dark:text-accent-blue sm:h-36 sm:shadow'
-    >
-      {src && <img className='h-full w-full object-cover' src={src} alt='' />}
-      <HStack
-        className={clsx('absolute top-0 h-full w-full transition-opacity', {
-          'opacity-0 hover:opacity-90 bg-primary-100 dark:bg-gray-800': src,
-        })}
-        space={1.5}
-        alignItems='center'
-        justifyContent='center'
-      >
-        <Icon
-          src={require('@tabler/icons/photo-plus.svg')}
-          className='h-4.5 w-4.5'
-        />
-
-        <Text size='md' theme='primary' weight='semibold'>
-          <FormattedMessage id='group.upload_banner' defaultMessage='Upload photo' />
-        </Text>
-
-        <input
-          ref={ref}
-          name='header'
-          type='file'
-          accept={accept}
-          onChange={onChange}
-          disabled={disabled}
-          className='hidden'
-        />
-      </HStack>
-    </label>
-  );
-});
-
-const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
-  return (
-    <label className='absolute bottom-0 left-1/2 h-20 w-20 -translate-x-1/2 translate-y-1/2 cursor-pointer rounded-full bg-primary-500 ring-2 ring-white dark:ring-primary-900'>
-      {src && <Avatar src={src} size={80} />}
-      <HStack
-        alignItems='center'
-        justifyContent='center'
-
-        className={clsx('absolute left-0 top-0 h-full w-full rounded-full transition-opacity', {
-          'opacity-0 hover:opacity-90 bg-primary-500': src,
-        })}
-      >
-        <Icon
-          src={require('@tabler/icons/camera-plus.svg')}
-          className='h-5 w-5 text-white'
-        />
-      </HStack>
-      <span className='sr-only'>Upload avatar</span>
-      <input
-        ref={ref}
-        name='avatar'
-        type='file'
-        accept={accept}
-        onChange={onChange}
-        disabled={disabled}
-        className='hidden'
-      />
-    </label>
-  );
-});
-
 interface IEditGroup {
   params: {
     id: string

From c2f5671de188dad46115c27913ac0e2044e79fd9 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 15:38:41 -0400
Subject: [PATCH 040/298] Update copy after requesting to join group

---
 app/soapbox/actions/groups.ts                                 | 2 +-
 app/soapbox/features/group/components/group-action-button.tsx | 2 +-
 app/soapbox/locales/en.json                                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/actions/groups.ts b/app/soapbox/actions/groups.ts
index 8a6ad065e..2ae1792cb 100644
--- a/app/soapbox/actions/groups.ts
+++ b/app/soapbox/actions/groups.ts
@@ -108,7 +108,7 @@ 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' },
+  joinRequestSuccess: { id: 'group.join.request_success', defaultMessage: 'Request sent to group owner' },
   leaveSuccess: { id: 'group.leave.success', defaultMessage: 'Left the group' },
   view: { id: 'toast.view', defaultMessage: 'View' },
 });
diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index c697bc4ee..3874d4ae9 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -20,7 +20,7 @@ const messages = defineMessages({
   confirmationConfirm: { id: 'confirmations.leave_group.confirm', defaultMessage: 'Leave' },
   confirmationHeading: { id: 'confirmations.leave_group.heading', defaultMessage: 'Leave group' },
   confirmationMessage: { id: 'confirmations.leave_group.message', defaultMessage: 'You are about to leave the group. Do you want to continue?' },
-  joinRequestSuccess: { id: 'group.join.request_success', defaultMessage: 'Requested to join the group' },
+  joinRequestSuccess: { id: 'group.join.request_success', defaultMessage: 'Request sent to group owner' },
   joinSuccess: { id: 'group.join.success', defaultMessage: 'Group joined successfully!' },
   leaveSuccess: { id: 'group.leave.success', defaultMessage: 'Left the group' },
 });
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index c819a1f22..82a658dee 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -783,7 +783,7 @@
   "group.header.alt": "Group header",
   "group.join.private": "Request Access",
   "group.join.public": "Join Group",
-  "group.join.request_success": "Requested to join the group",
+  "group.join.request_success": "Request sent to group owner",
   "group.join.success": "Group joined successfully!",
   "group.leave": "Leave Group",
   "group.leave.success": "Left the group",

From aed41989f53543ce5079f02a1040f426045bd673 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 15:57:12 -0400
Subject: [PATCH 041/298] Remove 'Pending requests' from Group Manage

---
 app/soapbox/features/group/manage-group.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 012f762f5..723bbb5ad 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -7,8 +7,10 @@ import List, { ListItem } from 'soapbox/components/list';
 import { CardBody, CardHeader, CardTitle, Column, Spinner, Text } from 'soapbox/components/ui';
 import { useAppDispatch, useGroupsPath } from 'soapbox/hooks';
 import { useDeleteGroup, useGroup } from 'soapbox/hooks/api';
+import { useBackend } from 'soapbox/hooks/useBackend';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
+import { TRUTHSOCIAL } from 'soapbox/utils/features';
 
 import ColumnForbidden from '../ui/components/column-forbidden';
 
@@ -34,10 +36,12 @@ interface IManageGroup {
 
 const ManageGroup: React.FC<IManageGroup> = ({ params }) => {
   const { id } = params;
-  const intl = useIntl();
-  const history = useHistory();
+
+  const backend = useBackend();
   const dispatch = useAppDispatch();
   const groupsPath = useGroupsPath();
+  const history = useHistory();
+  const intl = useIntl();
 
   const { group } = useGroup(id);
 
@@ -99,7 +103,10 @@ const ManageGroup: React.FC<IManageGroup> = ({ params }) => {
         </CardHeader>
 
         <List>
-          <ListItem label={intl.formatMessage(messages.pendingRequests)} onClick={navigateToPending} />
+          {backend.software !== TRUTHSOCIAL && (
+            <ListItem label={intl.formatMessage(messages.pendingRequests)} onClick={navigateToPending} />
+          )}
+
           <ListItem label={intl.formatMessage(messages.blockedMembers)} onClick={navigateToBlocks} />
         </List>
 

From 659c1863946a396d533d3e16d2aa931f93f17fe4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Apr 2023 15:06:20 -0500
Subject: [PATCH 042/298] ManageGroupModal: use internal state instead of Redux

---
 app/soapbox/actions/groups.ts                 |  25 ---
 .../entity-store/hooks/useCreateEntity.ts     |   4 +-
 .../entity-store/hooks/useEntityActions.ts    |   2 +-
 .../group/components/group-avatar-picker.tsx  |   2 +-
 .../group/components/group-header-picker.tsx  |   2 +-
 .../manage-group-modal/manage-group-modal.tsx |  59 +++---
 .../manage-group-modal/steps/details-step.tsx | 175 +++++-------------
 .../manage-group-modal/steps/privacy-step.tsx |  24 +--
 .../hooks/api/groups/useCreateGroup.ts        |  33 ++++
 app/soapbox/hooks/api/index.ts                |   1 +
 app/soapbox/reducers/index.ts                 |   2 -
 11 files changed, 120 insertions(+), 209 deletions(-)
 create mode 100644 app/soapbox/hooks/api/groups/useCreateGroup.ts

diff --git a/app/soapbox/actions/groups.ts b/app/soapbox/actions/groups.ts
index 8a6ad065e..1808286e5 100644
--- a/app/soapbox/actions/groups.ts
+++ b/app/soapbox/actions/groups.ts
@@ -783,30 +783,6 @@ 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 visibility  = getState().group_editor.locked ? 'members_only' : 'everyone'; // Truth Social
-
-  const params: Record<string, any> = {
-    display_name: displayName,
-    group_visibility: visibility,
-    note,
-  };
-
-  if (avatar) params.avatar = avatar;
-  if (header) params.header = header;
-
-  if (groupId === null) {
-    return dispatch(createGroup(params, shouldReset));
-  } else {
-    return dispatch(updateGroup(groupId, params, shouldReset));
-  }
-};
-
 export {
   GROUP_EDITOR_SET,
   GROUP_CREATE_REQUEST,
@@ -960,5 +936,4 @@ export {
   changeGroupEditorPrivacy,
   changeGroupEditorMedia,
   resetGroupEditor,
-  submitGroupEditor,
 };
diff --git a/app/soapbox/entity-store/hooks/useCreateEntity.ts b/app/soapbox/entity-store/hooks/useCreateEntity.ts
index ba9dd802b..31299344e 100644
--- a/app/soapbox/entity-store/hooks/useCreateEntity.ts
+++ b/app/soapbox/entity-store/hooks/useCreateEntity.ts
@@ -20,7 +20,7 @@ function useCreateEntity<TEntity extends Entity = Entity, Data = unknown>(
 ) {
   const dispatch = useAppDispatch();
 
-  const [isLoading, setPromise] = useLoading();
+  const [isSubmitting, setPromise] = useLoading();
   const { entityType, listKey } = parseEntitiesPath(expandedPath);
 
   async function createEntity(data: Data, callbacks: EntityCallbacks<TEntity> = {}): Promise<void> {
@@ -44,7 +44,7 @@ function useCreateEntity<TEntity extends Entity = Entity, Data = unknown>(
 
   return {
     createEntity,
-    isLoading,
+    isSubmitting,
   };
 }
 
diff --git a/app/soapbox/entity-store/hooks/useEntityActions.ts b/app/soapbox/entity-store/hooks/useEntityActions.ts
index dab6f7f77..13fda06ac 100644
--- a/app/soapbox/entity-store/hooks/useEntityActions.ts
+++ b/app/soapbox/entity-store/hooks/useEntityActions.ts
@@ -27,7 +27,7 @@ function useEntityActions<TEntity extends Entity = Entity, Data = any>(
   const { deleteEntity, isLoading: deleteLoading } =
     useDeleteEntity(entityType, (entityId) => api.delete(endpoints.delete!.replaceAll(':id', entityId)));
 
-  const { createEntity, isLoading: createLoading } =
+  const { createEntity, isSubmitting: createLoading } =
     useCreateEntity<TEntity, Data>(path, (data) => api.post(endpoints.post!, data), opts);
 
   return {
diff --git a/app/soapbox/features/group/components/group-avatar-picker.tsx b/app/soapbox/features/group/components/group-avatar-picker.tsx
index 4e2851e33..b13dfe80e 100644
--- a/app/soapbox/features/group/components/group-avatar-picker.tsx
+++ b/app/soapbox/features/group/components/group-avatar-picker.tsx
@@ -8,7 +8,7 @@ interface IMediaInput {
   src: string | undefined
   accept: string
   onChange: React.ChangeEventHandler<HTMLInputElement>
-  disabled: boolean
+  disabled?: boolean
 }
 
 const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
diff --git a/app/soapbox/features/group/components/group-header-picker.tsx b/app/soapbox/features/group/components/group-header-picker.tsx
index 7fcdae688..d2457ac1e 100644
--- a/app/soapbox/features/group/components/group-header-picker.tsx
+++ b/app/soapbox/features/group/components/group-header-picker.tsx
@@ -9,7 +9,7 @@ interface IMediaInput {
   src: string | undefined
   accept: string
   onChange: React.ChangeEventHandler<HTMLInputElement>
-  disabled: boolean
+  disabled?: boolean
 }
 
 const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/manage-group-modal.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/manage-group-modal.tsx
index fcc7c14da..3486c8e6e 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/manage-group-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/manage-group-modal.tsx
@@ -1,10 +1,10 @@
 import React, { useMemo, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { submitGroupEditor } from 'soapbox/actions/groups';
 import { Modal, Stack } from 'soapbox/components/ui';
-import { useAppDispatch, useAppSelector, useDebounce } from 'soapbox/hooks';
-import { useGroupValidation } from 'soapbox/hooks/api';
+import { useDebounce } from 'soapbox/hooks';
+import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/hooks/api';
+import { type Group } from 'soapbox/schemas';
 
 import ConfirmationStep from './steps/confirmation-step';
 import DetailsStep from './steps/details-step';
@@ -13,7 +13,6 @@ import PrivacyStep from './steps/privacy-step';
 const messages = defineMessages({
   next: { id: 'manage_group.next', defaultMessage: 'Next' },
   create: { id: 'manage_group.create', defaultMessage: 'Create' },
-  update: { id: 'manage_group.update', defaultMessage: 'Update' },
   done: { id: 'manage_group.done', defaultMessage: 'Done' },
 });
 
@@ -23,12 +22,6 @@ enum Steps {
   THREE = 'THREE',
 }
 
-const manageGroupSteps = {
-  ONE: PrivacyStep,
-  TWO: DetailsStep,
-  THREE: ConfirmationStep,
-};
-
 interface IManageGroupModal {
   onClose: (type?: string) => void
 }
@@ -36,34 +29,26 @@ interface IManageGroupModal {
 const ManageGroupModal: React.FC<IManageGroupModal> = ({ onClose }) => {
   const intl = useIntl();
   const debounce = useDebounce;
-  const dispatch = useAppDispatch();
 
-  const id = useAppSelector((state) => state.group_editor.groupId);
-  const [group, setGroup] = useState<any | null>(null);
+  const [group, setGroup] = useState<Group | null>(null);
+  const [params, setParams] = useState<CreateGroupParams>({});
+  const [currentStep, setCurrentStep] = useState<Steps>(Steps.ONE);
 
-  const isSubmitting = useAppSelector((state) => state.group_editor.isSubmitting);
-
-  const [currentStep, setCurrentStep] = useState<Steps>(id ? Steps.TWO : Steps.ONE);
-
-  const name = useAppSelector((state) => state.group_editor.displayName);
-  const debouncedName = debounce(name, 300);
+  const { createGroup, isSubmitting } = useCreateGroup();
 
+  const debouncedName = debounce(params.display_name || '', 300);
   const { data: { isValid } } = useGroupValidation(debouncedName);
 
   const handleClose = () => {
     onClose('MANAGE_GROUP');
   };
 
-  const handleSubmit = () => {
-    return dispatch(submitGroupEditor(true));
-  };
-
   const confirmationText = useMemo(() => {
     switch (currentStep) {
       case Steps.THREE:
         return intl.formatMessage(messages.done);
       case Steps.TWO:
-        return intl.formatMessage(id ? messages.update : messages.create);
+        return intl.formatMessage(messages.create);
       default:
         return intl.formatMessage(messages.next);
     }
@@ -75,12 +60,12 @@ const ManageGroupModal: React.FC<IManageGroupModal> = ({ onClose }) => {
         setCurrentStep(Steps.TWO);
         break;
       case Steps.TWO:
-        handleSubmit()
-          .then((group) => {
+        createGroup(params, {
+          onSuccess(group) {
             setCurrentStep(Steps.THREE);
             setGroup(group);
-          })
-          .catch(() => {});
+          },
+        });
         break;
       case Steps.THREE:
         handleClose();
@@ -90,13 +75,20 @@ const ManageGroupModal: React.FC<IManageGroupModal> = ({ onClose }) => {
     }
   };
 
-  const StepToRender = manageGroupSteps[currentStep];
+  const renderStep = () => {
+    switch (currentStep) {
+      case Steps.ONE:
+        return <PrivacyStep params={params} onChange={setParams} />;
+      case Steps.TWO:
+        return <DetailsStep params={params} onChange={setParams} />;
+      case Steps.THREE:
+        return <ConfirmationStep group={group!} />;
+    }
+  };
 
   return (
     <Modal
-      title={id
-        ? <FormattedMessage id='navigation_bar.edit_group' defaultMessage='Edit Group' />
-        : <FormattedMessage id='navigation_bar.create_group' defaultMessage='Create Group' />}
+      title={<FormattedMessage id='navigation_bar.create_group' defaultMessage='Create Group' />}
       confirmationAction={handleNextStep}
       confirmationText={confirmationText}
       confirmationDisabled={isSubmitting || (currentStep === Steps.TWO && !isValid)}
@@ -104,8 +96,7 @@ const ManageGroupModal: React.FC<IManageGroupModal> = ({ onClose }) => {
       onClose={handleClose}
     >
       <Stack space={2}>
-        {/* @ts-ignore */}
-        <StepToRender group={group} />
+        {renderStep()}
       </Stack>
     </Modal>
   );
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
index 59b59b2ec..66b7b4b1d 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
@@ -1,162 +1,73 @@
-import clsx from 'clsx';
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import {
-  changeGroupEditorTitle,
-  changeGroupEditorDescription,
-  changeGroupEditorMedia,
-} from 'soapbox/actions/groups';
-import { Avatar, Form, FormGroup, HStack, Icon, Input, Text, Textarea } from 'soapbox/components/ui';
-import { useAppDispatch, useAppSelector, useDebounce, useInstance } from 'soapbox/hooks';
-import { useGroupValidation } from 'soapbox/hooks/api';
-import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
+import { Form, FormGroup, Input, Textarea } from 'soapbox/components/ui';
+import AvatarPicker from 'soapbox/features/group/components/group-avatar-picker';
+import HeaderPicker from 'soapbox/features/group/components/group-header-picker';
+import { useAppSelector, useDebounce, useInstance } from 'soapbox/hooks';
+import { CreateGroupParams, useGroupValidation } from 'soapbox/hooks/api';
+import { usePreview } from 'soapbox/hooks/forms';
 import resizeImage from 'soapbox/utils/resize-image';
 
 import type { List as ImmutableList } from 'immutable';
 
-interface IMediaInput {
-  src: string | null
-  accept: string
-  onChange: React.ChangeEventHandler<HTMLInputElement>
-  disabled: boolean
-}
-
 const messages = defineMessages({
   groupNamePlaceholder: { id: 'manage_group.fields.name_placeholder', defaultMessage: 'Group Name' },
   groupDescriptionPlaceholder: { id: 'manage_group.fields.description_placeholder', defaultMessage: 'Description' },
 });
 
-const HeaderPicker: React.FC<IMediaInput> = ({ src, onChange, accept, disabled }) => {
-  return (
-    <label
-      className='dark:sm:shadow-inset relative h-24 w-full cursor-pointer overflow-hidden rounded-xl bg-primary-100 text-primary-500 dark:bg-gray-800 dark:text-accent-blue sm:h-44'
-    >
-      {src && <img className='h-full w-full object-cover' src={src} alt='' />}
-      <HStack
-        className={clsx('absolute top-0 h-full w-full transition-opacity', {
-          'opacity-0 hover:opacity-90 bg-primary-100 dark:bg-gray-800': src,
-        })}
-        space={1.5}
-        alignItems='center'
-        justifyContent='center'
-      >
-        <Icon
-          src={require('@tabler/icons/photo-plus.svg')}
-          className='h-4.5 w-4.5'
-        />
+interface IDetailsStep {
+  params: CreateGroupParams
+  onChange(params: CreateGroupParams): void
+}
 
-        <Text size='md' theme='primary' weight='semibold'>
-          <FormattedMessage id='group.upload_banner' defaultMessage='Upload photo' />
-        </Text>
-
-        <input
-          name='header'
-          type='file'
-          accept={accept}
-          onChange={onChange}
-          disabled={disabled}
-          className='hidden'
-        />
-      </HStack>
-    </label>
-  );
-};
-
-const AvatarPicker: React.FC<IMediaInput> = ({ src, onChange, accept, disabled }) => {
-  return (
-    <label className='absolute bottom-0 left-1/2 h-20 w-20 -translate-x-1/2 translate-y-1/2 cursor-pointer rounded-full bg-primary-500 ring-4 ring-white dark:ring-primary-900'>
-      {src && <Avatar src={src} size={80} />}
-      <HStack
-        alignItems='center'
-        justifyContent='center'
-
-        className={clsx('absolute left-0 top-0 h-full w-full rounded-full transition-opacity', {
-          'opacity-0 hover:opacity-90 bg-primary-500': src,
-        })}
-      >
-        <Icon
-          src={require('@tabler/icons/camera-plus.svg')}
-          className='h-5 w-5 text-white'
-        />
-      </HStack>
-      <span className='sr-only'>Upload avatar</span>
-      <input
-        name='avatar'
-        type='file'
-        accept={accept}
-        onChange={onChange}
-        disabled={disabled}
-        className='hidden'
-      />
-    </label>
-  );
-};
-
-const DetailsStep = () => {
+const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
   const intl = useIntl();
   const debounce = useDebounce;
-  const dispatch = useAppDispatch();
   const instance = useInstance();
 
-  const groupId = useAppSelector((state) => state.group_editor.groupId);
-  const isUploading = useAppSelector((state) => state.group_editor.isUploading);
-  const name = useAppSelector((state) => state.group_editor.displayName);
-  const description = useAppSelector((state) => state.group_editor.note);
-
-  const debouncedName = debounce(name, 300);
+  const {
+    display_name: displayName = '',
+    note = '',
+  } = params;
 
+  const debouncedName = debounce(displayName, 300);
   const { data: { isValid, message: errorMessage } } = useGroupValidation(debouncedName);
 
-  const [avatarSrc, setAvatarSrc] = useState<string | null>(null);
-  const [headerSrc, setHeaderSrc] = useState<string | null>(null);
+  const avatarSrc = usePreview(params.avatar);
+  const headerSrc = usePreview(params.header);
 
   const attachmentTypes = useAppSelector(
     state => state.instance.configuration.getIn(['media_attachments', 'supported_mime_types']) as ImmutableList<string>,
   )?.filter(type => type.startsWith('image/')).toArray().join(',');
 
-  const onChangeName: React.ChangeEventHandler<HTMLInputElement> = ({ target }) => {
-    dispatch(changeGroupEditorTitle(target.value));
+  const handleTextChange = (property: keyof CreateGroupParams): React.ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement> => {
+    return (e) => {
+      onChange({
+        ...params,
+        [property]: e.target.value,
+      });
+    };
   };
 
-  const onChangeDescription: React.ChangeEventHandler<HTMLTextAreaElement> = ({ target }) => {
-    dispatch(changeGroupEditorDescription(target.value));
+  const handleImageChange = (property: keyof CreateGroupParams, maxPixels?: number): React.ChangeEventHandler<HTMLInputElement> => {
+    return async ({ target: { files } }) => {
+      const file = files ? files[0] : undefined;
+      if (file) {
+        const resized = await resizeImage(file, maxPixels);
+        onChange({
+          ...params,
+          [property]: resized,
+        });
+      }
+    };
   };
 
-  const handleFileChange: React.ChangeEventHandler<HTMLInputElement> = e => {
-    const rawFile = e.target.files?.item(0);
-
-    if (!rawFile) return;
-
-    if (e.target.name === 'avatar') {
-      resizeImage(rawFile, 400 * 400).then(file => {
-        dispatch(changeGroupEditorMedia('avatar', file));
-        setAvatarSrc(URL.createObjectURL(file));
-      }).catch(console.error);
-    } else {
-      resizeImage(rawFile, 1920 * 1080).then(file => {
-        dispatch(changeGroupEditorMedia('header', file));
-        setHeaderSrc(URL.createObjectURL(file));
-      }).catch(console.error);
-    }
-  };
-
-  useEffect(() => {
-    if (!groupId) return;
-
-    dispatch((_, getState) => {
-      const group = getState().groups.items.get(groupId);
-      if (!group) return;
-      if (group.avatar && !isDefaultAvatar(group.avatar)) setAvatarSrc(group.avatar);
-      if (group.header && !isDefaultHeader(group.header)) setHeaderSrc(group.header);
-    });
-  }, [groupId]);
-
   return (
     <Form>
       <div className='relative mb-12 flex'>
-        <HeaderPicker src={headerSrc} accept={attachmentTypes} onChange={handleFileChange} disabled={isUploading} />
-        <AvatarPicker src={avatarSrc} accept={attachmentTypes} onChange={handleFileChange} disabled={isUploading} />
+        <HeaderPicker src={headerSrc} accept={attachmentTypes} onChange={handleImageChange('header', 1920 * 1080)} />
+        <AvatarPicker src={avatarSrc} accept={attachmentTypes} onChange={handleImageChange('avatar', 400 * 400)} />
       </div>
 
       <FormGroup
@@ -167,8 +78,8 @@ const DetailsStep = () => {
         <Input
           type='text'
           placeholder={intl.formatMessage(messages.groupNamePlaceholder)}
-          value={name}
-          onChange={onChangeName}
+          value={displayName}
+          onChange={handleTextChange('display_name')}
           maxLength={Number(instance.configuration.getIn(['groups', 'max_characters_name']))}
         />
       </FormGroup>
@@ -179,8 +90,8 @@ const DetailsStep = () => {
         <Textarea
           autoComplete='off'
           placeholder={intl.formatMessage(messages.groupDescriptionPlaceholder)}
-          value={description}
-          onChange={onChangeDescription}
+          value={note}
+          onChange={handleTextChange('note')}
           maxLength={Number(instance.configuration.getIn(['groups', 'max_characters_description']))}
         />
       </FormGroup>
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
index 2ba2cc7c6..4e42d0b58 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
@@ -1,18 +1,20 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
-import { changeGroupEditorPrivacy } from 'soapbox/actions/groups';
 import List, { ListItem } from 'soapbox/components/list';
 import { Form, FormGroup, Stack, Text } from 'soapbox/components/ui';
-import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
+import { type CreateGroupParams } from 'soapbox/hooks/api';
 
-const PrivacyStep = () => {
-  const dispatch = useAppDispatch();
+interface IPrivacyStep {
+  params: CreateGroupParams
+  onChange(params: CreateGroupParams): void
+}
 
-  const locked = useAppSelector((state) => state.group_editor.locked);
+const PrivacyStep: React.FC<IPrivacyStep> = ({ params, onChange }) => {
+  const visibility = params.group_visibility || 'everyone';
 
-  const onChangePrivacy = (value: boolean) => {
-    dispatch(changeGroupEditorPrivacy(value));
+  const onChangePrivacy = (group_visibility: CreateGroupParams['group_visibility']) => {
+    onChange({ ...params, group_visibility });
   };
 
   return (
@@ -33,15 +35,15 @@ const PrivacyStep = () => {
             <ListItem
               label={<Text weight='medium'><FormattedMessage id='manage_group.privacy.public.label' defaultMessage='Public' /></Text>}
               hint={<FormattedMessage id='manage_group.privacy.public.hint' defaultMessage='Discoverable. Anyone can join.' />}
-              onSelect={() => onChangePrivacy(false)}
-              isSelected={!locked}
+              onSelect={() => onChangePrivacy('everyone')}
+              isSelected={visibility === 'everyone'}
             />
 
             <ListItem
               label={<Text weight='medium'><FormattedMessage id='manage_group.privacy.private.label' defaultMessage='Private (Owner approval required)' /></Text>}
               hint={<FormattedMessage id='manage_group.privacy.private.hint' defaultMessage='Discoverable. Users can join after their request is approved.' />}
-              onSelect={() => onChangePrivacy(true)}
-              isSelected={locked}
+              onSelect={() => onChangePrivacy('members_only')}
+              isSelected={visibility === 'members_only'}
             />
           </List>
         </FormGroup>
diff --git a/app/soapbox/hooks/api/groups/useCreateGroup.ts b/app/soapbox/hooks/api/groups/useCreateGroup.ts
new file mode 100644
index 000000000..e2c54971c
--- /dev/null
+++ b/app/soapbox/hooks/api/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], (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 };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index f3bd400e1..55d22e1d1 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -3,6 +3,7 @@
  */
 export { useBlockGroupMember } from './groups/useBlockGroupMember';
 export { useCancelMembershipRequest } from './groups/useCancelMembershipRequest';
+export { useCreateGroup, type CreateGroupParams } from './groups/useCreateGroup';
 export { useDeleteGroup } from './groups/useDeleteGroup';
 export { useDemoteGroupMember } from './groups/useDemoteGroupMember';
 export { useGroup, useGroups } from './groups/useGroups';
diff --git a/app/soapbox/reducers/index.ts b/app/soapbox/reducers/index.ts
index d6194509d..82b93e791 100644
--- a/app/soapbox/reducers/index.ts
+++ b/app/soapbox/reducers/index.ts
@@ -28,7 +28,6 @@ import custom_emojis from './custom-emojis';
 import domain_lists from './domain-lists';
 import dropdown_menu from './dropdown-menu';
 import filters from './filters';
-import group_editor from './group-editor';
 import group_memberships from './group-memberships';
 import group_relationships from './group-relationships';
 import groups from './groups';
@@ -93,7 +92,6 @@ const reducers = {
   dropdown_menu,
   entities,
   filters,
-  group_editor,
   group_memberships,
   group_relationships,
   groups,

From 9d0ff2b8a41195c3b5dcaa2856fdd9dbf6985660 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Apr 2023 15:10:33 -0500
Subject: [PATCH 043/298] Remove group-editor code

---
 app/soapbox/actions/groups.ts        | 147 +--------------------------
 app/soapbox/reducers/group-editor.ts |  80 ---------------
 2 files changed, 1 insertion(+), 226 deletions(-)
 delete mode 100644 app/soapbox/reducers/group-editor.ts

diff --git a/app/soapbox/actions/groups.ts b/app/soapbox/actions/groups.ts
index 1808286e5..690b74540 100644
--- a/app/soapbox/actions/groups.ts
+++ b/app/soapbox/actions/groups.ts
@@ -1,21 +1,15 @@
-import { defineMessages } from 'react-intl';
-
 import { deleteEntities } from 'soapbox/entity-store/actions';
-import toast from 'soapbox/toast';
 
 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';
@@ -97,100 +91,6 @@ 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());
-        }
-
-        return data;
-      }).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(deleteEntities([id], 'Group'));
 
@@ -758,33 +658,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,
-});
-
 export {
-  GROUP_EDITOR_SET,
   GROUP_CREATE_REQUEST,
   GROUP_CREATE_SUCCESS,
   GROUP_CREATE_FAIL,
@@ -845,20 +719,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,
@@ -931,9 +791,4 @@ export {
   rejectGroupMembershipRequestRequest,
   rejectGroupMembershipRequestSuccess,
   rejectGroupMembershipRequestFail,
-  changeGroupEditorTitle,
-  changeGroupEditorDescription,
-  changeGroupEditorPrivacy,
-  changeGroupEditorMedia,
-  resetGroupEditor,
 };
diff --git a/app/soapbox/reducers/group-editor.ts b/app/soapbox/reducers/group-editor.ts
deleted file mode 100644
index 3669acd20..000000000
--- a/app/soapbox/reducers/group-editor.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Record as ImmutableRecord } from 'immutable';
-
-import {
-  GROUP_EDITOR_RESET,
-  GROUP_EDITOR_TITLE_CHANGE,
-  GROUP_EDITOR_DESCRIPTION_CHANGE,
-  GROUP_EDITOR_PRIVACY_CHANGE,
-  GROUP_EDITOR_MEDIA_CHANGE,
-  GROUP_CREATE_REQUEST,
-  GROUP_CREATE_FAIL,
-  GROUP_CREATE_SUCCESS,
-  GROUP_UPDATE_REQUEST,
-  GROUP_UPDATE_FAIL,
-  GROUP_UPDATE_SUCCESS,
-  GROUP_EDITOR_SET,
-} from 'soapbox/actions/groups';
-
-import type { AnyAction } from 'redux';
-
-const ReducerRecord = ImmutableRecord({
-  groupId: null as string | null,
-  progress: 0,
-  isUploading: false,
-  isSubmitting: false,
-  isChanged: false,
-  displayName: '',
-  note: '',
-  avatar: null as File | null,
-  header: null as File | null,
-  locked: false,
-});
-
-type State = ReturnType<typeof ReducerRecord>;
-
-export default function groupEditor(state: State = ReducerRecord(), action: AnyAction) {
-  switch (action.type) {
-    case GROUP_EDITOR_RESET:
-      return ReducerRecord();
-    case GROUP_EDITOR_SET:
-      return state.withMutations(map => {
-        map.set('groupId', action.group.id);
-        map.set('displayName', action.group.display_name);
-        map.set('note', action.group.note);
-      });
-    case GROUP_EDITOR_TITLE_CHANGE:
-      return state.withMutations(map => {
-        map.set('displayName', action.value);
-        map.set('isChanged', true);
-      });
-    case GROUP_EDITOR_DESCRIPTION_CHANGE:
-      return state.withMutations(map => {
-        map.set('note', action.value);
-        map.set('isChanged', true);
-      });
-    case GROUP_EDITOR_PRIVACY_CHANGE:
-      return state.withMutations(map => {
-        map.set('locked', action.value);
-        map.set('isChanged', true);
-      });
-    case GROUP_EDITOR_MEDIA_CHANGE:
-      return state.set(action.mediaType, action.value);
-    case GROUP_CREATE_REQUEST:
-    case GROUP_UPDATE_REQUEST:
-      return state.withMutations(map => {
-        map.set('isSubmitting', true);
-        map.set('isChanged', false);
-      });
-    case GROUP_CREATE_FAIL:
-    case GROUP_UPDATE_FAIL:
-      return state.set('isSubmitting', false);
-    case GROUP_CREATE_SUCCESS:
-    case GROUP_UPDATE_SUCCESS:
-      return state.withMutations(map => {
-        map.set('isSubmitting', false);
-        map.set('groupId', action.group.id);
-      });
-    default:
-      return state;
-  }
-}

From c9a724525eb45543216d641ef6c5aafe4b4c83dc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Apr 2023 15:12:50 -0500
Subject: [PATCH 044/298] ManageGroupModal --> CreateGroupModal

---
 app/soapbox/features/groups/index.tsx                       | 2 +-
 app/soapbox/features/ui/components/modal-root.tsx           | 4 ++--
 .../{manage-group-modal.tsx => create-group-modal.tsx}      | 6 +++---
 .../features/ui/components/panels/new-group-panel.tsx       | 2 +-
 app/soapbox/features/ui/util/async-components.ts            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename app/soapbox/features/ui/components/modals/manage-group-modal/{manage-group-modal.tsx => create-group-modal.tsx} (95%)

diff --git a/app/soapbox/features/groups/index.tsx b/app/soapbox/features/groups/index.tsx
index 7c392d28d..2f6436cd5 100644
--- a/app/soapbox/features/groups/index.tsx
+++ b/app/soapbox/features/groups/index.tsx
@@ -33,7 +33,7 @@ const Groups: React.FC = () => {
   const { groups, isLoading } = useGroups(debouncedValue);
 
   const createGroup = () => {
-    dispatch(openModal('MANAGE_GROUP'));
+    dispatch(openModal('CREATE_GROUP'));
   };
 
   const renderBlankslate = () => (
diff --git a/app/soapbox/features/ui/components/modal-root.tsx b/app/soapbox/features/ui/components/modal-root.tsx
index 55e53c268..08fd4c88c 100644
--- a/app/soapbox/features/ui/components/modal-root.tsx
+++ b/app/soapbox/features/ui/components/modal-root.tsx
@@ -26,7 +26,7 @@ import {
   LandingPageModal,
   ListAdder,
   ListEditor,
-  ManageGroupModal,
+  CreateGroupModal,
   MediaModal,
   MentionsModal,
   MissingDescriptionModal,
@@ -59,6 +59,7 @@ const MODAL_COMPONENTS = {
   'COMPOSE': ComposeModal,
   'COMPOSE_EVENT': ComposeEventModal,
   'CONFIRM': ConfirmationModal,
+  'CREATE_GROUP': CreateGroupModal,
   'CRYPTO_DONATE': CryptoDonateModal,
   'DISLIKES': DislikesModal,
   'EDIT_ANNOUNCEMENT': EditAnnouncementModal,
@@ -73,7 +74,6 @@ const MODAL_COMPONENTS = {
   'LANDING_PAGE': LandingPageModal,
   'LIST_ADDER': ListAdder,
   'LIST_EDITOR': ListEditor,
-  'MANAGE_GROUP': ManageGroupModal,
   'MEDIA': MediaModal,
   'MENTIONS': MentionsModal,
   'MISSING_DESCRIPTION': MissingDescriptionModal,
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/manage-group-modal.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
similarity index 95%
rename from app/soapbox/features/ui/components/modals/manage-group-modal/manage-group-modal.tsx
rename to app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
index 3486c8e6e..2d4bea51a 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/manage-group-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
@@ -22,11 +22,11 @@ enum Steps {
   THREE = 'THREE',
 }
 
-interface IManageGroupModal {
+interface ICreateGroupModal {
   onClose: (type?: string) => void
 }
 
-const ManageGroupModal: React.FC<IManageGroupModal> = ({ onClose }) => {
+const CreateGroupModal: React.FC<ICreateGroupModal> = ({ onClose }) => {
   const intl = useIntl();
   const debounce = useDebounce;
 
@@ -102,4 +102,4 @@ const ManageGroupModal: React.FC<IManageGroupModal> = ({ onClose }) => {
   );
 };
 
-export default ManageGroupModal;
+export default CreateGroupModal;
diff --git a/app/soapbox/features/ui/components/panels/new-group-panel.tsx b/app/soapbox/features/ui/components/panels/new-group-panel.tsx
index 9eba9c7e0..387f3abf0 100644
--- a/app/soapbox/features/ui/components/panels/new-group-panel.tsx
+++ b/app/soapbox/features/ui/components/panels/new-group-panel.tsx
@@ -12,7 +12,7 @@ const NewGroupPanel = () => {
   const canCreateGroup = useAppSelector((state) => hasPermission(state, PERMISSION_CREATE_GROUPS));
 
   const createGroup = () => {
-    dispatch(openModal('MANAGE_GROUP'));
+    dispatch(openModal('CREATE_GROUP'));
   };
 
   if (!canCreateGroup) return null;
diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts
index 381f033ad..5296504da 100644
--- a/app/soapbox/features/ui/util/async-components.ts
+++ b/app/soapbox/features/ui/util/async-components.ts
@@ -590,8 +590,8 @@ export function GroupMembershipRequests() {
   return import(/* webpackChunkName: "features/groups" */'../../group/group-membership-requests');
 }
 
-export function ManageGroupModal() {
-  return import(/* webpackChunkName: "features/manage_group_modal" */'../components/modals/manage-group-modal/manage-group-modal');
+export function CreateGroupModal() {
+  return import(/* webpackChunkName: "features/groups" */'../components/modals/manage-group-modal/create-group-modal');
 }
 
 export function NewGroupPanel() {

From a4992eec4d2d53a30fbd09ec531a03f90a0426d8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Apr 2023 15:19:10 -0500
Subject: [PATCH 045/298] isLoading --> isSubmitting for action hooks

---
 app/soapbox/entity-store/hooks/useDeleteEntity.ts           | 4 ++--
 app/soapbox/entity-store/hooks/useEntityActions.ts          | 6 +++---
 .../features/group/components/group-action-button.tsx       | 6 +++---
 app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts  | 4 ++--
 app/soapbox/hooks/api/groups/useDeleteGroup.ts              | 4 ++--
 app/soapbox/hooks/api/groups/useJoinGroup.ts                | 4 ++--
 app/soapbox/hooks/api/groups/useLeaveGroup.ts               | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/soapbox/entity-store/hooks/useDeleteEntity.ts b/app/soapbox/entity-store/hooks/useDeleteEntity.ts
index 767224af6..dac1d9a26 100644
--- a/app/soapbox/entity-store/hooks/useDeleteEntity.ts
+++ b/app/soapbox/entity-store/hooks/useDeleteEntity.ts
@@ -15,7 +15,7 @@ function useDeleteEntity(
 ) {
   const dispatch = useAppDispatch();
   const getState = useGetState();
-  const [isLoading, setPromise] = useLoading();
+  const [isSubmitting, setPromise] = useLoading();
 
   async function deleteEntity(entityId: string, callbacks: EntityCallbacks<string> = {}): Promise<void> {
     // Get the entity before deleting, so we can reverse the action if the API request fails.
@@ -47,7 +47,7 @@ function useDeleteEntity(
 
   return {
     deleteEntity,
-    isLoading,
+    isSubmitting,
   };
 }
 
diff --git a/app/soapbox/entity-store/hooks/useEntityActions.ts b/app/soapbox/entity-store/hooks/useEntityActions.ts
index 13fda06ac..8b87c52fd 100644
--- a/app/soapbox/entity-store/hooks/useEntityActions.ts
+++ b/app/soapbox/entity-store/hooks/useEntityActions.ts
@@ -24,16 +24,16 @@ function useEntityActions<TEntity extends Entity = Entity, Data = any>(
   const api = useApi();
   const { entityType, path } = parseEntitiesPath(expandedPath);
 
-  const { deleteEntity, isLoading: deleteLoading } =
+  const { deleteEntity, isSubmitting: deleteSubmitting } =
     useDeleteEntity(entityType, (entityId) => api.delete(endpoints.delete!.replaceAll(':id', entityId)));
 
-  const { createEntity, isSubmitting: createLoading } =
+  const { createEntity, isSubmitting: createSubmitting } =
     useCreateEntity<TEntity, Data>(path, (data) => api.post(endpoints.post!, data), opts);
 
   return {
     createEntity,
     deleteEntity,
-    isLoading: createLoading || deleteLoading,
+    isSubmitting: createSubmitting || deleteSubmitting,
   };
 }
 
diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index c697bc4ee..ccf597900 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -89,7 +89,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
       <Button
         theme='primary'
         onClick={onJoinGroup}
-        disabled={joinGroup.isLoading}
+        disabled={joinGroup.isSubmitting}
       >
         {group.locked
           ? <FormattedMessage id='group.join.private' defaultMessage='Request Access' />
@@ -103,7 +103,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
       <Button
         theme='secondary'
         onClick={onCancelRequest}
-        disabled={cancelRequest.isLoading}
+        disabled={cancelRequest.isSubmitting}
       >
         <FormattedMessage id='group.cancel_request' defaultMessage='Cancel Request' />
       </Button>
@@ -114,7 +114,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
     <Button
       theme='secondary'
       onClick={onLeaveGroup}
-      disabled={leaveGroup.isLoading}
+      disabled={leaveGroup.isSubmitting}
     >
       <FormattedMessage id='group.leave' defaultMessage='Leave Group' />
     </Button>
diff --git a/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts b/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts
index 3aad33f9c..3bb35ef43 100644
--- a/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts
+++ b/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts
@@ -7,14 +7,14 @@ import type { Group, GroupRelationship } from 'soapbox/schemas';
 function useCancelMembershipRequest(group: Group) {
   const me = useOwnAccount();
 
-  const { createEntity, isLoading } = useEntityActions<GroupRelationship>(
+  const { createEntity, isSubmitting } = useEntityActions<GroupRelationship>(
     [Entities.GROUP_RELATIONSHIPS, group.id],
     { post: `/api/v1/groups/${group.id}/membership_requests/${me?.id}/reject` },
   );
 
   return {
     mutate: createEntity,
-    isLoading,
+    isSubmitting,
   };
 }
 
diff --git a/app/soapbox/hooks/api/groups/useDeleteGroup.ts b/app/soapbox/hooks/api/groups/useDeleteGroup.ts
index 277cfec46..d1b25cccd 100644
--- a/app/soapbox/hooks/api/groups/useDeleteGroup.ts
+++ b/app/soapbox/hooks/api/groups/useDeleteGroup.ts
@@ -4,14 +4,14 @@ import { useEntityActions } from 'soapbox/entity-store/hooks';
 import type { Group } from 'soapbox/schemas';
 
 function useDeleteGroup() {
-  const { deleteEntity, isLoading } = useEntityActions<Group>(
+  const { deleteEntity, isSubmitting } = useEntityActions<Group>(
     [Entities.GROUPS],
     { delete: '/api/v1/groups/:id' },
   );
 
   return {
     mutate: deleteEntity,
-    isLoading,
+    isSubmitting,
   };
 }
 
diff --git a/app/soapbox/hooks/api/groups/useJoinGroup.ts b/app/soapbox/hooks/api/groups/useJoinGroup.ts
index 46cd1d5bd..0ea9293d9 100644
--- a/app/soapbox/hooks/api/groups/useJoinGroup.ts
+++ b/app/soapbox/hooks/api/groups/useJoinGroup.ts
@@ -9,7 +9,7 @@ import type { Group, GroupRelationship } from 'soapbox/schemas';
 function useJoinGroup(group: Group) {
   const { invalidate } = useGroups();
 
-  const { createEntity, isLoading } = useEntityActions<GroupRelationship>(
+  const { createEntity, isSubmitting } = useEntityActions<GroupRelationship>(
     [Entities.GROUP_RELATIONSHIPS, group.id],
     { post: `/api/v1/groups/${group.id}/join` },
     { schema: groupRelationshipSchema },
@@ -17,7 +17,7 @@ function useJoinGroup(group: Group) {
 
   return {
     mutate: createEntity,
-    isLoading,
+    isSubmitting,
     invalidate,
   };
 }
diff --git a/app/soapbox/hooks/api/groups/useLeaveGroup.ts b/app/soapbox/hooks/api/groups/useLeaveGroup.ts
index af78c6d35..e1b11e737 100644
--- a/app/soapbox/hooks/api/groups/useLeaveGroup.ts
+++ b/app/soapbox/hooks/api/groups/useLeaveGroup.ts
@@ -9,7 +9,7 @@ import type { Group, GroupRelationship } from 'soapbox/schemas';
 function useLeaveGroup(group: Group) {
   const { invalidate } = useGroups();
 
-  const { createEntity, isLoading } = useEntityActions<GroupRelationship>(
+  const { createEntity, isSubmitting } = useEntityActions<GroupRelationship>(
     [Entities.GROUP_RELATIONSHIPS, group.id],
     { post: `/api/v1/groups/${group.id}/leave` },
     { schema: groupRelationshipSchema },
@@ -17,7 +17,7 @@ function useLeaveGroup(group: Group) {
 
   return {
     mutate: createEntity,
-    isLoading,
+    isSubmitting,
     invalidate,
   };
 }

From 6dc962f6aa7866efef690f55e176cfa681245c92 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 16:19:19 -0400
Subject: [PATCH 046/298] Fix icon

---
 .../groups/components/discover/search/recent-searches.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/groups/components/discover/search/recent-searches.tsx b/app/soapbox/features/groups/components/discover/search/recent-searches.tsx
index 1fe5e1d2f..44f134b4c 100644
--- a/app/soapbox/features/groups/components/discover/search/recent-searches.tsx
+++ b/app/soapbox/features/groups/components/discover/search/recent-searches.tsx
@@ -62,7 +62,7 @@ export default (props: Props) => {
                   <HStack alignItems='center' space={2}>
                     <div className='flex h-10 w-10 items-center justify-center rounded-full bg-gray-200 p-2 dark:bg-gray-800 dark:group-hover:bg-gray-700/20'>
                       <Icon
-                        src={require('@tabler/icons/hash.svg')}
+                        src={require('@tabler/icons/search.svg')}
                         className='h-5 w-5 text-gray-600'
                       />
                     </div>

From fd9fc8bb598bc8415aad6c135449fdcfd8c4501a Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 17:01:34 -0400
Subject: [PATCH 047/298] Update icon color for Group statuses

---
 app/soapbox/components/status.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 3ec072394..65291a420 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -8,7 +8,6 @@ import { mentionCompose, replyCompose } from 'soapbox/actions/compose';
 import { toggleFavourite, toggleReblog } from 'soapbox/actions/interactions';
 import { openModal } from 'soapbox/actions/modals';
 import { toggleStatusHidden, unfilterStatus } from 'soapbox/actions/statuses';
-import Icon from 'soapbox/components/icon';
 import TranslateButton from 'soapbox/components/translate-button';
 import AccountContainer from 'soapbox/containers/account-container';
 import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container';
@@ -22,7 +21,7 @@ import StatusMedia from './status-media';
 import StatusReplyMentions from './status-reply-mentions';
 import SensitiveContentOverlay from './statuses/sensitive-content-overlay';
 import StatusInfo from './statuses/status-info';
-import { Card, Stack, Text } from './ui';
+import { Card, Icon, Stack, Text } from './ui';
 
 import type {
   Account as AccountEntity,
@@ -217,7 +216,7 @@ const Status: React.FC<IStatus> = (props) => {
         <StatusInfo
           avatarSize={avatarSize}
           to={`/@${status.getIn(['account', 'acct'])}`}
-          icon={<Icon src={require('@tabler/icons/repeat.svg')} className='text-green-600' />}
+          icon={<Icon src={require('@tabler/icons/repeat.svg')} className='h-4 w-4 text-green-600' />}
           text={
             <FormattedMessage
               id='status.reblogged_by'
@@ -242,7 +241,7 @@ const Status: React.FC<IStatus> = (props) => {
       return (
         <StatusInfo
           avatarSize={avatarSize}
-          icon={<Icon src={require('@tabler/icons/pinned.svg')} className='text-gray-600 dark:text-gray-400' />}
+          icon={<Icon src={require('@tabler/icons/pinned.svg')} className='h-4 w-4 text-gray-600 dark:text-gray-400' />}
           text={
             <Text size='xs' theme='muted' weight='medium'>
               <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
@@ -255,7 +254,7 @@ const Status: React.FC<IStatus> = (props) => {
         <StatusInfo
           avatarSize={avatarSize}
           to={`/groups/${group.id}`}
-          icon={<Icon src={require('@tabler/icons/circles.svg')} className='text-gray-600 dark:text-gray-400' />}
+          icon={<Icon src={require('@tabler/icons/circles.svg')} className='h-4 w-4 text-primary-600 dark:text-accent-blue' />}
           text={
             <Text size='xs' theme='muted' weight='medium'>
               <FormattedMessage

From b959b147466a3691dec7a7b3b2bf54d7dbe9d8de Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 17:17:03 -0400
Subject: [PATCH 048/298] Update icon color in Group timeline

---
 app/soapbox/features/group/group-timeline.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/group/group-timeline.tsx b/app/soapbox/features/group/group-timeline.tsx
index f718b9c87..8ab33e910 100644
--- a/app/soapbox/features/group/group-timeline.tsx
+++ b/app/soapbox/features/group/group-timeline.tsx
@@ -93,7 +93,7 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
         onLoadMore={handleLoadMore}
         emptyMessage={
           <Stack space={4} className='py-6' justifyContent='center' alignItems='center'>
-            <div className='rounded-full bg-gray-200 p-4'>
+            <div className='rounded-full bg-gray-200 p-4 dark:bg-gray-800'>
               <Icon
                 src={require('@tabler/icons/message-2.svg')}
                 className='h-6 w-6 text-gray-600'

From 8d67556bdf420435084a9d63c7058a6625e0f918 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Apr 2023 16:46:02 -0500
Subject: [PATCH 049/298] yarn 118n

---
 app/soapbox/locales/en.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 2991449aa..b07f5de4f 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -944,7 +944,6 @@
   "manage_group.delete_group": "Delete group",
   "manage_group.done": "Done",
   "manage_group.edit_group": "Edit group",
-  "manage_group.edit_success": "The group was edited",
   "manage_group.fields.cannot_change_hint": "This cannot be changed after the group is created.",
   "manage_group.fields.description_label": "Description",
   "manage_group.fields.description_placeholder": "Description",
@@ -961,9 +960,7 @@
   "manage_group.privacy.private.label": "Private (Owner approval required)",
   "manage_group.privacy.public.hint": "Discoverable. Anyone can join.",
   "manage_group.privacy.public.label": "Public",
-  "manage_group.submit_success": "The group was created",
   "manage_group.tagline": "Groups connect you with others based on shared interests.",
-  "manage_group.update": "Update",
   "media_panel.empty_message": "No media found.",
   "media_panel.title": "Media",
   "mfa.confirm.success_message": "MFA confirmed",

From c2902b16ec66647363898455ccbab4b56f5e6f35 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 06:55:33 -0400
Subject: [PATCH 050/298] Fix dark mode animation

---
 app/soapbox/components/authorize-reject-buttons.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/components/authorize-reject-buttons.tsx b/app/soapbox/components/authorize-reject-buttons.tsx
index a785c31ea..a5fddc61a 100644
--- a/app/soapbox/components/authorize-reject-buttons.tsx
+++ b/app/soapbox/components/authorize-reject-buttons.tsx
@@ -165,7 +165,7 @@ const AuthorizeRejectButton: React.FC<IAuthorizeRejectButton> = ({ theme, icon,
           src={isLoading ? require('@tabler/icons/player-stop-filled.svg') : icon}
           onClick={action}
           theme='seamless'
-          className='h-10 w-10 items-center justify-center bg-gray-900'
+          className='h-10 w-10 items-center justify-center bg-white focus:!ring-0 dark:!bg-gray-900'
           iconClassName={clsx('h-6 w-6', {
             'text-primary-500': theme === 'primary',
             'text-danger-600': theme === 'danger',

From 11b86ecad6475ba6cb9dcd407cd3ffda8fa26578 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 06:57:32 -0400
Subject: [PATCH 051/298] Fix theme selector icon placement

Closes https://gitlab.com/soapbox-pub/soapbox/-/issues/1406
---
 app/soapbox/features/ui/components/theme-selector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/theme-selector.tsx b/app/soapbox/features/ui/components/theme-selector.tsx
index 6f35c9673..2532b49b7 100644
--- a/app/soapbox/features/ui/components/theme-selector.tsx
+++ b/app/soapbox/features/ui/components/theme-selector.tsx
@@ -45,7 +45,7 @@ const ThemeSelector: React.FC<IThemeSelector> = ({ value, onChange }) => {
         <Select
           onChange={handleChange}
           defaultValue={value}
-          className='pl-10'
+          className='!pl-10'
         >
           <option value='system'>{intl.formatMessage(messages.system)}</option>
           <option value='light'>{intl.formatMessage(messages.light)}</option>

From a486b317d453da5e88175e780c773b8122946a38 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 08:11:03 -0400
Subject: [PATCH 052/298] Fetch account and relationship with entity store

---
 app/soapbox/entity-store/entities.ts          |  1 +
 app/soapbox/entity-store/hooks/useEntity.ts   |  2 +-
 .../components/group-member-list-item.tsx     | 35 +++++++++++--------
 app/soapbox/features/group/group-members.tsx  |  4 +--
 .../components/placeholder-account.tsx        |  2 +-
 .../components/placeholder-display-name.tsx   |  2 +-
 app/soapbox/hooks/api/index.ts                | 12 ++++++-
 app/soapbox/hooks/api/useAccount.ts           | 26 ++++++++++++++
 app/soapbox/hooks/api/useRelationships.ts     | 22 ++++++++++++
 app/soapbox/hooks/useLoading.ts               |  4 +--
 10 files changed, 87 insertions(+), 23 deletions(-)
 create mode 100644 app/soapbox/hooks/api/useAccount.ts
 create mode 100644 app/soapbox/hooks/api/useRelationships.ts

diff --git a/app/soapbox/entity-store/entities.ts b/app/soapbox/entity-store/entities.ts
index 44f2db3c9..7f9f84e2a 100644
--- a/app/soapbox/entity-store/entities.ts
+++ b/app/soapbox/entity-store/entities.ts
@@ -3,4 +3,5 @@ export enum Entities {
   GROUPS = 'Groups',
   GROUP_RELATIONSHIPS = 'GroupRelationships',
   GROUP_MEMBERSHIPS = 'GroupMemberships',
+  RELATIONSHIPS = 'Relationships'
 }
\ No newline at end of file
diff --git a/app/soapbox/entity-store/hooks/useEntity.ts b/app/soapbox/entity-store/hooks/useEntity.ts
index f30c9a18a..37027f73f 100644
--- a/app/soapbox/entity-store/hooks/useEntity.ts
+++ b/app/soapbox/entity-store/hooks/useEntity.ts
@@ -21,7 +21,7 @@ function useEntity<TEntity extends Entity>(
   entityFn: EntityFn<void>,
   opts: UseEntityOpts<TEntity> = {},
 ) {
-  const [isFetching, setPromise] = useLoading();
+  const [isFetching, setPromise] = useLoading(true);
   const dispatch = useAppDispatch();
 
   const [entityType, entityId] = path;
diff --git a/app/soapbox/features/group/components/group-member-list-item.tsx b/app/soapbox/features/group/components/group-member-list-item.tsx
index 10ad4e0cb..4fa3ccb7a 100644
--- a/app/soapbox/features/group/components/group-member-list-item.tsx
+++ b/app/soapbox/features/group/components/group-member-list-item.tsx
@@ -9,13 +9,14 @@ import DropdownMenu from 'soapbox/components/dropdown-menu/dropdown-menu';
 import { HStack } from 'soapbox/components/ui';
 import { deleteEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
-import { useAccount, useAppDispatch, useFeatures } from 'soapbox/hooks';
-import { useBlockGroupMember, useDemoteGroupMember, usePromoteGroupMember } from 'soapbox/hooks/api';
+import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder-account';
+import { useAppDispatch, useFeatures } from 'soapbox/hooks';
+import { useAccount, useBlockGroupMember, useDemoteGroupMember, usePromoteGroupMember } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
 import type { Menu as IMenu } from 'soapbox/components/dropdown-menu';
-import type { Account as AccountEntity, Group, GroupMember } from 'soapbox/types/entities';
+import type { Group, GroupMember } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   blockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban' },
@@ -51,7 +52,7 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   const promoteGroupMember = usePromoteGroupMember(group, member);
   const demoteGroupMember = useDemoteGroupMember(group, member);
 
-  const account = useAccount(member.account.id) as AccountEntity;
+  const { account, isLoading } = useAccount(member.account.id);
 
   // Current user role
   const isCurrentUserOwner = group.relationship?.role === GroupRoles.OWNER;
@@ -64,10 +65,10 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
 
   const handleKickFromGroup = () => {
     dispatch(openModal('CONFIRM', {
-      message: intl.formatMessage(messages.kickFromGroupMessage, { name: account.username }),
+      message: intl.formatMessage(messages.kickFromGroupMessage, { name: account?.username }),
       confirm: intl.formatMessage(messages.kickConfirm),
-      onConfirm: () => dispatch(groupKick(group.id, account.id)).then(() =>
-        toast.success(intl.formatMessage(messages.kicked, { name: account.acct })),
+      onConfirm: () => dispatch(groupKick(group.id, account?.id as string)).then(() =>
+        toast.success(intl.formatMessage(messages.kicked, { name: account?.acct })),
       ),
     }));
   };
@@ -75,13 +76,13 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   const handleBlockFromGroup = () => {
     dispatch(openModal('CONFIRM', {
       heading: intl.formatMessage(messages.blockFromGroupHeading),
-      message: intl.formatMessage(messages.blockFromGroupMessage, { name: account.username }),
+      message: intl.formatMessage(messages.blockFromGroupMessage, { name: account?.username }),
       confirm: intl.formatMessage(messages.blockConfirm),
       onConfirm: () => {
         blockGroupMember({ account_ids: [member.account.id] }, {
           onSuccess() {
             dispatch(deleteEntities([member.id], Entities.GROUP_MEMBERSHIPS));
-            toast.success(intl.formatMessage(messages.blocked, { name: account.acct }));
+            toast.success(intl.formatMessage(messages.blocked, { name: account?.acct }));
           },
         });
       },
@@ -91,14 +92,14 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   const handleAdminAssignment = () => {
     dispatch(openModal('CONFIRM', {
       heading: intl.formatMessage(messages.promoteConfirm),
-      message: intl.formatMessage(messages.promoteConfirmMessage, { name: account.username }),
+      message: intl.formatMessage(messages.promoteConfirmMessage, { name: account?.username }),
       confirm: intl.formatMessage(messages.promoteConfirm),
       confirmationTheme: 'primary',
       onConfirm: () => {
-        promoteGroupMember({ role: GroupRoles.ADMIN, account_ids: [account.id] }, {
+        promoteGroupMember({ role: GroupRoles.ADMIN, account_ids: [account?.id] }, {
           onSuccess() {
             toast.success(
-              intl.formatMessage(messages.promotedToAdmin, { name: account.acct }),
+              intl.formatMessage(messages.promotedToAdmin, { name: account?.acct }),
             );
           },
         });
@@ -107,9 +108,9 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   };
 
   const handleUserAssignment = () => {
-    demoteGroupMember({ role: GroupRoles.USER, account_ids: [account.id] }, {
+    demoteGroupMember({ role: GroupRoles.USER, account_ids: [account?.id] }, {
       onSuccess() {
-        toast.success(intl.formatMessage(messages.demotedToUser, { name: account.acct }));
+        toast.success(intl.formatMessage(messages.demotedToUser, { name: account?.acct }));
       },
     });
   };
@@ -160,7 +161,11 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
     }
 
     return items;
-  }, [group, account]);
+  }, [group, account?.id]);
+
+  if (isLoading) {
+    return <PlaceholderAccount />;
+  }
 
   return (
     <HStack alignItems='center' justifyContent='between'>
diff --git a/app/soapbox/features/group/group-members.tsx b/app/soapbox/features/group/group-members.tsx
index 2facf912f..be4185d2b 100644
--- a/app/soapbox/features/group/group-members.tsx
+++ b/app/soapbox/features/group/group-members.tsx
@@ -53,11 +53,11 @@ const GroupMembers: React.FC<IGroupMembers> = (props) => {
           </div>
         )}
       >
-        {members.map((member) => (
+        {members.map((member, idx) => (
           <GroupMemberListItem
             group={group as Group}
             member={member}
-            key={member.account.id}
+            key={idx}
           />
         ))}
       </ScrollableList>
diff --git a/app/soapbox/features/placeholder/components/placeholder-account.tsx b/app/soapbox/features/placeholder/components/placeholder-account.tsx
index 28f04adb4..c887903fd 100644
--- a/app/soapbox/features/placeholder/components/placeholder-account.tsx
+++ b/app/soapbox/features/placeholder/components/placeholder-account.tsx
@@ -18,4 +18,4 @@ const PlaceholderAccount: React.FC = () => (
   </HStack>
 );
 
-export default PlaceholderAccount;
+export default React.memo(PlaceholderAccount);
diff --git a/app/soapbox/features/placeholder/components/placeholder-display-name.tsx b/app/soapbox/features/placeholder/components/placeholder-display-name.tsx
index e09e73439..3a2e0e641 100644
--- a/app/soapbox/features/placeholder/components/placeholder-display-name.tsx
+++ b/app/soapbox/features/placeholder/components/placeholder-display-name.tsx
@@ -21,4 +21,4 @@ const PlaceholderDisplayName: React.FC<IPlaceholderDisplayName> = ({ minLength,
   );
 };
 
-export default PlaceholderDisplayName;
+export default React.memo(PlaceholderDisplayName);
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index f3bd400e1..f3addf56b 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -1,3 +1,8 @@
+/**
+ * Accounts
+ */
+export { useAccount } from './useAccount';
+
 /**
  * Groups
  */
@@ -11,4 +16,9 @@ export { useGroupValidation } from './groups/useGroupValidation';
 export { useJoinGroup } from './groups/useJoinGroup';
 export { useLeaveGroup } from './groups/useLeaveGroup';
 export { usePromoteGroupMember } from './groups/usePromoteGroupMember';
-export { useUpdateGroup } from './groups/useUpdateGroup';
\ No newline at end of file
+export { useUpdateGroup } from './groups/useUpdateGroup';
+
+/**
+ * Relationships
+ */
+export { useRelationships } from './useRelationships';
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/useAccount.ts b/app/soapbox/hooks/api/useAccount.ts
new file mode 100644
index 000000000..a222d8de4
--- /dev/null
+++ b/app/soapbox/hooks/api/useAccount.ts
@@ -0,0 +1,26 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { type Account, accountSchema } from 'soapbox/schemas';
+
+import { useApi } from '../useApi';
+
+import { useRelationships } from './useRelationships';
+
+function useAccount(id: string) {
+  const api = useApi();
+
+  const { entity: account, ...result } = useEntity<Account>(
+    [Entities.ACCOUNTS, id],
+    () => api.get(`/api/v1/accounts/${id}`),
+    { schema: accountSchema },
+  );
+  const { relationships, isLoading } = useRelationships([account?.id as string]);
+
+  return {
+    ...result,
+    isLoading: result.isLoading || isLoading,
+    account: account ? { ...account, relationship: relationships[0] || null } : undefined,
+  };
+}
+
+export { useAccount };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/useRelationships.ts b/app/soapbox/hooks/api/useRelationships.ts
new file mode 100644
index 000000000..fde5f1017
--- /dev/null
+++ b/app/soapbox/hooks/api/useRelationships.ts
@@ -0,0 +1,22 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { type Relationship, relationshipSchema } from 'soapbox/schemas';
+
+import { useApi } from '../useApi';
+
+function useRelationships(ids: string[]) {
+  const api = useApi();
+
+  const { entities: relationships, ...result } = useEntities<Relationship>(
+    [Entities.RELATIONSHIPS],
+    () => api.get(`/api/v1/accounts/relationships?${ids.map(id => `id[]=${id}`).join('&')}`),
+    { schema: relationshipSchema, enabled: ids.filter(Boolean).length > 0 },
+  );
+
+  return {
+    ...result,
+    relationships,
+  };
+}
+
+export { useRelationships };
\ No newline at end of file
diff --git a/app/soapbox/hooks/useLoading.ts b/app/soapbox/hooks/useLoading.ts
index 51f15e521..a8c56c0f6 100644
--- a/app/soapbox/hooks/useLoading.ts
+++ b/app/soapbox/hooks/useLoading.ts
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
-function useLoading() {
-  const [isLoading, setIsLoading] = useState<boolean>(false);
+function useLoading(initialState: boolean = false) {
+  const [isLoading, setIsLoading] = useState<boolean>(initialState);
 
   function setPromise<T>(promise: Promise<T>) {
     setIsLoading(true);

From 7ef2220405603f637491d9297f30fceec248fdd3 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 08:13:23 -0400
Subject: [PATCH 053/298] Revert change to key

---
 app/soapbox/features/group/group-members.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/group/group-members.tsx b/app/soapbox/features/group/group-members.tsx
index be4185d2b..2facf912f 100644
--- a/app/soapbox/features/group/group-members.tsx
+++ b/app/soapbox/features/group/group-members.tsx
@@ -53,11 +53,11 @@ const GroupMembers: React.FC<IGroupMembers> = (props) => {
           </div>
         )}
       >
-        {members.map((member, idx) => (
+        {members.map((member) => (
           <GroupMemberListItem
             group={group as Group}
             member={member}
-            key={idx}
+            key={member.account.id}
           />
         ))}
       </ScrollableList>

From 8cb05403619ead8bbf31196bb660cd0daa6d0c12 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 11:45:27 -0400
Subject: [PATCH 054/298] Fix infinite scroll bug with Group Search

---
 .../components/discover/search/search.tsx     |  4 +-
 app/soapbox/queries/groups/search.ts          | 67 -------------------
 2 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 app/soapbox/queries/groups/search.ts

diff --git a/app/soapbox/features/groups/components/discover/search/search.tsx b/app/soapbox/features/groups/components/discover/search/search.tsx
index 4e3308353..647f10fb5 100644
--- a/app/soapbox/features/groups/components/discover/search/search.tsx
+++ b/app/soapbox/features/groups/components/discover/search/search.tsx
@@ -26,7 +26,7 @@ export default (props: Props) => {
   const debouncedValueToSave = debounce(searchValue as string, 1000);
 
   const groupSearchResult = useGroupSearch(debouncedValue);
-  const { groups, isFetching, isFetched, isError } = groupSearchResult;
+  const { groups, isLoading, isFetched, isError } = groupSearchResult;
 
   const hasSearchResults = isFetched && groups.length > 0;
   const hasNoSearchResults = isFetched && groups.length === 0;
@@ -37,7 +37,7 @@ export default (props: Props) => {
     }
   }, [debouncedValueToSave]);
 
-  if (isFetching) {
+  if (isLoading) {
     return (
       <Stack space={4}>
         <PlaceholderGroupSearch />
diff --git a/app/soapbox/queries/groups/search.ts b/app/soapbox/queries/groups/search.ts
deleted file mode 100644
index 3da166cc2..000000000
--- a/app/soapbox/queries/groups/search.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useInfiniteQuery } from '@tanstack/react-query';
-
-import { getNextLink } from 'soapbox/api';
-import { useApi, useFeatures } from 'soapbox/hooks';
-import { normalizeGroup } from 'soapbox/normalizers';
-import { Group } from 'soapbox/types/entities';
-import { flattenPages, PaginatedResult } from 'soapbox/utils/queries';
-
-const GroupSearchKeys = {
-  search: (query?: string) => query ? ['groups', 'search', query] : ['groups', 'search'] as const,
-};
-
-type PageParam = {
-  link: string
-}
-
-const useGroupSearch = (search?: string) => {
-  const api = useApi();
-  const features = useFeatures();
-
-  const getSearchResults = async (pageParam: PageParam): Promise<PaginatedResult<Group>> => {
-    const nextPageLink = pageParam?.link;
-    const uri = nextPageLink || '/api/v1/groups/search';
-    const response = await api.get<Group[]>(uri, {
-      params: search ? {
-        q: search,
-      } : undefined,
-    });
-    const { data } = response;
-
-    const link = getNextLink(response);
-    const hasMore = !!link;
-    const result = data.map(normalizeGroup);
-
-    return {
-      result,
-      hasMore,
-      link,
-    };
-  };
-
-  const queryInfo = useInfiniteQuery(
-    GroupSearchKeys.search(search),
-    ({ pageParam }) => getSearchResults(pageParam),
-    {
-      keepPreviousData: true,
-      enabled: features.groups && !!search,
-      getNextPageParam: (config) => {
-        if (config.hasMore) {
-          return { link: config.link };
-        }
-
-        return undefined;
-      },
-    });
-
-  const data = flattenPages(queryInfo.data);
-
-  return {
-    ...queryInfo,
-    groups: data || [],
-  };
-};
-
-export {
-  useGroupSearch,
-};

From 909f2941654784ffacecde593607f25205d5f321 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 13:13:59 -0400
Subject: [PATCH 055/298] Add 'path' to dep list

---
 app/soapbox/entity-store/hooks/useEntities.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/entity-store/hooks/useEntities.ts b/app/soapbox/entity-store/hooks/useEntities.ts
index f2e84c93e..c1bf47e84 100644
--- a/app/soapbox/entity-store/hooks/useEntities.ts
+++ b/app/soapbox/entity-store/hooks/useEntities.ts
@@ -112,7 +112,7 @@ function useEntities<TEntity extends Entity>(
     if (isInvalid || isUnset || isStale) {
       fetchEntities();
     }
-  }, [isEnabled]);
+  }, [isEnabled, ...path]);
 
   return {
     entities,

From e78bbf4e19cf4041340f8c63eedf398686285be6 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 06:29:09 -0400
Subject: [PATCH 056/298] Allow Admins to manage/leave Group

---
 .../components/ui/icon-button/icon-button.tsx |  8 ++-
 app/soapbox/components/ui/tag-input/tag.tsx   |  1 -
 .../__tests__/group-options-button.test.tsx   |  5 +-
 .../group/components/group-action-button.tsx  |  3 +-
 .../group/components/group-options-button.tsx | 53 ++++++++++++++++---
 app/soapbox/features/group/manage-group.tsx   |  4 +-
 .../public-layout/components/header.tsx       |  1 -
 app/soapbox/locales/en.json                   |  5 +-
 8 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/app/soapbox/components/ui/icon-button/icon-button.tsx b/app/soapbox/components/ui/icon-button/icon-button.tsx
index ad9d6a517..1ece137df 100644
--- a/app/soapbox/components/ui/icon-button/icon-button.tsx
+++ b/app/soapbox/components/ui/icon-button/icon-button.tsx
@@ -11,24 +11,22 @@ interface IIconButton extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   src: string
   /** Text to display next ot the button. */
   text?: string
-  /** Don't render a background behind the icon. */
-  transparent?: boolean
   /** Predefined styles to display for the button. */
-  theme?: 'seamless' | 'outlined' | 'secondary'
+  theme?: 'seamless' | 'outlined' | 'secondary' | 'transparent'
   /** Override the data-testid */
   'data-testid'?: string
 }
 
 /** A clickable icon. */
 const IconButton = React.forwardRef((props: IIconButton, ref: React.ForwardedRef<HTMLButtonElement>): JSX.Element => {
-  const { src, className, iconClassName, text, transparent = false, theme = 'seamless', ...filteredProps } = props;
+  const { src, className, iconClassName, text, theme = 'seamless', ...filteredProps } = props;
 
   return (
     <button
       ref={ref}
       type='button'
       className={clsx('flex items-center space-x-2 rounded-full p-1 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:ring-offset-0', {
-        'bg-white dark:bg-transparent': !transparent,
+        'bg-white dark:bg-transparent': theme === 'seamless',
         'border border-solid bg-transparent border-gray-400 dark:border-gray-800 hover:border-primary-300 dark:hover:border-primary-700 focus:border-primary-500 text-gray-900 dark:text-gray-100 focus:ring-primary-500': theme === 'outlined',
         'border-transparent bg-primary-100 dark:bg-primary-800 hover:bg-primary-50 dark:hover:bg-primary-700 focus:bg-primary-100 dark:focus:bg-primary-800 text-primary-500 dark:text-primary-200': theme === 'secondary',
         'opacity-50': filteredProps.disabled,
diff --git a/app/soapbox/components/ui/tag-input/tag.tsx b/app/soapbox/components/ui/tag-input/tag.tsx
index 5587d3927..e18c2af58 100644
--- a/app/soapbox/components/ui/tag-input/tag.tsx
+++ b/app/soapbox/components/ui/tag-input/tag.tsx
@@ -20,7 +20,6 @@ const Tag: React.FC<ITag> = ({ tag, onDelete }) => {
         iconClassName='h-4 w-4'
         src={require('@tabler/icons/x.svg')}
         onClick={() => onDelete(tag)}
-        transparent
       />
     </div>
   );
diff --git a/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx b/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx
index 4d7779799..8704b9351 100644
--- a/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx
+++ b/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx
@@ -40,10 +40,11 @@ describe('<GroupOptionsButton />', () => {
       });
     });
 
-    it('should render null', () => {
+    it('should render one option for leaving the group', () => {
       render(<GroupOptionsButton group={group} />);
 
-      expect(screen.queryAllByTestId('dropdown-menu-button')).toHaveLength(0);
+      // Leave group option only
+      expect(screen.queryAllByTestId('dropdown-menu-button')).toHaveLength(1);
     });
   });
 
diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index 3874d4ae9..f7bf14110 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -36,6 +36,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
   const isRequested = group.relationship?.requested;
   const isNonMember = !group.relationship?.member && !isRequested;
   const isOwner = group.relationship?.role === GroupRoles.OWNER;
+  const isAdmin = group.relationship?.role === GroupRoles.ADMIN;
   const isBlocked = group.relationship?.blocked_by;
 
   const onJoinGroup = () => joinGroup.mutate({}, {
@@ -73,7 +74,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
     return null;
   }
 
-  if (isOwner) {
+  if (isOwner || isAdmin) {
     return (
       <Button
         theme='secondary'
diff --git a/app/soapbox/features/group/components/group-options-button.tsx b/app/soapbox/features/group/components/group-options-button.tsx
index b6e83ae06..d3f877292 100644
--- a/app/soapbox/features/group/components/group-options-button.tsx
+++ b/app/soapbox/features/group/components/group-options-button.tsx
@@ -1,15 +1,23 @@
 import React, { useMemo } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
+import { openModal } from 'soapbox/actions/modals';
 import { initReport, ReportableEntities } from 'soapbox/actions/reports';
 import DropdownMenu, { Menu } from 'soapbox/components/dropdown-menu';
 import { IconButton } from 'soapbox/components/ui';
 import { useAppDispatch, useOwnAccount } from 'soapbox/hooks';
+import { useLeaveGroup } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
+import toast from 'soapbox/toast';
 
 import type { Account, Group } from 'soapbox/types/entities';
 
 const messages = defineMessages({
+  confirmationConfirm: { id: 'confirmations.leave_group.confirm', defaultMessage: 'Leave' },
+  confirmationHeading: { id: 'confirmations.leave_group.heading', defaultMessage: 'Leave group' },
+  confirmationMessage: { id: 'confirmations.leave_group.message', defaultMessage: 'You are about to leave the group. Do you want to continue?' },
+  leave: { id: 'group.leave.label', defaultMessage: 'Leave' },
+  leaveSuccess: { id: 'group.leave.success', defaultMessage: 'Left the group' },
   report: { id: 'group.report.label', defaultMessage: 'Report' },
 });
 
@@ -21,19 +29,48 @@ const GroupOptionsButton = ({ group }: IGroupActionButton) => {
   const account = useOwnAccount();
   const dispatch = useAppDispatch();
   const intl = useIntl();
+  const leaveGroup = useLeaveGroup(group);
 
   const isMember = group.relationship?.role === GroupRoles.USER;
+  const isAdmin = group.relationship?.role === GroupRoles.ADMIN;
   const isBlocked = group.relationship?.blocked_by;
 
-  const menu: Menu = useMemo(() => ([
-    {
-      text: intl.formatMessage(messages.report),
-      icon: require('@tabler/icons/flag.svg'),
-      action: () => dispatch(initReport(ReportableEntities.GROUP, account as Account, { group })),
-    },
-  ]), []);
+  const onLeaveGroup = () =>
+    dispatch(openModal('CONFIRM', {
+      heading: intl.formatMessage(messages.confirmationHeading),
+      message: intl.formatMessage(messages.confirmationMessage),
+      confirm: intl.formatMessage(messages.confirmationConfirm),
+      onConfirm: () => leaveGroup.mutate(group.relationship?.id as string, {
+        onSuccess() {
+          leaveGroup.invalidate();
+          toast.success(intl.formatMessage(messages.leaveSuccess));
+        },
+      }),
+    }));
 
-  if (isBlocked || !isMember || menu.length === 0) {
+  const menu: Menu = useMemo(() => {
+    const items = [];
+
+    if (isMember) {
+      items.push({
+        text: intl.formatMessage(messages.report),
+        icon: require('@tabler/icons/flag.svg'),
+        action: () => dispatch(initReport(ReportableEntities.GROUP, account as Account, { group })),
+      });
+    }
+
+    if (isAdmin) {
+      items.push({
+        text: intl.formatMessage(messages.leave),
+        icon: require('@tabler/icons/logout.svg'),
+        action: onLeaveGroup,
+      });
+    }
+
+    return items;
+  }, [isMember, isAdmin]);
+
+  if (isBlocked || menu.length === 0) {
     return null;
   }
 
diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 723bbb5ad..12dc0b11b 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -19,8 +19,8 @@ type RouteParams = { id: string };
 const messages = defineMessages({
   heading: { id: 'column.manage_group', defaultMessage: 'Manage group' },
   editGroup: { id: 'manage_group.edit_group', defaultMessage: 'Edit group' },
-  pendingRequests: { id: 'manage_group.pending_requests', defaultMessage: 'Pending requests' },
-  blockedMembers: { id: 'manage_group.blocked_members', defaultMessage: 'Banned members' },
+  pendingRequests: { id: 'manage_group.pending_requests', defaultMessage: 'Pending Requests' },
+  blockedMembers: { id: 'manage_group.blocked_members', defaultMessage: 'Banned Members' },
   deleteGroup: { id: 'manage_group.delete_group', defaultMessage: 'Delete group' },
   deleteConfirm: { id: 'confirmations.delete_group.confirm', defaultMessage: 'Delete' },
   deleteHeading: { id: 'confirmations.delete_group.heading', defaultMessage: 'Delete group' },
diff --git a/app/soapbox/features/public-layout/components/header.tsx b/app/soapbox/features/public-layout/components/header.tsx
index 64e273e26..caa5a3fa3 100644
--- a/app/soapbox/features/public-layout/components/header.tsx
+++ b/app/soapbox/features/public-layout/components/header.tsx
@@ -147,7 +147,6 @@ const Header = () => {
                     src={require('@tabler/icons/help.svg')}
                     className='cursor-pointer bg-transparent text-gray-700 hover:text-gray-800 dark:text-gray-600 dark:hover:text-gray-500'
                     iconClassName='h-5 w-5'
-                    transparent
                   />
                 </Tooltip>
               </Link>
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 2991449aa..35d157dbb 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -786,6 +786,7 @@
   "group.join.request_success": "Request sent to group owner",
   "group.join.success": "Group joined successfully!",
   "group.leave": "Leave Group",
+  "group.leave.label": "Leave",
   "group.leave.success": "Left the group",
   "group.manage": "Manage Group",
   "group.popover.action": "View Group",
@@ -933,7 +934,7 @@
   "login_external.errors.instance_fail": "The instance returned an error.",
   "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?",
   "login_form.header": "Sign In",
-  "manage_group.blocked_members": "Banned members",
+  "manage_group.blocked_members": "Banned Members",
   "manage_group.confirmation.copy": "Copy link",
   "manage_group.confirmation.info_1": "As the owner of this group, you can assign staff, delete posts and much more.",
   "manage_group.confirmation.info_2": "Post the group's first post and get the conversation started.",
@@ -954,7 +955,7 @@
   "manage_group.fields.name_placeholder": "Group Name",
   "manage_group.get_started": "Let’s get started!",
   "manage_group.next": "Next",
-  "manage_group.pending_requests": "Pending requests",
+  "manage_group.pending_requests": "Pending Requests",
   "manage_group.privacy.hint": "These settings cannot be changed later.",
   "manage_group.privacy.label": "Privacy settings",
   "manage_group.privacy.private.hint": "Discoverable. Users can join after their request is approved.",

From f20dade50be8bc133d7f303787a3992b565c431c Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 06:39:49 -0400
Subject: [PATCH 057/298] Update entity in store after canceling request

---
 .../group/components/group-action-button.tsx        | 10 +++++++---
 .../hooks/api/groups/useCancelMembershipRequest.ts  | 13 +++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index f7bf14110..45e8534b9 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -3,14 +3,14 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals';
 import { Button } from 'soapbox/components/ui';
-import { deleteEntities } from 'soapbox/entity-store/actions';
+import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useAppDispatch } from 'soapbox/hooks';
 import { useCancelMembershipRequest, useJoinGroup, useLeaveGroup } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
-import type { Group } from 'soapbox/types/entities';
+import type { Group, GroupRelationship } from 'soapbox/types/entities';
 
 interface IGroupActionButton {
   group: Group
@@ -66,7 +66,11 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
 
   const onCancelRequest = () => cancelRequest.mutate({}, {
     onSuccess() {
-      dispatch(deleteEntities([group.id], Entities.GROUP_RELATIONSHIPS));
+      const entity = {
+        ...group.relationship as GroupRelationship,
+        requested: false,
+      };
+      dispatch(importEntities([entity], Entities.GROUP_RELATIONSHIPS));
     },
   });
 
diff --git a/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts b/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts
index 3aad33f9c..c8b650dee 100644
--- a/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts
+++ b/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts
@@ -1,15 +1,16 @@
 import { Entities } from 'soapbox/entity-store/entities';
-import { useEntityActions } from 'soapbox/entity-store/hooks';
-import { useOwnAccount } from 'soapbox/hooks';
+import { useCreateEntity } from 'soapbox/entity-store/hooks';
+import { useApi, useOwnAccount } from 'soapbox/hooks';
 
-import type { Group, GroupRelationship } from 'soapbox/schemas';
+import type { Group } from 'soapbox/schemas';
 
 function useCancelMembershipRequest(group: Group) {
+  const api = useApi();
   const me = useOwnAccount();
 
-  const { createEntity, isLoading } = useEntityActions<GroupRelationship>(
-    [Entities.GROUP_RELATIONSHIPS, group.id],
-    { post: `/api/v1/groups/${group.id}/membership_requests/${me?.id}/reject` },
+  const { createEntity, isLoading } = useCreateEntity(
+    [Entities.GROUP_RELATIONSHIPS],
+    () => api.post(`/api/v1/groups/${group.id}/membership_requests/${me?.id}/reject`),
   );
 
   return {

From 3d1c0fa81351ff1a3cf31ff837384c47cb3594c6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 11:16:26 -0500
Subject: [PATCH 058/298] Fix groups index being updated when a new group is
 created

---
 app/soapbox/entity-store/utils.ts              | 2 +-
 app/soapbox/hooks/api/groups/useCreateGroup.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/entity-store/utils.ts b/app/soapbox/entity-store/utils.ts
index e108639c2..3f65f1ee0 100644
--- a/app/soapbox/entity-store/utils.ts
+++ b/app/soapbox/entity-store/utils.ts
@@ -11,7 +11,7 @@ const updateStore = (store: EntityStore, entities: Entity[]): EntityStore => {
 /** Update the list with new entity IDs. */
 const updateList = (list: EntityList, entities: Entity[]): EntityList => {
   const newIds = entities.map(entity => entity.id);
-  const ids = new Set([...Array.from(list.ids), ...newIds]);
+  const ids = new Set([...newIds, ...Array.from(list.ids)]);
 
   if (typeof list.state.totalCount === 'number') {
     const sizeDiff = ids.size - list.ids.size;
diff --git a/app/soapbox/hooks/api/groups/useCreateGroup.ts b/app/soapbox/hooks/api/groups/useCreateGroup.ts
index e2c54971c..302374946 100644
--- a/app/soapbox/hooks/api/groups/useCreateGroup.ts
+++ b/app/soapbox/hooks/api/groups/useCreateGroup.ts
@@ -16,7 +16,7 @@ interface CreateGroupParams {
 function useCreateGroup() {
   const api = useApi();
 
-  const { createEntity, ...rest } = useCreateEntity([Entities.GROUPS], (params: CreateGroupParams) => {
+  const { createEntity, ...rest } = useCreateEntity([Entities.GROUPS, 'search', ''], (params: CreateGroupParams) => {
     return api.post('/api/v1/groups', params, {
       headers: {
         'Content-Type': 'multipart/form-data',

From 2c3006df935747516ab118177f193ace2e2d2abd Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 11:50:37 -0500
Subject: [PATCH 059/298] CreateGroupModal: toast on error

---
 .../modals/manage-group-modal/create-group-modal.tsx   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
index 2d4bea51a..bbeb2d43e 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import React, { useMemo, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
@@ -5,6 +6,7 @@ import { Modal, Stack } from 'soapbox/components/ui';
 import { useDebounce } from 'soapbox/hooks';
 import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/hooks/api';
 import { type Group } from 'soapbox/schemas';
+import toast from 'soapbox/toast';
 
 import ConfirmationStep from './steps/confirmation-step';
 import DetailsStep from './steps/details-step';
@@ -65,6 +67,14 @@ const CreateGroupModal: React.FC<ICreateGroupModal> = ({ onClose }) => {
             setCurrentStep(Steps.THREE);
             setGroup(group);
           },
+          onError(error) {
+            if (error instanceof AxiosError) {
+              const msg = error.response?.data.error;
+              if (typeof msg === 'string') {
+                toast.error(msg);
+              }
+            }
+          },
         });
         break;
       case Steps.THREE:

From 5fa8a21403ddb7a6adca6dfdba62dc5a2f38ee67 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 14:05:08 -0400
Subject: [PATCH 060/298] Cap Group Admins at 5

---
 app/soapbox/components/ui/toast/toast.tsx     | 59 +++++++++++--------
 .../components/group-member-list-item.tsx     | 14 ++++-
 app/soapbox/features/group/group-members.tsx  | 10 ++++
 app/soapbox/hooks/api/useGroupMembers.ts      |  3 +-
 app/soapbox/toast.tsx                         |  1 +
 app/soapbox/utils/features.ts                 |  5 ++
 6 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/app/soapbox/components/ui/toast/toast.tsx b/app/soapbox/components/ui/toast/toast.tsx
index 38bda317e..94fc44da1 100644
--- a/app/soapbox/components/ui/toast/toast.tsx
+++ b/app/soapbox/components/ui/toast/toast.tsx
@@ -8,6 +8,8 @@ import { ToastText, ToastType } from 'soapbox/toast';
 
 import HStack from '../hstack/hstack';
 import Icon from '../icon/icon';
+import Stack from '../stack/stack';
+import Text from '../text/text';
 
 const renderText = (text: ToastText) => {
   if (typeof text === 'string') {
@@ -24,13 +26,14 @@ interface IToast {
   action?(): void
   actionLink?: string
   actionLabel?: ToastText
+  summary?: string
 }
 
 /**
  * Customizable Toasts for in-app notifications.
  */
 const Toast = (props: IToast) => {
-  const { t, message, type, action, actionLink, actionLabel } = props;
+  const { t, message, type, action, actionLink, actionLabel, summary } = props;
 
   const dismissToast = () => toast.dismiss(t.id);
 
@@ -109,35 +112,41 @@ const Toast = (props: IToast) => {
         })
       }
     >
-      <HStack space={4} alignItems='start'>
-        <HStack space={3} justifyContent='between' alignItems='start' className='w-0 flex-1'>
-          <HStack space={3} alignItems='start' className='w-0 flex-1'>
-            <div className='shrink-0'>
-              {renderIcon()}
-            </div>
+      <Stack space={2}>
+        <HStack space={4} alignItems='start'>
+          <HStack space={3} justifyContent='between' alignItems='start' className='w-0 flex-1'>
+            <HStack space={3} alignItems='start' className='w-0 flex-1'>
+              <div className='shrink-0'>
+                {renderIcon()}
+              </div>
 
-            <p className='pt-0.5 text-sm text-gray-900 dark:text-gray-100' data-testid='toast-message'>
-              {renderText(message)}
-            </p>
+              <Text size='sm' data-testid='toast-message' className='pt-0.5'>
+                {renderText(message)}
+              </Text>
+            </HStack>
+
+            {/* Action */}
+            {renderAction()}
           </HStack>
 
-          {/* Action */}
-          {renderAction()}
+          {/* Dismiss Button */}
+          <div className='flex shrink-0 pt-0.5'>
+            <button
+              type='button'
+              className='inline-flex rounded-md text-gray-600 hover:text-gray-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:text-gray-600 dark:hover:text-gray-500'
+              onClick={dismissToast}
+              data-testid='toast-dismiss'
+            >
+              <span className='sr-only'>Close</span>
+              <Icon src={require('@tabler/icons/x.svg')} className='h-5 w-5' />
+            </button>
+          </div>
         </HStack>
 
-        {/* Dismiss Button */}
-        <div className='flex shrink-0 pt-0.5'>
-          <button
-            type='button'
-            className='inline-flex rounded-md text-gray-600 hover:text-gray-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:text-gray-600 dark:hover:text-gray-500'
-            onClick={dismissToast}
-            data-testid='toast-dismiss'
-          >
-            <span className='sr-only'>Close</span>
-            <Icon src={require('@tabler/icons/x.svg')} className='h-5 w-5' />
-          </button>
-        </div>
-      </HStack>
+        {summary ? (
+          <Text theme='muted' size='sm'>{summary}</Text>
+        ) : null}
+      </Stack>
     </div>
   );
 };
diff --git a/app/soapbox/features/group/components/group-member-list-item.tsx b/app/soapbox/features/group/components/group-member-list-item.tsx
index 4fa3ccb7a..c88f4e58d 100644
--- a/app/soapbox/features/group/components/group-member-list-item.tsx
+++ b/app/soapbox/features/group/components/group-member-list-item.tsx
@@ -15,10 +15,14 @@ import { useAccount, useBlockGroupMember, useDemoteGroupMember, usePromoteGroupM
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
+import { MAX_ADMIN_COUNT } from '../group-members';
+
 import type { Menu as IMenu } from 'soapbox/components/dropdown-menu';
 import type { Group, GroupMember } from 'soapbox/types/entities';
 
 const messages = defineMessages({
+  adminLimitTitle: { id: 'group.member.admin.limit.title', defaultMessage: 'Admin limit reached' },
+  adminLimitSummary: { id: 'group.member.admin.limit.summary', defaultMessage: 'You can assign up to {count} admins for the group at this time.' },
   blockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban' },
   blockFromGroupHeading: { id: 'confirmations.block_from_group.heading', defaultMessage: 'Ban From Group' },
   blockFromGroupMessage: { id: 'confirmations.block_from_group.message', defaultMessage: 'Are you sure you want to ban @{name} from the group?' },
@@ -39,10 +43,11 @@ const messages = defineMessages({
 interface IGroupMemberListItem {
   member: GroupMember
   group: Group
+  canPromoteToAdmin: boolean
 }
 
 const GroupMemberListItem = (props: IGroupMemberListItem) => {
-  const { member, group } = props;
+  const { canPromoteToAdmin, member, group } = props;
 
   const dispatch = useAppDispatch();
   const features = useFeatures();
@@ -90,6 +95,13 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   };
 
   const handleAdminAssignment = () => {
+    if (!canPromoteToAdmin) {
+      toast.error(intl.formatMessage(messages.adminLimitTitle), {
+        summary: intl.formatMessage(messages.adminLimitSummary, { count: MAX_ADMIN_COUNT }),
+      });
+      return;
+    }
+
     dispatch(openModal('CONFIRM', {
       heading: intl.formatMessage(messages.promoteConfirm),
       message: intl.formatMessage(messages.promoteConfirmMessage, { name: account?.username }),
diff --git a/app/soapbox/features/group/group-members.tsx b/app/soapbox/features/group/group-members.tsx
index 2facf912f..a3a790a62 100644
--- a/app/soapbox/features/group/group-members.tsx
+++ b/app/soapbox/features/group/group-members.tsx
@@ -3,6 +3,7 @@ import React, { useMemo } from 'react';
 
 import { PendingItemsRow } from 'soapbox/components/pending-items-row';
 import ScrollableList from 'soapbox/components/scrollable-list';
+import { useFeatures } from 'soapbox/hooks';
 import { useGroup } from 'soapbox/hooks/api';
 import { useGroupMembershipRequests } from 'soapbox/hooks/api/groups/useGroupMembershipRequests';
 import { useGroupMembers } from 'soapbox/hooks/api/useGroupMembers';
@@ -18,9 +19,13 @@ interface IGroupMembers {
   params: { id: string }
 }
 
+export const MAX_ADMIN_COUNT = 5;
+
 const GroupMembers: React.FC<IGroupMembers> = (props) => {
   const groupId = props.params.id;
 
+  const features = useFeatures();
+
   const { group, isFetching: isFetchingGroup } = useGroup(groupId);
   const { groupMembers: owners, isFetching: isFetchingOwners } = useGroupMembers(groupId, GroupRoles.OWNER);
   const { groupMembers: admins, isFetching: isFetchingAdmins } = useGroupMembers(groupId, GroupRoles.ADMIN);
@@ -35,6 +40,10 @@ const GroupMembers: React.FC<IGroupMembers> = (props) => {
     ...users,
   ], [owners, admins, users]);
 
+  const canPromoteToAdmin = features.groupsAdminMax
+    ? members.filter((member) => member.role === GroupRoles.ADMIN).length < MAX_ADMIN_COUNT
+    : true;
+
   return (
     <>
       <ScrollableList
@@ -58,6 +67,7 @@ const GroupMembers: React.FC<IGroupMembers> = (props) => {
             group={group as Group}
             member={member}
             key={member.account.id}
+            canPromoteToAdmin={canPromoteToAdmin}
           />
         ))}
       </ScrollableList>
diff --git a/app/soapbox/hooks/api/useGroupMembers.ts b/app/soapbox/hooks/api/useGroupMembers.ts
index 669f1c082..3a1c99af5 100644
--- a/app/soapbox/hooks/api/useGroupMembers.ts
+++ b/app/soapbox/hooks/api/useGroupMembers.ts
@@ -1,10 +1,11 @@
 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 '../useApi';
 
-function useGroupMembers(groupId: string, role: string) {
+function useGroupMembers(groupId: string, role: GroupRoles) {
   const api = useApi();
 
   const { entities, ...result } = useEntities<GroupMember>(
diff --git a/app/soapbox/toast.tsx b/app/soapbox/toast.tsx
index 6095737f4..820b68b86 100644
--- a/app/soapbox/toast.tsx
+++ b/app/soapbox/toast.tsx
@@ -14,6 +14,7 @@ interface IToastOptions {
   actionLink?: string
   actionLabel?: ToastText
   duration?: number
+  summary?: string
 }
 
 const DEFAULT_DURATION = 4000;
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 8558e3b9d..afbece3b4 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -529,6 +529,11 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     groups: v.build === UNRELEASED,
 
+    /**
+     * Cap # of Group Admins to 5
+     */
+    groupsAdminMax: v.software === TRUTHSOCIAL,
+
     /**
      * Can see trending/suggested Groups.
      */

From 2211c6ec671a2be006de972452c6e3a71c5fc6ce Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 14:06:54 -0400
Subject: [PATCH 061/298] Use medium weight if summary is present

---
 app/soapbox/components/ui/toast/toast.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/components/ui/toast/toast.tsx b/app/soapbox/components/ui/toast/toast.tsx
index 94fc44da1..ce6847ced 100644
--- a/app/soapbox/components/ui/toast/toast.tsx
+++ b/app/soapbox/components/ui/toast/toast.tsx
@@ -120,7 +120,12 @@ const Toast = (props: IToast) => {
                 {renderIcon()}
               </div>
 
-              <Text size='sm' data-testid='toast-message' className='pt-0.5'>
+              <Text
+                size='sm'
+                data-testid='toast-message'
+                className='pt-0.5'
+                weight={typeof summary === 'undefined' ? 'normal' : 'medium'}
+              >
                 {renderText(message)}
               </Text>
             </HStack>

From 880e63f2ec06bb10d5c9f9c41bd2031f0adf8201 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 13:42:15 -0500
Subject: [PATCH 062/298] Streamfield: remove plus icon from button, adjust X
 icon color

---
 app/soapbox/components/ui/streamfield/streamfield.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/soapbox/components/ui/streamfield/streamfield.tsx b/app/soapbox/components/ui/streamfield/streamfield.tsx
index 5c436e70b..fadcce46b 100644
--- a/app/soapbox/components/ui/streamfield/streamfield.tsx
+++ b/app/soapbox/components/ui/streamfield/streamfield.tsx
@@ -76,7 +76,7 @@ const Streamfield: React.FC<IStreamfield> = ({
               {values.length > minItems && onRemoveItem && (
                 <IconButton
                   iconClassName='h-4 w-4'
-                  className='bg-transparent text-gray-400 hover:text-gray-600'
+                  className='bg-transparent text-gray-600 hover:text-gray-600'
                   src={require('@tabler/icons/x.svg')}
                   onClick={() => onRemoveItem(i)}
                   title={intl.formatMessage(messages.remove)}
@@ -89,7 +89,6 @@ const Streamfield: React.FC<IStreamfield> = ({
 
       {onAddItem && (
         <Button
-          icon={require('@tabler/icons/plus.svg')}
           onClick={onAddItem}
           disabled={values.length >= maxItems}
           theme='secondary'

From 914ed6fe9c1ebbd48bafb7cca9caa953a16d6e00 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 14:10:20 -0500
Subject: [PATCH 063/298] CreateGroupModal: allow adding topics

---
 .../manage-group-modal/steps/details-step.tsx | 63 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
index 66b7b4b1d..cb7dfb492 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { Form, FormGroup, Input, Textarea } from 'soapbox/components/ui';
+import { Form, FormGroup, Input, Streamfield, Textarea } from 'soapbox/components/ui';
 import AvatarPicker from 'soapbox/features/group/components/group-avatar-picker';
 import HeaderPicker from 'soapbox/features/group/components/group-header-picker';
 import { useAppSelector, useDebounce, useInstance } from 'soapbox/hooks';
@@ -14,6 +14,7 @@ import type { List as ImmutableList } from 'immutable';
 const messages = defineMessages({
   groupNamePlaceholder: { id: 'manage_group.fields.name_placeholder', defaultMessage: 'Group Name' },
   groupDescriptionPlaceholder: { id: 'manage_group.fields.description_placeholder', defaultMessage: 'Description' },
+  hashtagPlaceholder: { id: 'manage_group.fields.hashtag_placeholder', defaultMessage: 'Add a topic' },
 });
 
 interface IDetailsStep {
@@ -29,6 +30,7 @@ const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
   const {
     display_name: displayName = '',
     note = '',
+    tags = [''],
   } = params;
 
   const debouncedName = debounce(displayName, 300);
@@ -63,6 +65,29 @@ const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
     };
   };
 
+  const handleTagsChange = (tags: string[]) => {
+    onChange({
+      ...params,
+      tags,
+    });
+  };
+
+  const handleAddTag = () => {
+    onChange({
+      ...params,
+      tags: [...tags, ''],
+    });
+  };
+
+  const handleRemoveTag = (i: number) => {
+    const newTags = [...tags];
+    newTags.splice(i, 1);
+    onChange({
+      ...params,
+      tags: newTags,
+    });
+  };
+
   return (
     <Form>
       <div className='relative mb-12 flex'>
@@ -95,8 +120,44 @@ const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
           maxLength={Number(instance.configuration.getIn(['groups', 'max_characters_description']))}
         />
       </FormGroup>
+
+      <div className='pb-6'>
+        <Streamfield
+          label='Topics'
+          hint='Add up to 3 keywords that will serve as core topics of discussion in the group.'
+          component={HashtagField}
+          values={tags.map((t) => [t])}
+          onChange={handleTagsChange}
+          onAddItem={handleAddTag}
+          onRemoveItem={handleRemoveTag}
+          maxItems={3}
+        />
+      </div>
     </Form>
   );
 };
 
+interface IHashtagField {
+  value: string
+  onChange: (value: string) => void
+}
+
+const HashtagField: React.FC<IHashtagField> = ({ value, onChange }) => {
+  const intl = useIntl();
+
+  const handleChange: React.ChangeEventHandler<HTMLInputElement> = ({ target }) => {
+    onChange(target.value);
+  };
+
+  return (
+    <Input
+      outerClassName='w-full'
+      type='text'
+      value={value}
+      onChange={handleChange}
+      placeholder={intl.formatMessage(messages.hashtagPlaceholder)}
+    />
+  );
+};
+
 export default DetailsStep;

From ae4430b9ebe6b0a3df886655e590bc6915beea8b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 14:54:32 -0500
Subject: [PATCH 064/298] EditGroup: allow managing topics

---
 .../group/components/group-tags-field.tsx     | 56 +++++++++++++++++++
 app/soapbox/features/group/edit-group.tsx     | 36 +++++++++++-
 .../manage-group-modal/steps/details-step.tsx | 34 ++---------
 app/soapbox/normalizers/group.ts              |  1 +
 app/soapbox/schemas/group-tag.ts              |  9 +++
 app/soapbox/schemas/group.ts                  |  4 +-
 6 files changed, 106 insertions(+), 34 deletions(-)
 create mode 100644 app/soapbox/features/group/components/group-tags-field.tsx
 create mode 100644 app/soapbox/schemas/group-tag.ts

diff --git a/app/soapbox/features/group/components/group-tags-field.tsx b/app/soapbox/features/group/components/group-tags-field.tsx
new file mode 100644
index 000000000..326fbfd8b
--- /dev/null
+++ b/app/soapbox/features/group/components/group-tags-field.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Input, Streamfield } from 'soapbox/components/ui';
+
+const messages = defineMessages({
+  hashtagPlaceholder: { id: 'manage_group.fields.hashtag_placeholder', defaultMessage: 'Add a topic' },
+});
+
+interface IGroupTagsField {
+  tags: string[]
+  onChange(tags: string[]): void
+  onAddItem(): void
+  onRemoveItem(i: number): void
+  maxItems?: number
+}
+
+const GroupTagsField: React.FC<IGroupTagsField> = ({ tags, onChange, onAddItem, onRemoveItem, maxItems = 3 }) => {
+  return (
+    <Streamfield
+      label='Topics'
+      hint='Add up to 3 keywords that will serve as core topics of discussion in the group.'
+      component={HashtagField}
+      values={tags}
+      onChange={onChange}
+      onAddItem={onAddItem}
+      onRemoveItem={onRemoveItem}
+      maxItems={maxItems}
+    />
+  );
+};
+
+interface IHashtagField {
+  value: string
+  onChange: (value: string) => void
+}
+
+const HashtagField: React.FC<IHashtagField> = ({ value, onChange }) => {
+  const intl = useIntl();
+
+  const handleChange: React.ChangeEventHandler<HTMLInputElement> = ({ target }) => {
+    onChange(target.value);
+  };
+
+  return (
+    <Input
+      outerClassName='w-full'
+      type='text'
+      value={value}
+      onChange={handleChange}
+      placeholder={intl.formatMessage(messages.hashtagPlaceholder)}
+    />
+  );
+};
+
+export default GroupTagsField;
\ No newline at end of file
diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index 23ff9ed98..bb8c622c9 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -1,15 +1,16 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import Icon from 'soapbox/components/icon';
-import { Button, Column, Form, FormActions, FormGroup, Input, Spinner, Textarea } from 'soapbox/components/ui';
+import { Button, Column, Form, FormActions, FormGroup, Icon, Input, Spinner, Textarea } from 'soapbox/components/ui';
 import { useAppSelector, useInstance } from 'soapbox/hooks';
 import { useGroup, useUpdateGroup } from 'soapbox/hooks/api';
 import { useImageField, useTextField } from 'soapbox/hooks/forms';
+import toast from 'soapbox/toast';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
 
 import AvatarPicker from './components/group-avatar-picker';
 import HeaderPicker from './components/group-header-picker';
+import GroupTagsField from './components/group-tags-field';
 
 import type { List as ImmutableList } from 'immutable';
 
@@ -20,6 +21,7 @@ const messages = defineMessages({
   heading: { id: 'navigation_bar.edit_group', defaultMessage: 'Edit Group' },
   groupNamePlaceholder: { id: 'manage_group.fields.name_placeholder', defaultMessage: 'Group Name' },
   groupDescriptionPlaceholder: { id: 'manage_group.fields.description_placeholder', defaultMessage: 'Description' },
+  success: { id: 'manage_group.success', defaultMessage: 'Group saved!' },
 });
 
 interface IEditGroup {
@@ -36,6 +38,7 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
   const { updateGroup } = useUpdateGroup(groupId);
 
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [tags, setTags] = useState<string[]>(['']);
 
   const avatar = useImageField({ maxPixels: 400 * 400, preview: nonDefaultAvatar(group?.avatar) });
   const header = useImageField({ maxPixels: 1920 * 1080, preview: nonDefaultHeader(group?.header) });
@@ -58,11 +61,29 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
       note: note.value,
       avatar: avatar.file,
       header: header.file,
+      tags,
     });
 
+    toast.success(intl.formatMessage(messages.success));
     setIsSubmitting(false);
   }
 
+  const handleAddTag = () => {
+    setTags([...tags, '']);
+  };
+
+  const handleRemoveTag = (i: number) => {
+    const newTags = [...tags];
+    newTags.splice(i, 1);
+    setTags(newTags);
+  };
+
+  useEffect(() => {
+    if (group) {
+      setTags(group.tags.map((t) => t.name));
+    }
+  }, [group?.id]);
+
   if (isLoading) {
     return <Spinner />;
   }
@@ -98,6 +119,15 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
           />
         </FormGroup>
 
+        <div className='pb-6'>
+          <GroupTagsField
+            tags={tags}
+            onChange={setTags}
+            onAddItem={handleAddTag}
+            onRemoveItem={handleRemoveTag}
+          />
+        </div>
+
         <FormActions>
           <Button theme='primary' type='submit' disabled={isSubmitting} block>
             <FormattedMessage id='edit_profile.save' defaultMessage='Save' />
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
index cb7dfb492..d5e59e575 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { Form, FormGroup, Input, Streamfield, Textarea } from 'soapbox/components/ui';
+import { Form, FormGroup, Input, Textarea } from 'soapbox/components/ui';
 import AvatarPicker from 'soapbox/features/group/components/group-avatar-picker';
 import HeaderPicker from 'soapbox/features/group/components/group-header-picker';
+import GroupTagsField from 'soapbox/features/group/components/group-tags-field';
 import { useAppSelector, useDebounce, useInstance } from 'soapbox/hooks';
 import { CreateGroupParams, useGroupValidation } from 'soapbox/hooks/api';
 import { usePreview } from 'soapbox/hooks/forms';
@@ -122,42 +123,15 @@ const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
       </FormGroup>
 
       <div className='pb-6'>
-        <Streamfield
-          label='Topics'
-          hint='Add up to 3 keywords that will serve as core topics of discussion in the group.'
-          component={HashtagField}
-          values={tags.map((t) => [t])}
+        <GroupTagsField
+          tags={tags}
           onChange={handleTagsChange}
           onAddItem={handleAddTag}
           onRemoveItem={handleRemoveTag}
-          maxItems={3}
         />
       </div>
     </Form>
   );
 };
 
-interface IHashtagField {
-  value: string
-  onChange: (value: string) => void
-}
-
-const HashtagField: React.FC<IHashtagField> = ({ value, onChange }) => {
-  const intl = useIntl();
-
-  const handleChange: React.ChangeEventHandler<HTMLInputElement> = ({ target }) => {
-    onChange(target.value);
-  };
-
-  return (
-    <Input
-      outerClassName='w-full'
-      type='text'
-      value={value}
-      onChange={handleChange}
-      placeholder={intl.formatMessage(messages.hashtagPlaceholder)}
-    />
-  );
-};
-
 export default DetailsStep;
diff --git a/app/soapbox/normalizers/group.ts b/app/soapbox/normalizers/group.ts
index e50cc9af3..44b2a48d2 100644
--- a/app/soapbox/normalizers/group.ts
+++ b/app/soapbox/normalizers/group.ts
@@ -33,6 +33,7 @@ export const GroupRecord = ImmutableRecord({
   members_count: 0,
   note: '',
   statuses_visibility: 'public',
+  tags: [],
   uri: '',
   url: '',
 
diff --git a/app/soapbox/schemas/group-tag.ts b/app/soapbox/schemas/group-tag.ts
new file mode 100644
index 000000000..cc64deec6
--- /dev/null
+++ b/app/soapbox/schemas/group-tag.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+const groupTagSchema = z.object({
+  name: z.string(),
+});
+
+type GroupTag = z.infer<typeof groupTagSchema>;
+
+export { groupTagSchema, type GroupTag };
diff --git a/app/soapbox/schemas/group.ts b/app/soapbox/schemas/group.ts
index 48e3e77af..cd62f5860 100644
--- a/app/soapbox/schemas/group.ts
+++ b/app/soapbox/schemas/group.ts
@@ -6,6 +6,7 @@ import { unescapeHTML } from 'soapbox/utils/html';
 
 import { customEmojiSchema } from './custom-emoji';
 import { groupRelationshipSchema } from './group-relationship';
+import { groupTagSchema } from './group-tag';
 import { filteredArray, makeCustomEmojiMap } from './utils';
 
 const avatarMissing = require('assets/images/avatar-missing.png');
@@ -28,6 +29,7 @@ const groupSchema = z.object({
   note: z.string().transform(note => note === '<p></p>' ? '' : note).catch(''),
   relationship: groupRelationshipSchema.nullable().catch(null), // Dummy field to be overwritten later
   statuses_visibility: z.string().catch('public'),
+  tags: z.array(groupTagSchema).catch([]),
   uri: z.string().catch(''),
   url: z.string().catch(''),
 }).transform(group => {
@@ -46,4 +48,4 @@ const groupSchema = z.object({
 
 type Group = z.infer<typeof groupSchema>;
 
-export { groupSchema, Group };
\ No newline at end of file
+export { groupSchema, type Group };
\ No newline at end of file

From 456ed852c4d86d5f29896b95225056c31bb5c09e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 14:59:52 -0500
Subject: [PATCH 065/298] yarn i18n

---
 app/soapbox/locales/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index af5a058c6..e9a259771 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -948,6 +948,7 @@
   "manage_group.fields.cannot_change_hint": "This cannot be changed after the group is created.",
   "manage_group.fields.description_label": "Description",
   "manage_group.fields.description_placeholder": "Description",
+  "manage_group.fields.hashtag_placeholder": "Add a topic",
   "manage_group.fields.name_help": "This cannot be changed after the group is created.",
   "manage_group.fields.name_label": "Group name (required)",
   "manage_group.fields.name_label_optional": "Group name",
@@ -961,6 +962,7 @@
   "manage_group.privacy.private.label": "Private (Owner approval required)",
   "manage_group.privacy.public.hint": "Discoverable. Anyone can join.",
   "manage_group.privacy.public.label": "Public",
+  "manage_group.success": "Group saved!",
   "manage_group.tagline": "Groups connect you with others based on shared interests.",
   "media_panel.empty_message": "No media found.",
   "media_panel.title": "Media",

From f08d23c0554515cdb29020fcdc01fb3451e87723 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 15:14:06 -0500
Subject: [PATCH 066/298] useGroupMembershipRequests: disable for non-staff
 roles

---
 .../hooks/api/groups/useGroupMembershipRequests.ts     | 10 +++++++++-
 app/soapbox/hooks/api/groups/useGroups.ts              |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts b/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts
index 6fab87209..78a59ced6 100644
--- a/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts
+++ b/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts
@@ -2,6 +2,9 @@ import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities, useIncrementEntity } 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 './useGroups';
 
 import type { ExpandedEntitiesPath } from 'soapbox/entity-store/hooks/types';
 
@@ -9,10 +12,15 @@ function useGroupMembershipRequests(groupId: string) {
   const api = useApi();
   const path: ExpandedEntitiesPath = [Entities.ACCOUNTS, 'membership_requests', groupId];
 
+  const { entity: relationship } = useGroupRelationship(groupId);
+
   const { entities, invalidate, ...rest } = useEntities(
     path,
     () => api.get(`/api/v1/groups/${groupId}/membership_requests`),
-    { schema: accountSchema },
+    {
+      schema: accountSchema,
+      enabled: relationship?.role === GroupRoles.OWNER || relationship?.role === GroupRoles.ADMIN,
+    },
   );
 
   const { incrementEntity: authorize } = useIncrementEntity(path, -1, async (accountId: string) => {
diff --git a/app/soapbox/hooks/api/groups/useGroups.ts b/app/soapbox/hooks/api/groups/useGroups.ts
index a99dd43c6..f77f66cdc 100644
--- a/app/soapbox/hooks/api/groups/useGroups.ts
+++ b/app/soapbox/hooks/api/groups/useGroups.ts
@@ -76,4 +76,4 @@ function useGroupRelationships(groupIds: string[]) {
   };
 }
 
-export { useGroup, useGroups, useGroupRelationships };
+export { useGroup, useGroups, useGroupRelationship, useGroupRelationships };

From 4ac8c34a8c426d751256dbe278433ae6c4c03b2c Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 4 Apr 2023 16:26:32 -0400
Subject: [PATCH 067/298] i18n

---
 app/soapbox/locales/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 35d157dbb..3ec43a12b 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -789,6 +789,8 @@
   "group.leave.label": "Leave",
   "group.leave.success": "Left the group",
   "group.manage": "Manage Group",
+  "group.member.admin.limit.summary": "You can assign up to {count} admins for the group at this time.",
+  "group.member.admin.limit.title": "Admin limit reached",
   "group.popover.action": "View Group",
   "group.popover.summary": "You must be a member of the group in order to reply to this status.",
   "group.popover.title": "Membership required",

From 1049968fd6a1a22526e39d8281cd31810c5ffac9 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 15:35:28 -0500
Subject: [PATCH 068/298] GroupMembershipRequests: invalidate list on unmount

---
 .../features/group/group-membership-requests.tsx   | 14 +++++++++++---
 app/soapbox/hooks/api/index.ts                     |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/group/group-membership-requests.tsx b/app/soapbox/features/group/group-membership-requests.tsx
index d445721e4..dc1190bbf 100644
--- a/app/soapbox/features/group/group-membership-requests.tsx
+++ b/app/soapbox/features/group/group-membership-requests.tsx
@@ -1,12 +1,13 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import Account from 'soapbox/components/account';
 import { AuthorizeRejectButtons } from 'soapbox/components/authorize-reject-buttons';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Column, HStack, Spinner } from 'soapbox/components/ui';
-import { useGroup } from 'soapbox/hooks/api';
-import { useGroupMembershipRequests } from 'soapbox/hooks/api/groups/useGroupMembershipRequests';
+import { useGroup, useGroupMembershipRequests } from 'soapbox/hooks/api';
+import { useGroupMembers } from 'soapbox/hooks/api/useGroupMembers';
+import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
 import ColumnForbidden from '../ui/components/column-forbidden';
@@ -59,6 +60,13 @@ const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params })
   const { group } = useGroup(id);
 
   const { accounts, authorize, reject, isLoading } = useGroupMembershipRequests(id);
+  const { invalidate } = useGroupMembers(id, GroupRoles.USER);
+
+  useEffect(() => {
+    return () => {
+      invalidate();
+    };
+  }, []);
 
   if (!group || !group.relationship || isLoading) {
     return (
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index f0ea961a2..4006c1ba9 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -12,6 +12,7 @@ export { useCreateGroup, type CreateGroupParams } from './groups/useCreateGroup'
 export { useDeleteGroup } from './groups/useDeleteGroup';
 export { useDemoteGroupMember } from './groups/useDemoteGroupMember';
 export { useGroup, useGroups } from './groups/useGroups';
+export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
 export { useGroupSearch } from './groups/useGroupSearch';
 export { useGroupValidation } from './groups/useGroupValidation';
 export { useJoinGroup } from './groups/useJoinGroup';

From 0c45889206addac0b695fa4dfadc5b072f1ba58b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Apr 2023 15:52:41 -0500
Subject: [PATCH 069/298] useEntities: drop X-Total-Count if it's less than the
 number of entities in the response (that doesn't make sense)

---
 app/soapbox/entity-store/hooks/useEntities.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/entity-store/hooks/useEntities.ts b/app/soapbox/entity-store/hooks/useEntities.ts
index c1bf47e84..a99ce8631 100644
--- a/app/soapbox/entity-store/hooks/useEntities.ts
+++ b/app/soapbox/entity-store/hooks/useEntities.ts
@@ -65,11 +65,12 @@ function useEntities<TEntity extends Entity>(
       const schema = opts.schema || z.custom<TEntity>();
       const entities = filteredArray(schema).parse(response.data);
       const parsedCount = realNumberSchema.safeParse(response.headers['x-total-count']);
+      const totalCount = parsedCount.success ? parsedCount.data : undefined;
 
       dispatch(entitiesFetchSuccess(entities, entityType, listKey, {
         next: getNextLink(response),
         prev: getPrevLink(response),
-        totalCount: parsedCount.success ? parsedCount.data : undefined,
+        totalCount: Number(totalCount) >= entities.length ? totalCount : undefined,
         fetching: false,
         fetched: true,
         error: null,

From 5fb4b498daec5697a645a2f02c24b4ca8d2e783b Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 5 Apr 2023 09:17:44 -0400
Subject: [PATCH 070/298] Support group notifications for favourites/reblogs

---
 .../notifications/components/notification.tsx       | 13 +++++++++++++
 app/soapbox/locales/en.json                         |  2 ++
 app/soapbox/utils/notification.ts                   |  2 ++
 3 files changed, 17 insertions(+)

diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx
index 6812cdeb8..7cf41bb4e 100644
--- a/app/soapbox/features/notifications/components/notification.tsx
+++ b/app/soapbox/features/notifications/components/notification.tsx
@@ -43,7 +43,9 @@ const icons: Record<NotificationType, string> = {
   follow_request: require('@tabler/icons/user-plus.svg'),
   mention: require('@tabler/icons/at.svg'),
   favourite: require('@tabler/icons/heart.svg'),
+  group_favourite: require('@tabler/icons/heart.svg'),
   reblog: require('@tabler/icons/repeat.svg'),
+  group_reblog: require('@tabler/icons/repeat.svg'),
   status: require('@tabler/icons/bell-ringing.svg'),
   poll: require('@tabler/icons/chart-bar.svg'),
   move: require('@tabler/icons/briefcase.svg'),
@@ -78,10 +80,18 @@ const messages: Record<NotificationType, MessageDescriptor> = defineMessages({
     id: 'notification.favourite',
     defaultMessage: '{name} liked your post',
   },
+  group_favourite: {
+    id: 'notification.group_favourite',
+    defaultMessage: '{name} liked your group post',
+  },
   reblog: {
     id: 'notification.reblog',
     defaultMessage: '{name} reposted your post',
   },
+  group_reblog: {
+    id: 'notification.group_reblog',
+    defaultMessage: '{name} reposted your group post',
+  },
   status: {
     id: 'notification.status',
     defaultMessage: '{name} just posted',
@@ -314,8 +324,10 @@ const Notification: React.FC<INotificaton> = (props) => {
           />
         ) : null;
       case 'favourite':
+      case 'group_favourite':
       case 'mention':
       case 'reblog':
+      case 'group_reblog':
       case 'status':
       case 'poll':
       case 'update':
@@ -331,6 +343,7 @@ const Notification: React.FC<INotificaton> = (props) => {
             onMoveUp={handleMoveUp}
             avatarSize={avatarSize}
             contextType='notifications'
+            showGroup={false}
           />
         ) : null;
       default:
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index af5a058c6..ea65fe5a6 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1051,6 +1051,8 @@
   "notification.favourite": "{name} liked your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
+  "notification.group_favourite": "{name} liked your group post",
+  "notification.group_reblog": "{name} reposted your group post",
   "notification.mention": "{name} mentioned you",
   "notification.mentioned": "{name} mentioned you",
   "notification.move": "{name} moved to {targetName}",
diff --git a/app/soapbox/utils/notification.ts b/app/soapbox/utils/notification.ts
index 09f6a0614..fdd8e25fe 100644
--- a/app/soapbox/utils/notification.ts
+++ b/app/soapbox/utils/notification.ts
@@ -5,6 +5,8 @@ const NOTIFICATION_TYPES = [
   'mention',
   'reblog',
   'favourite',
+  'group_favourite',
+  'group_reblog',
   'poll',
   'status',
   'move',

From a94d2d036e1c5fe06bdc1e4e4c80c2eac0c2a6e7 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 5 Apr 2023 10:29:57 -0400
Subject: [PATCH 071/298] Update aside for Manage Group pages

---
 app/soapbox/features/ui/index.tsx        |  9 ++++---
 app/soapbox/pages/manage-groups-page.tsx | 32 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 app/soapbox/pages/manage-groups-page.tsx

diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 4fd8d9394..c934edda3 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -34,6 +34,7 @@ import GroupPage from 'soapbox/pages/group-page';
 import GroupsPage from 'soapbox/pages/groups-page';
 import GroupsPendingPage from 'soapbox/pages/groups-pending-page';
 import HomePage from 'soapbox/pages/home-page';
+import ManageGroupsPage from 'soapbox/pages/manage-groups-page';
 import ProfilePage from 'soapbox/pages/profile-page';
 import RemoteInstancePage from 'soapbox/pages/remote-instance-page';
 import StatusPage from 'soapbox/pages/status-page';
@@ -297,10 +298,10 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groupsPending && <WrappedRoute path='/groups/pending-requests' exact page={GroupsPendingPage} component={PendingGroupRequests} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id' exact page={GroupPage} component={GroupTimeline} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/members' exact page={GroupPage} component={GroupMembers} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage' exact page={DefaultPage} component={ManageGroup} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage/edit' exact page={DefaultPage} component={EditGroup} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage/blocks' exact page={DefaultPage} component={GroupBlockedMembers} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage/requests' exact page={DefaultPage} component={GroupMembershipRequests} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:id/manage' exact page={ManageGroupsPage} component={ManageGroup} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:id/manage/edit' exact page={ManageGroupsPage} component={EditGroup} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:id/manage/blocks' exact page={ManageGroupsPage} component={GroupBlockedMembers} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:id/manage/requests' exact page={ManageGroupsPage} component={GroupMembershipRequests} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:groupId/posts/:statusId' exact page={StatusPage} component={Status} content={children} />}
 
       <WrappedRoute path='/statuses/new' page={DefaultPage} component={NewStatus} content={children} exact />
diff --git a/app/soapbox/pages/manage-groups-page.tsx b/app/soapbox/pages/manage-groups-page.tsx
new file mode 100644
index 000000000..7155cecdf
--- /dev/null
+++ b/app/soapbox/pages/manage-groups-page.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+
+import { Layout } from 'soapbox/components/ui';
+import LinkFooter from 'soapbox/features/ui/components/link-footer';
+import BundleContainer from 'soapbox/features/ui/containers/bundle-container';
+import { MyGroupsPanel, NewGroupPanel } from 'soapbox/features/ui/util/async-components';
+
+interface IGroupsPage {
+  children: React.ReactNode
+}
+
+/** Page to display groups. */
+const ManageGroupsPage: React.FC<IGroupsPage> = ({ children }) => (
+  <>
+    <Layout.Main>
+      {children}
+    </Layout.Main>
+
+    <Layout.Aside>
+      <BundleContainer fetchComponent={NewGroupPanel}>
+        {Component => <Component />}
+      </BundleContainer>
+      <BundleContainer fetchComponent={MyGroupsPanel}>
+        {Component => <Component />}
+      </BundleContainer>
+
+      <LinkFooter />
+    </Layout.Aside>
+  </>
+);
+
+export default ManageGroupsPage;

From 0c15c336ea0feb29f378860f91f120530c7944b3 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 09:30:05 -0500
Subject: [PATCH 072/298] Thread: increase spacing around thread, change title
 to "Post Details"

---
 app/soapbox/components/ui/card/card.tsx     |  4 +++-
 app/soapbox/components/ui/column/column.tsx |  9 ++++++---
 app/soapbox/features/status/index.tsx       | 13 ++++++-------
 app/soapbox/locales/en.json                 |  2 +-
 app/styles/components/detailed-status.scss  |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/soapbox/components/ui/card/card.tsx b/app/soapbox/components/ui/card/card.tsx
index aedf3e132..d444b75cd 100644
--- a/app/soapbox/components/ui/card/card.tsx
+++ b/app/soapbox/components/ui/card/card.tsx
@@ -16,11 +16,13 @@ const messages = defineMessages({
   back: { id: 'card.back.label', defaultMessage: 'Back' },
 });
 
+export type CardSizes = keyof typeof sizes
+
 interface ICard {
   /** The type of card. */
   variant?: 'default' | 'rounded'
   /** Card size preset. */
-  size?: keyof typeof sizes
+  size?: CardSizes
   /** Extra classnames for the <div> element. */
   className?: string
   /** Elements inside the card. */
diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx
index d6cadec77..11ea4c380 100644
--- a/app/soapbox/components/ui/column/column.tsx
+++ b/app/soapbox/components/ui/column/column.tsx
@@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom';
 import Helmet from 'soapbox/components/helmet';
 import { useSoapboxConfig } from 'soapbox/hooks';
 
-import { Card, CardBody, CardHeader, CardTitle } from '../card/card';
+import { Card, CardBody, CardHeader, CardTitle, type CardSizes } from '../card/card';
 
 type IColumnHeader = Pick<IColumn, 'label' | 'backHref' | 'className' | 'action'>;
 
@@ -54,12 +54,15 @@ export interface IColumn {
   ref?: React.Ref<HTMLDivElement>
   /** Children to display in the column. */
   children?: React.ReactNode
+  /** Action for the ColumnHeader, displayed at the end. */
   action?: React.ReactNode
+  /** Column size, inherited from Card. */
+  size?: CardSizes
 }
 
 /** A backdrop for the main section of the UI. */
 const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedRef<HTMLDivElement>): JSX.Element => {
-  const { backHref, children, label, transparent = false, withHeader = true, className, action } = props;
+  const { backHref, children, label, transparent = false, withHeader = true, className, action, size } = props;
   const soapboxConfig = useSoapboxConfig();
 
   return (
@@ -76,7 +79,7 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
         )}
       </Helmet>
 
-      <Card variant={transparent ? undefined : 'rounded'} className={className}>
+      <Card size={size} variant={transparent ? undefined : 'rounded'} className={className}>
         {withHeader && (
           <ColumnHeader
             label={label}
diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index b51333883..4547441ce 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -50,7 +50,7 @@ import type {
 } from 'soapbox/types/entities';
 
 const messages = defineMessages({
-  title: { id: 'status.title', defaultMessage: '@{username}\'s Post' },
+  title: { id: 'status.title', defaultMessage: 'Post Details' },
   titleDirect: { id: 'status.title_direct', defaultMessage: 'Direct message' },
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
   deleteHeading: { id: 'confirmations.delete.heading', defaultMessage: 'Delete post' },
@@ -462,9 +462,6 @@ const Thread: React.FC<IThread> = (props) => {
     react: handleHotkeyReact,
   };
 
-  const username = String(status.getIn(['account', 'acct']));
-  const titleMessage = status.visibility === 'direct' ? messages.titleDirect : messages.title;
-
   const focusedStatus = (
     <div className={clsx({ 'pb-4': hasDescendants })} key={status.id}>
       <HotKeys handlers={handlers}>
@@ -488,7 +485,7 @@ const Thread: React.FC<IThread> = (props) => {
 
           {!isUnderReview ? (
             <>
-              <hr className='mb-2 border-t-2 dark:border-primary-800' />
+              <hr className='-mx-6 mb-2 border-t-2 dark:border-primary-800' />
 
               <StatusActionBar
                 status={status}
@@ -502,7 +499,7 @@ const Thread: React.FC<IThread> = (props) => {
       </HotKeys>
 
       {hasDescendants && (
-        <hr className='mt-2 border-t-2 dark:border-primary-800' />
+        <hr className='-mx-6 mt-2 border-t-2 dark:border-primary-800' />
       )}
     </div>
   );
@@ -523,8 +520,10 @@ const Thread: React.FC<IThread> = (props) => {
     return <Redirect to={`/groups/${status.group.id}/posts/${props.params.statusId}`} />;
   }
 
+  const titleMessage = status.visibility === 'direct' ? messages.titleDirect : messages.title;
+
   return (
-    <Column label={intl.formatMessage(titleMessage, { username })} transparent>
+    <Column size='lg' label={intl.formatMessage(titleMessage)}>
       <PullToRefresh onRefresh={handleRefresh}>
         <Stack space={2}>
           <div ref={node} className='thread'>
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 145b26e49..e925baa47 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1456,7 +1456,7 @@
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
-  "status.title": "@{username}'s post",
+  "status.title": "Post Details",
   "status.title_direct": "Direct message",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",
diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss
index 7b5086776..d70bf924c 100644
--- a/app/styles/components/detailed-status.scss
+++ b/app/styles/components/detailed-status.scss
@@ -1,5 +1,5 @@
 .thread {
-  @apply bg-white dark:bg-primary-900 p-4 shadow-xl dark:shadow-none sm:p-6 sm:rounded-xl;
+  @apply bg-white dark:bg-primary-900 shadow-xl dark:shadow-none sm:rounded-xl;
 
   &__status {
     @apply relative pb-4;

From 96cece3d2e186d4df1b390afc3d96f567915bee8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 11:36:43 -0500
Subject: [PATCH 073/298] ColumnHeader: increase margin-bottom for size lg
 columns

---
 app/soapbox/components/ui/column/column.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx
index 11ea4c380..59743ba8c 100644
--- a/app/soapbox/components/ui/column/column.tsx
+++ b/app/soapbox/components/ui/column/column.tsx
@@ -84,7 +84,10 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
           <ColumnHeader
             label={label}
             backHref={backHref}
-            className={clsx({ 'px-4 pt-4 sm:p-0': transparent })}
+            className={clsx({
+              'px-4 pt-4 sm:p-0': transparent,
+              'mb-6': size === 'lg',
+            })}
             action={action}
           />
         )}

From 9e62226bd1cb3e3e297dce659585b4a2f50a7e64 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 13:16:18 -0500
Subject: [PATCH 074/298] Make floating column header pretty much work

---
 app/soapbox/components/ui/card/card.tsx     | 4 ++--
 app/soapbox/components/ui/column/column.tsx | 6 ++++--
 app/soapbox/features/status/index.tsx       | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/components/ui/card/card.tsx b/app/soapbox/components/ui/card/card.tsx
index d444b75cd..512910410 100644
--- a/app/soapbox/components/ui/card/card.tsx
+++ b/app/soapbox/components/ui/card/card.tsx
@@ -35,7 +35,7 @@ const Card = React.forwardRef<HTMLDivElement, ICard>(({ children, variant = 'def
     ref={ref}
     {...filteredProps}
     className={clsx({
-      'bg-white dark:bg-primary-900 text-gray-900 dark:text-gray-100 shadow-lg dark:shadow-none overflow-hidden': variant === 'rounded',
+      'bg-white dark:bg-primary-900 text-gray-900 dark:text-gray-100 shadow-lg dark:shadow-none': variant === 'rounded',
       [sizes[size]]: variant === 'rounded',
     }, className)}
   >
@@ -74,7 +74,7 @@ const CardHeader: React.FC<ICardHeader> = ({ className, children, backHref, onBa
   };
 
   return (
-    <HStack alignItems='center' space={2} className={clsx('mb-4', className)}>
+    <HStack alignItems='center' space={2} className={className}>
       {renderBackButton()}
 
       {children}
diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx
index 59743ba8c..6b9dd6175 100644
--- a/app/soapbox/components/ui/column/column.tsx
+++ b/app/soapbox/components/ui/column/column.tsx
@@ -85,8 +85,10 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
             label={label}
             backHref={backHref}
             className={clsx({
-              'px-4 pt-4 sm:p-0': transparent,
-              'mb-6': size === 'lg',
+              'sticky top-12 z-10 bg-white dark:bg-primary-900 lg:top-16': !transparent,
+              'p-4 sm:p-0 sm:pb-4': transparent,
+              '-mt-4 py-4': size !== 'lg' && !transparent,
+              '-mt-4 py-4 sm:-mt-6 sm:py-6': size === 'lg' && !transparent,
             })}
             action={action}
           />
diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 4547441ce..b37c88cb2 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -485,7 +485,7 @@ const Thread: React.FC<IThread> = (props) => {
 
           {!isUnderReview ? (
             <>
-              <hr className='-mx-6 mb-2 border-t-2 dark:border-primary-800' />
+              <hr className='-mx-6 mb-2 max-w-[100vw] border-t-2 dark:border-primary-800' />
 
               <StatusActionBar
                 status={status}
@@ -499,7 +499,7 @@ const Thread: React.FC<IThread> = (props) => {
       </HotKeys>
 
       {hasDescendants && (
-        <hr className='-mx-6 mt-2 border-t-2 dark:border-primary-800' />
+        <hr className='-mx-6 mt-2 max-w-[100vw] border-t-2 dark:border-primary-800' />
       )}
     </div>
   );

From 1c45d575d4c5f185052d472a42b86b3383c822db Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 13:18:53 -0500
Subject: [PATCH 075/298] Fix status placeholder

---
 app/styles/components/status.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index 96bf3aec2..b5a0571c1 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -17,7 +17,7 @@
 
 [column-type='filled'] .status__wrapper,
 [column-type='filled'] .status-placeholder {
-  @apply bg-transparent dark:bg-transparent rounded-none shadow-none p-4;
+  @apply bg-transparent dark:bg-transparent rounded-none shadow-none;
 }
 
 .status-check-box {

From d0e7ccb8c809d37b2802b8db6264efcf4c14a66f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 13:54:43 -0500
Subject: [PATCH 076/298] Column: fix border-radius of sticky header when
 scrolled

---
 app/soapbox/components/ui/column/column.tsx | 23 +++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx
index 6b9dd6175..8813b107b 100644
--- a/app/soapbox/components/ui/column/column.tsx
+++ b/app/soapbox/components/ui/column/column.tsx
@@ -1,5 +1,6 @@
 import clsx from 'clsx';
-import React from 'react';
+import throttle from 'lodash/throttle';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 
 import Helmet from 'soapbox/components/helmet';
@@ -64,6 +65,19 @@ export interface IColumn {
 const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedRef<HTMLDivElement>): JSX.Element => {
   const { backHref, children, label, transparent = false, withHeader = true, className, action, size } = props;
   const soapboxConfig = useSoapboxConfig();
+  const [isScrolled, setIsScrolled] = useState(false);
+
+  const handleScroll = useCallback(throttle(() => {
+    setIsScrolled(window.pageYOffset > 32);
+  }, 50), []);
+
+  useEffect(() => {
+    window.addEventListener('scroll', handleScroll);
+
+    return () => {
+      window.removeEventListener('scroll', handleScroll);
+    };
+  }, []);
 
   return (
     <div role='region' className='relative' ref={ref} aria-label={label} column-type={transparent ? 'transparent' : 'filled'}>
@@ -85,10 +99,11 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
             label={label}
             backHref={backHref}
             className={clsx({
-              'sticky top-12 z-10 bg-white dark:bg-primary-900 lg:top-16': !transparent,
+              'rounded-t-3xl': !isScrolled && !transparent,
+              'sticky top-12 z-10 bg-white/90 dark:bg-primary-900/90 backdrop-blur lg:top-16': !transparent,
               'p-4 sm:p-0 sm:pb-4': transparent,
-              '-mt-4 py-4': size !== 'lg' && !transparent,
-              '-mt-4 py-4 sm:-mt-6 sm:py-6': size === 'lg' && !transparent,
+              '-mt-4 -mx-4 p-4': size !== 'lg' && !transparent,
+              '-mt-4 -mx-4 p-4 sm:-mt-6 sm:-mx-6 sm:p-6': size === 'lg' && !transparent,
             })}
             action={action}
           />

From c2f5ac82b8fd85556632cf62884b3ffd65dba070 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 14:45:07 -0500
Subject: [PATCH 077/298] Remove extraneous shadow from detailed-status.scss

---
 app/styles/components/detailed-status.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss
index d70bf924c..d07c31814 100644
--- a/app/styles/components/detailed-status.scss
+++ b/app/styles/components/detailed-status.scss
@@ -1,5 +1,5 @@
 .thread {
-  @apply bg-white dark:bg-primary-900 shadow-xl dark:shadow-none sm:rounded-xl;
+  @apply bg-white dark:bg-primary-900 sm:rounded-xl;
 
   &__status {
     @apply relative pb-4;

From 4481d9227f7cb3bd0d9e6521ca0b7339c0dee0ac Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 15:17:11 -0500
Subject: [PATCH 078/298] Drop thread back to a medium sized card

---
 app/soapbox/features/status/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index b37c88cb2..38be99ba6 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -485,7 +485,7 @@ const Thread: React.FC<IThread> = (props) => {
 
           {!isUnderReview ? (
             <>
-              <hr className='-mx-6 mb-2 max-w-[100vw] border-t-2 dark:border-primary-800' />
+              <hr className='-mx-4 mb-2 max-w-[100vw] border-t-2 dark:border-primary-800' />
 
               <StatusActionBar
                 status={status}
@@ -499,7 +499,7 @@ const Thread: React.FC<IThread> = (props) => {
       </HotKeys>
 
       {hasDescendants && (
-        <hr className='-mx-6 mt-2 max-w-[100vw] border-t-2 dark:border-primary-800' />
+        <hr className='-mx-4 mt-2 max-w-[100vw] border-t-2 dark:border-primary-800' />
       )}
     </div>
   );
@@ -523,7 +523,7 @@ const Thread: React.FC<IThread> = (props) => {
   const titleMessage = status.visibility === 'direct' ? messages.titleDirect : messages.title;
 
   return (
-    <Column size='lg' label={intl.formatMessage(titleMessage)}>
+    <Column label={intl.formatMessage(titleMessage)}>
       <PullToRefresh onRefresh={handleRefresh}>
         <Stack space={2}>
           <div ref={node} className='thread'>

From 8831648af7886f2132a7f4cedeb4eac9783f1669 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 15:18:36 -0500
Subject: [PATCH 079/298] CHANGELOG: threads

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee32cbb92..b6bc03ee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### 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.
 
 ### Fixed
 - Posts: fixed emojis being cut off in reactions modal.

From a5d7841987dffd36815ce07a00575d5412c71756 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 15:21:15 -0500
Subject: [PATCH 080/298] Thread: use a different title for Group posts

---
 app/soapbox/features/status/index.tsx | 8 ++++++--
 app/soapbox/locales/en.json           | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 38be99ba6..96cfa52ab 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -52,6 +52,7 @@ import type {
 const messages = defineMessages({
   title: { id: 'status.title', defaultMessage: 'Post Details' },
   titleDirect: { id: 'status.title_direct', defaultMessage: 'Direct message' },
+  titleGroup: { id: 'status.title_group', defaultMessage: 'Group Post Details' },
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
   deleteHeading: { id: 'confirmations.delete.heading', defaultMessage: 'Delete post' },
   deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this post?' },
@@ -520,10 +521,13 @@ const Thread: React.FC<IThread> = (props) => {
     return <Redirect to={`/groups/${status.group.id}/posts/${props.params.statusId}`} />;
   }
 
-  const titleMessage = status.visibility === 'direct' ? messages.titleDirect : messages.title;
+  const titleMessage = () => {
+    if (status.visibility === 'direct') return messages.titleDirect;
+    return status.group ? messages.titleGroup : messages.title;
+  };
 
   return (
-    <Column label={intl.formatMessage(titleMessage)}>
+    <Column label={intl.formatMessage(titleMessage())}>
       <PullToRefresh onRefresh={handleRefresh}>
         <Stack space={2}>
           <div ref={node} className='thread'>
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index e925baa47..b122d86a1 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1457,6 +1457,7 @@
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
   "status.title": "Post Details",
+  "status.title_group": "Group Post Details",
   "status.title_direct": "Direct message",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",

From 088f7e0b0ec647de4d1bb07347683b3c9ffc5698 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 15:55:29 -0500
Subject: [PATCH 081/298] GroupTagsField: i18n

---
 app/soapbox/features/group/components/group-tags-field.tsx | 6 +++---
 app/soapbox/locales/en.json                                | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/group/components/group-tags-field.tsx b/app/soapbox/features/group/components/group-tags-field.tsx
index 326fbfd8b..e4592a6e4 100644
--- a/app/soapbox/features/group/components/group-tags-field.tsx
+++ b/app/soapbox/features/group/components/group-tags-field.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { Input, Streamfield } from 'soapbox/components/ui';
 
@@ -18,8 +18,8 @@ interface IGroupTagsField {
 const GroupTagsField: React.FC<IGroupTagsField> = ({ tags, onChange, onAddItem, onRemoveItem, maxItems = 3 }) => {
   return (
     <Streamfield
-      label='Topics'
-      hint='Add up to 3 keywords that will serve as core topics of discussion in the group.'
+      label={<FormattedMessage id='group.tags.label' defaultMessage='Tags' />}
+      hint={<FormattedMessage id='group.tags.hint' defaultMessage='Add up to 3 keywords that will serve as core topics of discussion in the group.' />}
       component={HashtagField}
       values={tags}
       onChange={onChange}
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index e9a259771..bc3423213 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -806,6 +806,8 @@
   "group.role.owner": "Owner",
   "group.tabs.all": "All",
   "group.tabs.members": "Members",
+  "group.tags.hint": "Add up to 3 keywords that will serve as core topics of discussion in the group.",
+  "group.tags.label": "Tags",
   "group.upload_banner": "Upload photo",
   "groups.discover.popular.empty": "Unable to fetch popular groups at this time. Please check back later.",
   "groups.discover.popular.show_more": "Show More",

From a875163ed90b53ba7d53463bccb13a9a8f698c65 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 15:56:42 -0500
Subject: [PATCH 082/298] Streamfield: remove "Add" button when maxItems is
 reached

---
 app/soapbox/components/ui/streamfield/streamfield.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/soapbox/components/ui/streamfield/streamfield.tsx b/app/soapbox/components/ui/streamfield/streamfield.tsx
index fadcce46b..5d560bf78 100644
--- a/app/soapbox/components/ui/streamfield/streamfield.tsx
+++ b/app/soapbox/components/ui/streamfield/streamfield.tsx
@@ -87,10 +87,9 @@ const Streamfield: React.FC<IStreamfield> = ({
         </Stack>
       )}
 
-      {onAddItem && (
+      {(onAddItem && (values.length < maxItems)) && (
         <Button
           onClick={onAddItem}
-          disabled={values.length >= maxItems}
           theme='secondary'
           block
         >

From 7a3f98ca64d85c805055af29658ee10650e04bd2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 15:57:33 -0500
Subject: [PATCH 083/298] EditGroup: remove toast

---
 app/soapbox/features/group/edit-group.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index bb8c622c9..1e8024f6f 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -5,7 +5,6 @@ import { Button, Column, Form, FormActions, FormGroup, Icon, Input, Spinner, Tex
 import { useAppSelector, useInstance } from 'soapbox/hooks';
 import { useGroup, useUpdateGroup } from 'soapbox/hooks/api';
 import { useImageField, useTextField } from 'soapbox/hooks/forms';
-import toast from 'soapbox/toast';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
 
 import AvatarPicker from './components/group-avatar-picker';
@@ -64,7 +63,6 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
       tags,
     });
 
-    toast.success(intl.formatMessage(messages.success));
     setIsSubmitting(false);
   }
 

From 749d6f0889bb8328c7f5b5e9d52a5ce099f317eb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 15:58:13 -0500
Subject: [PATCH 084/298] Streamfield: add space between inputs

---
 app/soapbox/components/ui/streamfield/streamfield.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/components/ui/streamfield/streamfield.tsx b/app/soapbox/components/ui/streamfield/streamfield.tsx
index 5d560bf78..bb2ca0ba5 100644
--- a/app/soapbox/components/ui/streamfield/streamfield.tsx
+++ b/app/soapbox/components/ui/streamfield/streamfield.tsx
@@ -69,7 +69,7 @@ const Streamfield: React.FC<IStreamfield> = ({
       </Stack>
 
       {(values.length > 0) && (
-        <Stack>
+        <Stack space={1}>
           {values.map((value, i) => value?._destroy ? null : (
             <HStack space={2} alignItems='center'>
               <Component key={i} onChange={handleChange(i)} value={value} />

From 27d103f79f8594827fa1be355384b13f709e01b2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Apr 2023 19:30:26 -0500
Subject: [PATCH 085/298] yarn i18n

---
 app/soapbox/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index b122d86a1..e871e7ffe 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1457,8 +1457,8 @@
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
   "status.title": "Post Details",
-  "status.title_group": "Group Post Details",
   "status.title_direct": "Direct message",
+  "status.title_group": "Group Post Details",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.unbookmark": "Remove bookmark",

From 09a65a7500fd7fc90abe5f7bc4ec30fa10918f5f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 10 Apr 2023 09:33:24 -0500
Subject: [PATCH 086/298] ProfileInfoPanel: fix long usernames x-overflow'ing
 the page

---
 app/soapbox/features/ui/components/profile-info-panel.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/ui/components/profile-info-panel.tsx b/app/soapbox/features/ui/components/profile-info-panel.tsx
index 22688e4a8..6d407eaab 100644
--- a/app/soapbox/features/ui/components/profile-info-panel.tsx
+++ b/app/soapbox/features/ui/components/profile-info-panel.tsx
@@ -141,7 +141,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
       <Stack space={2}>
         <Stack>
           <HStack space={1} alignItems='center'>
-            <Text size='lg' weight='bold' dangerouslySetInnerHTML={displayNameHtml} />
+            <Text size='lg' weight='bold' dangerouslySetInnerHTML={displayNameHtml} truncate />
 
             {account.bot && <Badge slug='bot' title={intl.formatMessage(messages.bot)} />}
 
@@ -153,7 +153,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
           </HStack>
 
           <HStack alignItems='center' space={0.5}>
-            <Text size='sm' theme='muted' direction='ltr'>
+            <Text size='sm' theme='muted' direction='ltr' truncate>
               @{displayFqn ? account.fqn : account.acct}
             </Text>
 

From 8476d69e7bd622742a9b33e1c70d4b5a3856f752 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 10 Apr 2023 09:53:51 -0500
Subject: [PATCH 087/298] Threads: add a bit of space between the top post and
 column header

---
 app/soapbox/features/status/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 96cfa52ab..a9743b48b 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -529,7 +529,7 @@ const Thread: React.FC<IThread> = (props) => {
   return (
     <Column label={intl.formatMessage(titleMessage())}>
       <PullToRefresh onRefresh={handleRefresh}>
-        <Stack space={2}>
+        <Stack space={2} className='mt-2'>
           <div ref={node} className='thread'>
             <ScrollableList
               id='thread'

From 3a60bfcc35ba49ba0b614acb180b74a7f09bc7f4 Mon Sep 17 00:00:00 2001
From: Soapbox Bot <soapbox+bot@alexgleason.me>
Date: Mon, 10 Apr 2023 16:05:18 +0000
Subject: [PATCH 088/298] Update dependency @floating-ui/react to ^0.23.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 47af605e4..57831cd0e 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@babel/runtime": "^7.20.13",
     "@emoji-mart/data": "^1.1.2",
-    "@floating-ui/react": "^0.21.0",
+    "@floating-ui/react": "^0.23.0",
     "@fontsource/inter": "^4.5.1",
     "@fontsource/roboto-mono": "^4.5.8",
     "@gamestdio/websocket": "^0.3.2",
diff --git a/yarn.lock b/yarn.lock
index e2baefa40..4d6585981 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1751,10 +1751,10 @@
   dependencies:
     "@floating-ui/dom" "^1.2.1"
 
-"@floating-ui/react@^0.21.0":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.21.1.tgz#47cafdff0c79f5aa1067398ee06ea2144d22ea7a"
-  integrity sha512-ojjsU/rvWEyNDproy1yQW5EDXJnDip8DXpSRh+hogPgZWEp0Y/2UBPxL3yoa53BDYsL+dqJY0osl9r0Jes3eeg==
+"@floating-ui/react@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.23.0.tgz#8b548235ac4478537757c90a66a3bac9068e29d8"
+  integrity sha512-Id9zTLSjHtcCjBQm0Stc/fRUBGrnHurL/a1HrtQg8LvL6Ciw9KHma2WT++F17kEfhsPkA0UHYxmp+ijmAy0TCw==
   dependencies:
     "@floating-ui/react-dom" "^1.3.0"
     aria-hidden "^1.1.3"

From 901ff57e133e5ff446765754ae137a831f475205 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 10 Apr 2023 12:02:50 -0500
Subject: [PATCH 089/298] Add `toSchema` function, to convert any legacy
 normalizer into a zod schema

---
 app/soapbox/utils/normalizers.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/soapbox/utils/normalizers.ts b/app/soapbox/utils/normalizers.ts
index 6604f1caa..64638dd29 100644
--- a/app/soapbox/utils/normalizers.ts
+++ b/app/soapbox/utils/normalizers.ts
@@ -1,3 +1,5 @@
+import z from 'zod';
+
 /** Use new value only if old value is undefined */
 export const mergeDefined = (oldVal: any, newVal: any) => oldVal === undefined ? newVal : oldVal;
 
@@ -10,3 +12,18 @@ export const makeEmojiMap = (emojis: any) => emojis.reduce((obj: any, emoji: any
 export const normalizeId = (id: any): string | null => {
   return typeof id === 'string' ? id : null;
 };
+
+export type Normalizer<V, R> = (value: V) => R;
+
+/**
+ * Allows using any legacy normalizer function as a zod schema.
+ *
+ * @example
+ * ```ts
+ * const statusSchema = toSchema(normalizeStatus);
+ * statusSchema.parse(status);
+ * ```
+ */
+export const toSchema = <V, R>(normalizer: Normalizer<V, R>) => {
+  return z.custom<V>().transform<R>(normalizer);
+};
\ No newline at end of file

From 39f2734bd478eacdf7ff60088bb21468fe45f2cc Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 10 Apr 2023 13:06:06 -0400
Subject: [PATCH 090/298] Fix replying to status from Group

---
 app/soapbox/actions/statuses.ts           |  4 ++++
 app/soapbox/hooks/api/groups/useGroups.ts | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/actions/statuses.ts b/app/soapbox/actions/statuses.ts
index b14108de2..ab6a855ee 100644
--- a/app/soapbox/actions/statuses.ts
+++ b/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';
@@ -124,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 => {
diff --git a/app/soapbox/hooks/api/groups/useGroups.ts b/app/soapbox/hooks/api/groups/useGroups.ts
index f77f66cdc..9db3001ce 100644
--- a/app/soapbox/hooks/api/groups/useGroups.ts
+++ b/app/soapbox/hooks/api/groups/useGroups.ts
@@ -1,8 +1,10 @@
+import { useEffect } from 'react';
 import { z } from 'zod';
 
+import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities, useEntity } from 'soapbox/entity-store/hooks';
-import { useApi } from 'soapbox/hooks';
+import { useApi, useAppDispatch } from 'soapbox/hooks';
 import { groupSchema, Group } from 'soapbox/schemas/group';
 import { groupRelationshipSchema, GroupRelationship } from 'soapbox/schemas/group-relationship';
 
@@ -48,12 +50,24 @@ function useGroup(groupId: string, refetch = true) {
 
 function useGroupRelationship(groupId: string) {
   const api = useApi();
+  const dispatch = useAppDispatch();
 
-  return useEntity<GroupRelationship>(
+  const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
     [Entities.GROUP_RELATIONSHIPS, groupId],
     () => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
     { schema: z.array(groupRelationshipSchema).transform(arr => arr[0]) },
   );
+
+  useEffect(() => {
+    if (groupRelationship?.id) {
+      dispatch(fetchGroupRelationshipsSuccess([groupRelationship]));
+    }
+  }, [groupRelationship?.id]);
+
+  return {
+    entity: groupRelationship,
+    ...result,
+  };
 }
 
 function useGroupRelationships(groupIds: string[]) {

From dc8468adc22396e0b091d9f810b3107465009dba Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 10 Apr 2023 16:03:27 -0400
Subject: [PATCH 091/298] Set button type to Toggle

---
 app/soapbox/components/ui/toggle/toggle.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/components/ui/toggle/toggle.tsx b/app/soapbox/components/ui/toggle/toggle.tsx
index 34651e98d..0311da8ac 100644
--- a/app/soapbox/components/ui/toggle/toggle.tsx
+++ b/app/soapbox/components/ui/toggle/toggle.tsx
@@ -26,6 +26,7 @@ const Toggle: React.FC<IToggle> = ({ id, size = 'md', name, checked, onChange, r
         'cursor-default': disabled,
       })}
       onClick={handleClick}
+      type='button'
     >
       <div className={clsx('rounded-full bg-white transition-transform', {
         'h-4.5 w-4.5': size === 'sm',

From ce0557546a53792bd7ae6d16f3b64dff440df48a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 10 Apr 2023 15:22:08 -0500
Subject: [PATCH 092/298] Groups: add group gallery

---
 app/soapbox/entity-store/entities.ts          |  3 +-
 app/soapbox/features/group/group-gallery.tsx  | 91 +++++++++++++++++++
 app/soapbox/features/ui/index.tsx             |  2 +
 .../features/ui/util/async-components.ts      |  4 +
 app/soapbox/hooks/api/groups/useGroupMedia.ts | 14 +++
 app/soapbox/hooks/api/index.ts                |  1 +
 app/soapbox/pages/group-page.tsx              |  6 ++
 app/soapbox/schemas/status.ts                 | 10 ++
 8 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 app/soapbox/features/group/group-gallery.tsx
 create mode 100644 app/soapbox/hooks/api/groups/useGroupMedia.ts
 create mode 100644 app/soapbox/schemas/status.ts

diff --git a/app/soapbox/entity-store/entities.ts b/app/soapbox/entity-store/entities.ts
index 7f9f84e2a..719cc7f1c 100644
--- a/app/soapbox/entity-store/entities.ts
+++ b/app/soapbox/entity-store/entities.ts
@@ -3,5 +3,6 @@ export enum Entities {
   GROUPS = 'Groups',
   GROUP_RELATIONSHIPS = 'GroupRelationships',
   GROUP_MEMBERSHIPS = 'GroupMemberships',
-  RELATIONSHIPS = 'Relationships'
+  RELATIONSHIPS = 'Relationships',
+  STATUSES = 'Statuses',
 }
\ No newline at end of file
diff --git a/app/soapbox/features/group/group-gallery.tsx b/app/soapbox/features/group/group-gallery.tsx
new file mode 100644
index 000000000..139be5bf3
--- /dev/null
+++ b/app/soapbox/features/group/group-gallery.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { useParams } from 'react-router-dom';
+
+import { openModal } from 'soapbox/actions/modals';
+import LoadMore from 'soapbox/components/load-more';
+import MissingIndicator from 'soapbox/components/missing-indicator';
+import { Column, Spinner } from 'soapbox/components/ui';
+import { useAppDispatch } from 'soapbox/hooks';
+import { useGroup, useGroupMedia } from 'soapbox/hooks/api';
+
+import MediaItem from '../account-gallery/components/media-item';
+
+import type { Attachment, Status } from 'soapbox/types/entities';
+
+const GroupGallery = () => {
+  const dispatch = useAppDispatch();
+
+  const { id: groupId } = useParams<{ id: string }>();
+
+  const { group, isLoading: groupIsLoading } = useGroup(groupId);
+
+  const {
+    entities: statuses,
+    fetchNextPage,
+    isLoading,
+    hasNextPage,
+  } = useGroupMedia(groupId);
+
+  const attachments = statuses.reduce<Attachment[]>((result, status) => {
+    result.push(...status.media_attachments.map((a) => a.set('status', status)));
+    return result;
+  }, []);
+
+  const handleOpenMedia = (attachment: Attachment) => {
+    if (attachment.type === 'video') {
+      dispatch(openModal('VIDEO', { media: attachment, status: attachment.status, account: attachment.account }));
+    } else {
+      const media = (attachment.status as Status).media_attachments;
+      const index = media.findIndex((x) => x.id === attachment.id);
+
+      dispatch(openModal('MEDIA', { media, index, status: attachment.status }));
+    }
+  };
+
+  if (isLoading || groupIsLoading) {
+    return (
+      <Column>
+        <Spinner />
+      </Column>
+    );
+  }
+
+  if (!group) {
+    return (
+      <MissingIndicator />
+    );
+  }
+
+  return (
+    <Column label={group.display_name} transparent withHeader={false}>
+      <div role='feed' className='grid grid-cols-2 gap-2 sm:grid-cols-3'>
+        {attachments.map((attachment) => (
+          <MediaItem
+            key={`${attachment.status.id}+${attachment.id}`}
+            attachment={attachment}
+            onOpenMedia={handleOpenMedia}
+          />
+        ))}
+
+        {(!isLoading && attachments.length === 0) && (
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='account_gallery.none' defaultMessage='No media to show.' />
+          </div>
+        )}
+
+        {(hasNextPage && !isLoading) && (
+          <LoadMore className='my-auto' visible={!isLoading} onClick={fetchNextPage} />
+        )}
+      </div>
+
+      {isLoading && (
+        <div className='slist__append'>
+          <Spinner />
+        </div>
+      )}
+    </Column>
+  );
+};
+
+export default GroupGallery;
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 4fd8d9394..f5e8bbd85 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -116,6 +116,7 @@ import {
   EventInformation,
   EventDiscussion,
   Events,
+  GroupGallery,
   Groups,
   GroupsDiscover,
   GroupsPopular,
@@ -297,6 +298,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groupsPending && <WrappedRoute path='/groups/pending-requests' exact page={GroupsPendingPage} component={PendingGroupRequests} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id' exact page={GroupPage} component={GroupTimeline} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/members' exact page={GroupPage} component={GroupMembers} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:id/media' publicRoute={!authenticatedProfile} component={GroupGallery} page={GroupPage} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/manage' exact page={DefaultPage} component={ManageGroup} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/manage/edit' exact page={DefaultPage} component={EditGroup} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/manage/blocks' exact page={DefaultPage} component={GroupBlockedMembers} content={children} />}
diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts
index 5296504da..f915571d2 100644
--- a/app/soapbox/features/ui/util/async-components.ts
+++ b/app/soapbox/features/ui/util/async-components.ts
@@ -590,6 +590,10 @@ export function GroupMembershipRequests() {
   return import(/* webpackChunkName: "features/groups" */'../../group/group-membership-requests');
 }
 
+export function GroupGallery() {
+  return import(/* webpackChunkName: "features/groups" */'../../group/group-gallery');
+}
+
 export function CreateGroupModal() {
   return import(/* webpackChunkName: "features/groups" */'../components/modals/manage-group-modal/create-group-modal');
 }
diff --git a/app/soapbox/hooks/api/groups/useGroupMedia.ts b/app/soapbox/hooks/api/groups/useGroupMedia.ts
new file mode 100644
index 000000000..23375bdc7
--- /dev/null
+++ b/app/soapbox/hooks/api/groups/useGroupMedia.ts
@@ -0,0 +1,14 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { statusSchema } from 'soapbox/schemas/status';
+
+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 };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index 4006c1ba9..b5927bf6b 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -11,6 +11,7 @@ export { useCancelMembershipRequest } from './groups/useCancelMembershipRequest'
 export { useCreateGroup, type CreateGroupParams } from './groups/useCreateGroup';
 export { useDeleteGroup } from './groups/useDeleteGroup';
 export { useDemoteGroupMember } from './groups/useDemoteGroupMember';
+export { useGroupMedia } from './groups/useGroupMedia';
 export { useGroup, useGroups } from './groups/useGroups';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
 export { useGroupSearch } from './groups/useGroupSearch';
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index ee6f46cb6..133679c4a 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -22,6 +22,7 @@ import { Tabs } from '../components/ui';
 const messages = defineMessages({
   all: { id: 'group.tabs.all', defaultMessage: 'All' },
   members: { id: 'group.tabs.members', defaultMessage: 'Members' },
+  media: { id: 'group.tabs.media', defaultMessage: 'Media' },
 });
 
 interface IGroupPage {
@@ -84,6 +85,11 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
       name: '/groups/:id/members',
       count: pending.length,
     },
+    {
+      text: intl.formatMessage(messages.media),
+      to: `/groups/${group?.id}/media`,
+      name: '/groups/:id/media',
+    },
   ];
 
   const renderChildren = () => {
diff --git a/app/soapbox/schemas/status.ts b/app/soapbox/schemas/status.ts
new file mode 100644
index 000000000..66d6f05eb
--- /dev/null
+++ b/app/soapbox/schemas/status.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+import { normalizeStatus } from 'soapbox/normalizers';
+import { toSchema } from 'soapbox/utils/normalizers';
+
+const statusSchema = toSchema(normalizeStatus);
+
+type Status = z.infer<typeof statusSchema>;
+
+export { statusSchema, type Status };
\ No newline at end of file

From 0e1da7512ca67e9bf776ed9980451904b4dc30f3 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 10 Apr 2023 15:25:42 -0500
Subject: [PATCH 093/298] Toggle: fix toggle acting as a submit button in forms

---
 app/soapbox/components/ui/toggle/toggle.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/components/ui/toggle/toggle.tsx b/app/soapbox/components/ui/toggle/toggle.tsx
index 34651e98d..0311da8ac 100644
--- a/app/soapbox/components/ui/toggle/toggle.tsx
+++ b/app/soapbox/components/ui/toggle/toggle.tsx
@@ -26,6 +26,7 @@ const Toggle: React.FC<IToggle> = ({ id, size = 'md', name, checked, onChange, r
         'cursor-default': disabled,
       })}
       onClick={handleClick}
+      type='button'
     >
       <div className={clsx('rounded-full bg-white transition-transform', {
         'h-4.5 w-4.5': size === 'sm',

From e82ecdc05cea2f142683c3d8ae3d1058a01b8f94 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 11 Apr 2023 08:55:17 -0400
Subject: [PATCH 094/298] Improve alignment/spacing

---
 app/soapbox/components/status-list.tsx                     | 4 +++-
 app/soapbox/components/status.tsx                          | 2 +-
 app/soapbox/components/ui/card/card.tsx                    | 3 ++-
 app/soapbox/features/account/components/header.tsx         | 4 ++--
 app/soapbox/features/event/event-discussion.tsx            | 2 +-
 app/soapbox/features/group/components/group-header.tsx     | 4 ++--
 app/soapbox/features/group/group-timeline.tsx              | 2 +-
 .../features/placeholder/components/placeholder-status.tsx | 7 ++++---
 app/soapbox/features/status/components/thread-status.tsx   | 2 +-
 app/soapbox/features/status/index.tsx                      | 2 +-
 app/soapbox/pages/group-page.tsx                           | 2 +-
 app/soapbox/pages/profile-page.tsx                         | 2 +-
 12 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/soapbox/components/status-list.tsx b/app/soapbox/components/status-list.tsx
index 937dac8de..439803e02 100644
--- a/app/soapbox/components/status-list.tsx
+++ b/app/soapbox/components/status-list.tsx
@@ -139,6 +139,7 @@ const StatusList: React.FC<IStatusList> = ({
         onMoveDown={handleMoveDown}
         contextType={timelineId}
         showGroup={showGroup}
+        variant={divideType === 'border' ? 'slim' : 'rounded'}
       />
     );
   };
@@ -172,6 +173,7 @@ const StatusList: React.FC<IStatusList> = ({
         onMoveDown={handleMoveDown}
         contextType={timelineId}
         showGroup={showGroup}
+        variant={divideType === 'border' ? 'slim' : 'default'}
       />
     ));
   };
@@ -245,7 +247,7 @@ const StatusList: React.FC<IStatusList> = ({
       isLoading={isLoading}
       showLoading={isLoading && statusIds.size === 0}
       onLoadMore={handleLoadOlder}
-      placeholderComponent={PlaceholderStatus}
+      placeholderComponent={() => <PlaceholderStatus variant={divideType === 'border' ? 'slim' : 'rounded'} />}
       placeholderCount={20}
       ref={node}
       className={clsx('divide-y divide-solid divide-gray-200 dark:divide-gray-800', {
diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 65291a420..752e73636 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -50,7 +50,7 @@ export interface IStatus {
   featured?: boolean
   hideActionBar?: boolean
   hoverable?: boolean
-  variant?: 'default' | 'rounded'
+  variant?: 'default' | 'rounded' | 'slim'
   showGroup?: boolean
   accountAction?: React.ReactElement
 }
diff --git a/app/soapbox/components/ui/card/card.tsx b/app/soapbox/components/ui/card/card.tsx
index 512910410..4b8d9799d 100644
--- a/app/soapbox/components/ui/card/card.tsx
+++ b/app/soapbox/components/ui/card/card.tsx
@@ -20,7 +20,7 @@ export type CardSizes = keyof typeof sizes
 
 interface ICard {
   /** The type of card. */
-  variant?: 'default' | 'rounded'
+  variant?: 'default' | 'rounded' | 'slim'
   /** Card size preset. */
   size?: CardSizes
   /** Extra classnames for the <div> element. */
@@ -37,6 +37,7 @@ const Card = React.forwardRef<HTMLDivElement, ICard>(({ children, variant = 'def
     className={clsx({
       'bg-white dark:bg-primary-900 text-gray-900 dark:text-gray-100 shadow-lg dark:shadow-none': variant === 'rounded',
       [sizes[size]]: variant === 'rounded',
+      'py-4': variant === 'slim',
     }, className)}
   >
     {children}
diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx
index ac4fdd66e..4a589a328 100644
--- a/app/soapbox/features/account/components/header.tsx
+++ b/app/soapbox/features/account/components/header.tsx
@@ -105,7 +105,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
 
   if (!account) {
     return (
-      <div className='-mx-4 -mt-4'>
+      <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6'>
         <div>
           <div className='relative h-32 w-full bg-gray-200 dark:bg-gray-900/50 md:rounded-t-xl lg:h-48' />
         </div>
@@ -608,7 +608,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
   const menu = makeMenu();
 
   return (
-    <div className='-mx-4 -mt-4'>
+    <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6'>
       {(account.moved && typeof account.moved === 'object') && (
         <MovedNote from={account} to={account.moved} />
       )}
diff --git a/app/soapbox/features/event/event-discussion.tsx b/app/soapbox/features/event/event-discussion.tsx
index 54a539a8a..3c96c73b8 100644
--- a/app/soapbox/features/event/event-discussion.tsx
+++ b/app/soapbox/features/event/event-discussion.tsx
@@ -184,7 +184,7 @@ const EventDiscussion: React.FC<IEventDiscussion> = (props) => {
           ref={scroller}
           hasMore={!!next}
           onLoadMore={handleLoadMore}
-          placeholderComponent={() => <PlaceholderStatus thread />}
+          placeholderComponent={() => <PlaceholderStatus variant='slim' />}
           initialTopMostItemIndex={0}
           emptyMessage={<FormattedMessage id='event.discussion.empty' defaultMessage='No one has commented this event yet. When someone does, they will appear here.' />}
         >
diff --git a/app/soapbox/features/group/components/group-header.tsx b/app/soapbox/features/group/components/group-header.tsx
index 713c64c86..a49d87fe7 100644
--- a/app/soapbox/features/group/components/group-header.tsx
+++ b/app/soapbox/features/group/components/group-header.tsx
@@ -32,7 +32,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
 
   if (!group) {
     return (
-      <div className='-mx-4 -mt-4'>
+      <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6'>
         <div>
           <div className='relative h-32 w-full bg-gray-200 dark:bg-gray-900/50 md:rounded-t-xl lg:h-48' />
         </div>
@@ -105,7 +105,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
   };
 
   return (
-    <div className='-mx-4 -mt-4'>
+    <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6'>
       <div className='relative'>
         {renderHeader()}
 
diff --git a/app/soapbox/features/group/group-timeline.tsx b/app/soapbox/features/group/group-timeline.tsx
index 8ab33e910..f19da1777 100644
--- a/app/soapbox/features/group/group-timeline.tsx
+++ b/app/soapbox/features/group/group-timeline.tsx
@@ -56,7 +56,7 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
   return (
     <Stack space={2}>
       {canComposeGroupStatus && (
-        <div className='border-b border-solid border-gray-200 px-2 py-4 dark:border-gray-800'>
+        <div className='border-b border-solid border-gray-200 py-6 dark:border-gray-800'>
           <HStack alignItems='start' space={4}>
             <Link to={`/@${account.acct}`}>
               <Avatar src={account.avatar} size={46} />
diff --git a/app/soapbox/features/placeholder/components/placeholder-status.tsx b/app/soapbox/features/placeholder/components/placeholder-status.tsx
index 37da3fa45..06d6ff1a2 100644
--- a/app/soapbox/features/placeholder/components/placeholder-status.tsx
+++ b/app/soapbox/features/placeholder/components/placeholder-status.tsx
@@ -8,15 +8,16 @@ import PlaceholderDisplayName from './placeholder-display-name';
 import PlaceholderStatusContent from './placeholder-status-content';
 
 interface IPlaceholderStatus {
-  thread?: boolean
+  variant?: 'rounded' | 'slim'
 }
 
 /** Fake status to display while data is loading. */
-const PlaceholderStatus: React.FC<IPlaceholderStatus> = ({ thread = false }) => (
+const PlaceholderStatus: React.FC<IPlaceholderStatus> = ({ variant = 'rounded' }) => (
   <div
     className={clsx({
       'status-placeholder bg-white dark:bg-primary-900': true,
-      'shadow-xl dark:shadow-none sm:rounded-xl px-4 py-6 sm:p-5': !thread,
+      'shadow-xl dark:shadow-none sm:rounded-xl px-4 py-6 sm:p-5': variant === 'rounded',
+      'py-4': variant === 'slim',
     })}
   >
     <div className='w-full animate-pulse overflow-hidden'>
diff --git a/app/soapbox/features/status/components/thread-status.tsx b/app/soapbox/features/status/components/thread-status.tsx
index 73c42e7e3..871e8f431 100644
--- a/app/soapbox/features/status/components/thread-status.tsx
+++ b/app/soapbox/features/status/components/thread-status.tsx
@@ -46,7 +46,7 @@ const ThreadStatus: React.FC<IThreadStatus> = (props): JSX.Element => {
         // @ts-ignore FIXME
         <StatusContainer {...props} />
       ) : (
-        <PlaceholderStatus thread />
+        <PlaceholderStatus variant='slim' />
       )}
     </div>
   );
diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index a9743b48b..818d83720 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -536,7 +536,7 @@ const Thread: React.FC<IThread> = (props) => {
               ref={scroller}
               hasMore={!!next}
               onLoadMore={handleLoadMore}
-              placeholderComponent={() => <PlaceholderStatus thread />}
+              placeholderComponent={() => <PlaceholderStatus variant='slim' />}
               initialTopMostItemIndex={ancestorsIds.size}
             >
               {children}
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index ee6f46cb6..03d8d2d84 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -99,7 +99,7 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   return (
     <>
       <Layout.Main>
-        <Column label={group ? group.display_name : ''} withHeader={false}>
+        <Column size='lg' label={group ? group.display_name : ''} withHeader={false}>
           <GroupHeader group={group} />
 
           <Tabs
diff --git a/app/soapbox/pages/profile-page.tsx b/app/soapbox/pages/profile-page.tsx
index f5426a02c..e83bfa7cd 100644
--- a/app/soapbox/pages/profile-page.tsx
+++ b/app/soapbox/pages/profile-page.tsx
@@ -97,7 +97,7 @@ const ProfilePage: React.FC<IProfilePage> = ({ params, children }) => {
   return (
     <>
       <Layout.Main>
-        <Column label={account ? `@${getAcct(account, displayFqn)}` : ''} withHeader={false}>
+        <Column size='lg' label={account ? `@${getAcct(account, displayFqn)}` : ''} withHeader={false}>
           <div className='space-y-4'>
             <Header account={account} />
 

From 4ad5a6b8cd38839d9f7bbf3e32f20cb931b24968 Mon Sep 17 00:00:00 2001
From: jonnysemon <johndevand@tutanota.com>
Date: Mon, 3 Apr 2023 16:14:09 +0000
Subject: [PATCH 095/298] Translated using Weblate (Arabic)

Currently translated at 99.2% (1529 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ar/
---
 app/soapbox/locales/ar.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index b82546511..77d5d69ab 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -806,6 +806,7 @@
   "group.tabs.all": "الكل",
   "group.tabs.members": "الأعضاء",
   "group.upload_banner": "رفع الصورة",
+  "groups.discover.popular.empty": "غير قادر على جلب المجموعات الشعبية في هذا الوقت. يرجى التحقق مرة أخرى في وقت لاحق.",
   "groups.discover.popular.show_more": "عرض المزيد",
   "groups.discover.popular.title": "مجموعات شعبية",
   "groups.discover.search.error.subtitle": "الرجاء إعادة المحاولة في وقت لاحق.",
@@ -813,6 +814,7 @@
   "groups.discover.search.no_results.subtitle": "حاول البحث عن مجموعة أخرى.",
   "groups.discover.search.no_results.title": "لم يتم العثور على نتائج",
   "groups.discover.search.placeholder": "بحث",
+  "groups.discover.search.recent_searches.blankslate.subtitle": "ابحث عن أسماء المجموعات، الموضوعات أو الكلمات الرئيسية",
   "groups.discover.search.recent_searches.blankslate.title": "لا توجد عمليات بحث حديثة",
   "groups.discover.search.recent_searches.clear_all": "امسح الكل",
   "groups.discover.search.recent_searches.title": "عمليات البحث الأخيرة",

From b006356ebeb66c1f711c44cc95989e626970296d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Tue, 4 Apr 2023 01:35:28 +0000
Subject: [PATCH 096/298] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 97.3% (1499 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/nb_NO/
---
 app/soapbox/locales/no.json | 49 +++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 2c36a887b..a4422c189 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -316,6 +316,7 @@
   "column.developers.service_worker": "Servicearbeider",
   "column.direct": "Direktemeldinger",
   "column.directory": "Utforsk profiler",
+  "column.dislikes": "Mislikt",
   "column.domain_blocks": "Skjulte domener",
   "column.edit_profile": "Rediger profil",
   "column.event_map": "Sted for arrangementet",
@@ -338,11 +339,15 @@
   "column.filters.edit": "Rediger",
   "column.filters.expires": "Utløper etter",
   "column.filters.hide_header": "Skjul fullstendig",
+  "column.filters.hide_hint": "Skjul filtrert innhold helt og holdent, istedenfor visning av advarsel",
   "column.filters.home_timeline": "Hjemmetidslinje",
   "column.filters.keyword": "Nøkkelord eller frase",
+  "column.filters.keywords": "Nøkkelord eller begrep",
   "column.filters.notifications": "Varslinger",
   "column.filters.public_timeline": "Offentlig tidslinje",
   "column.filters.subheading_add_new": "Legg til nytt filter",
+  "column.filters.title": "Navn",
+  "column.filters.whole_word": "Helt ord",
   "column.follow_requests": "Følgeforespørsler",
   "column.followers": "Følgere",
   "column.following": "Følger",
@@ -438,6 +443,7 @@
   "compose_form.spoiler_placeholder": "Innholdsadvarsel",
   "compose_form.spoiler_remove": "Fjern følsomhet",
   "compose_form.spoiler_title": "Følsomt innhold",
+  "compose_group.share_to_followers": "Del med følgerne mine",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.admin.deactivate_user.confirm": "Deaktiver @{name}",
   "confirmations.admin.deactivate_user.heading": "Deaktiver @{acct}",
@@ -623,6 +629,7 @@
   "email_verifilcation.exists": "Denne e-posten er allerede tatt.",
   "embed.instructions": "Kopier koden under for å bygge inn denne statusen på hjemmesiden din.",
   "emoji_button.activity": "Aktivitet",
+  "emoji_button.add_custom": "Legg til egendefinert smilefjes",
   "emoji_button.custom": "Tilpasset",
   "emoji_button.flags": "Flagg",
   "emoji_button.food": "Mat og drikke",
@@ -630,11 +637,19 @@
   "emoji_button.nature": "Natur",
   "emoji_button.not_found": "Ingen emojier funnet.",
   "emoji_button.objects": "Objekter",
+  "emoji_button.oh_no": "Oida.",
   "emoji_button.people": "Mennesker",
+  "emoji_button.pick": "Velg et smilefjes …",
   "emoji_button.recent": "Hyppig brukt",
   "emoji_button.search": "Søk…",
   "emoji_button.search_results": "Søkeresultat",
   "emoji_button.skins_1": "Forvalg",
+  "emoji_button.skins_2": "Hvit",
+  "emoji_button.skins_3": "Lys",
+  "emoji_button.skins_4": "Middels",
+  "emoji_button.skins_5": "Mørk",
+  "emoji_button.skins_6": "Svart",
+  "emoji_button.skins_choose": "Velg forvalgt hudfarge",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
   "empty_column.account_blocked": "Du er blokkert av @{accountUsername}.",
@@ -648,6 +663,7 @@
   "empty_column.bookmarks": "Du har ingen bokmerker ennå. Når du legger til en, vises den her.",
   "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!",
   "empty_column.direct": "Du har ingen direktemeldinger ennå. Når du sender eller mottar en, vises den her.",
+  "empty_column.dislikes": "Ingen har mislikt dette innlegget enda. Når noen gjør det vil det vises her.",
   "empty_column.domain_blocks": "Det er ingen skjulte domener ennå.",
   "empty_column.event_participant_requests": "Det er ingen ventende forespørsler om deltakelse på arrangementer.",
   "empty_column.event_participants": "Ingen har blitt med på dette arrangementet ennå. Når noen gjør det, vil de dukke opp her.",
@@ -740,6 +756,7 @@
   "filters.filters_list_expired": "Utløpt",
   "filters.filters_list_hide": "Skjul",
   "filters.filters_list_hide_completely": "Skjul innhold",
+  "filters.filters_list_phrases_label": "Nøkkelord eller begrep:",
   "filters.filters_list_warn": "Vis advarsel",
   "filters.removed": "Filter slettet.",
   "followRecommendations.heading": "Foreslåtte Profiler",
@@ -751,12 +768,16 @@
   "gdpr.title": "{siteTitle} bruker informasjonskapsler",
   "getting_started.open_source_notice": "{code_name} er fri programvare. Du kan bidra eller rapportere problemer på GitLab på {code_link} (v{code_version}).",
   "group.cancel_request": "Avbryt forespørsel",
+  "group.delete.success": "Gruppe slettet",
+  "group.demote.user.success": "@{name} er nå medlem",
+  "group.group_mod_authorize.fail": "Klarte ikke å godkjenne @{name}",
   "group.group_mod_block": "Blokker @{name} fra gruppe",
   "group.group_mod_block.success": "Blokkert @{navn} fra gruppe",
   "group.group_mod_demote": "Degradere @{navn}",
   "group.group_mod_kick": "Spark ut @{name} fra gruppa",
   "group.group_mod_kick.success": "Sparket ut @{name} fra gruppa",
   "group.group_mod_promote_mod": "Forfrem @{name} til gruppemoderator",
+  "group.group_mod_reject.fail": "Klarte ikke å avslå @{name}",
   "group.group_mod_unblock": "Opphev Blokkering",
   "group.group_mod_unblock.success": "Opphevet blokkeringen av @{navn} fra gruppa",
   "group.header.alt": "Gruppeoverskrift",
@@ -768,27 +789,45 @@
   "group.leave.success": "Forlot gruppa",
   "group.manage": "Behandle gruppe",
   "group.popover.action": "Vis gruppe",
+  "group.popover.summary": "Du må være medlem av gruppen for å besvare denne statusen.",
   "group.popover.title": "Medlemskap kreves",
   "group.privacy.locked": "Privat",
   "group.privacy.locked.full": "Privat gruppe",
+  "group.privacy.locked.info": "Oppdagbar. Brukere kan ta del ved godkjent forespørsel.",
   "group.privacy.public": "Offentlig",
   "group.privacy.public.full": "Offentlig gruppe",
+  "group.privacy.public.info": "Oppdagbar. Alle kan ta del.",
+  "group.promote.admin.confirmation.message": "Tildel @{name} administratorrolle?",
+  "group.promote.admin.confirmation.title": "Tildel administratorrolle",
+  "group.promote.admin.success": "@{name} er nå administrator",
+  "group.report.label": "Rapport",
   "group.role.admin": "Administrator",
+  "group.role.owner": "Eier",
   "group.tabs.all": "Alle",
   "group.tabs.members": "Medlemmer",
   "group.upload_banner": "Last opp bilde",
+  "groups.discover.popular.empty": "Kunne ikke hente populære grupper nå. Sjekk igjen senere.",
   "groups.discover.popular.show_more": "Vis mer",
   "groups.discover.popular.title": "Populære grupper",
   "groups.discover.search.error.subtitle": "Prøv igjen senere.",
+  "groups.discover.search.error.title": "En feil oppstod",
+  "groups.discover.search.no_results.subtitle": "Prøv å søke etter en annen gruppe.",
+  "groups.discover.search.no_results.title": "Ingen samsvarende treff",
   "groups.discover.search.placeholder": "Søk",
+  "groups.discover.search.recent_searches.blankslate.subtitle": "Søk etter gruppenavn, emner, eller nøkkelord",
   "groups.discover.search.recent_searches.blankslate.title": "Ingen nylige søk",
   "groups.discover.search.recent_searches.clear_all": "Tøm alt",
   "groups.discover.search.recent_searches.title": "Nylige søk",
   "groups.discover.search.results.groups": "Grupper",
+  "groups.discover.search.results.member_count": "",
+  "groups.discover.suggested.empty": "Kunne ikke hente foreslåtte grupper nå. Sjekk igjen senere.",
   "groups.discover.suggested.show_more": "Vis mer",
   "groups.discover.suggested.title": "Foreslått for deg",
   "groups.empty.subtitle": "Begynn å oppdage grupper du kan bli med i, eller opprett din egen.",
   "groups.empty.title": "Ingen grupper ennå",
+  "groups.pending.empty.subtitle": "Du har ingen ventende forespørsler.",
+  "groups.pending.empty.title": "Ingen ventende forespørsler",
+  "groups.pending.label": "Ventende forespørsler",
   "groups.popular.label": "Foreslåtte grupper",
   "groups.search.placeholder": "Søk i mine grupper",
   "hashtag.column_header.tag_mode.all": "og {additional}",
@@ -895,15 +934,22 @@
   "login_form.header": "Sign In",
   "manage_group.blocked_members": "Blokkerte medlemmer",
   "manage_group.confirmation.copy": "Kopier lenke",
+  "manage_group.confirmation.info_1": "Som eieren av gruppen kan du endre brukerroller, slette innlegg, med mer.",
+  "manage_group.confirmation.info_2": "Begynn med det første innlegget i gruppen og få fart på samtalen.",
+  "manage_group.confirmation.info_3": "Del din nye gruppe med venner, familie og følgere for å øke medlemsmassen.",
   "manage_group.confirmation.share": "Del denne gruppen",
+  "manage_group.confirmation.title": "Du er klar.",
   "manage_group.create": "Opprette",
   "manage_group.delete_group": "Slett gruppe",
   "manage_group.done": "Ferdig",
   "manage_group.edit_group": "Rediger gruppe",
   "manage_group.edit_success": "Gruppen ble redigert",
+  "manage_group.fields.cannot_change_hint": "Dette kan ikke endres etter at gruppen er opprettet.",
   "manage_group.fields.description_label": "Beskrivelse",
   "manage_group.fields.description_placeholder": "Beskrivelse",
+  "manage_group.fields.name_help": "Dette kan ikke endres etter at gruppen er opprettet.",
   "manage_group.fields.name_label": "Gruppenavn (påkrevd)",
+  "manage_group.fields.name_label_optional": "Gruppenavn",
   "manage_group.fields.name_placeholder": "Navn på gruppe",
   "manage_group.get_started": "La oss komme i gang!",
   "manage_group.next": "Neste",
@@ -1177,6 +1223,8 @@
   "remote_instance.pin_host": "Pin {host}",
   "remote_instance.unpin_host": "Løsne {host}",
   "remote_interaction.account_placeholder": "Skriv inn brukernavn@domene du vil handle fra",
+  "remote_interaction.dislike": "Gå videre til misliking",
+  "remote_interaction.dislike_title": "Mislik et innlegg annensteds fra",
   "remote_interaction.divider": "or",
   "remote_interaction.event_join": "Fortsett for å bli med",
   "remote_interaction.event_join_title": "Bli med på et arrangement eksternt",
@@ -1360,6 +1408,7 @@
   "status.detailed_status": "Detaljert samtalevisning",
   "status.direct": "Direktemelding @{name}",
   "status.disabled_replies.group_membership": "Bare gruppemedlemmer kan svare",
+  "status.disfavourite": "Mislik",
   "status.edit": "Rediger",
   "status.embed": "Bygge inn",
   "status.external": "View post on {domain}",

From f7da07e69dbc2655334d8c18264d19b6d6fbe389 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 4 Apr 2023 03:54:56 +0200
Subject: [PATCH 097/298] Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/no.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index a4422c189..75958188f 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -819,7 +819,6 @@
   "groups.discover.search.recent_searches.clear_all": "Tøm alt",
   "groups.discover.search.recent_searches.title": "Nylige søk",
   "groups.discover.search.results.groups": "Grupper",
-  "groups.discover.search.results.member_count": "",
   "groups.discover.suggested.empty": "Kunne ikke hente foreslåtte grupper nå. Sjekk igjen senere.",
   "groups.discover.suggested.show_more": "Vis mer",
   "groups.discover.suggested.title": "Foreslått for deg",

From fad828cd3ef3231fb20dc7f3a4d2cf13cfed9bad Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Tue, 4 Apr 2023 13:34:18 +0000
Subject: [PATCH 098/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1540 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 7d1bd916d..8b576b34d 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -351,7 +351,7 @@
   "column.follow_requests": "关注请求",
   "column.followers": "关注者",
   "column.following": "正在关注",
-  "column.group_blocked_members": "已屏蔽成员",
+  "column.group_blocked_members": "已封禁成员",
   "column.group_pending_requests": "待处理的申请",
   "column.groups": "群组",
   "column.home": "主页",
@@ -673,7 +673,7 @@
   "empty_column.follow_recommendations": "似乎暂未有推荐信息，您可以尝试搜索用户或者浏览热门标签。",
   "empty_column.follow_requests": "您没有收到新的关注请求。收到了之后就会显示在这里。",
   "empty_column.group": "此群组还没有帖文。",
-  "empty_column.group_blocks": "此群组还没有屏蔽任何用户。",
+  "empty_column.group_blocks": "此群组还没有封禁任何用户。",
   "empty_column.group_membership_requests": "此群组没有待处理的成员申请。",
   "empty_column.hashtag": "此话题标签下暂时没有内容。",
   "empty_column.home": "您还没有关注任何用户。快看看 {public} ，向其他人问个好吧。",
@@ -778,12 +778,12 @@
   "group.group_mod_kick.success": "已从群组中踢出 @{name}",
   "group.group_mod_promote_mod": "分配 {role} 职务",
   "group.group_mod_reject.fail": "拒绝 @{name} 失败",
-  "group.group_mod_unblock": "解除屏蔽",
-  "group.group_mod_unblock.success": "已从群组中解除屏蔽 @{name}",
+  "group.group_mod_unblock": "解除封禁",
+  "group.group_mod_unblock.success": "已从群组中解除封禁 @{name}",
   "group.header.alt": "群组标题",
   "group.join.private": "申请加入群组",
   "group.join.public": "加入群组",
-  "group.join.request_success": "已申请加入群组",
+  "group.join.request_success": "申请已发送至群组拥有者",
   "group.join.success": "已成功加入群组！",
   "group.leave": "离开群组",
   "group.leave.success": "离开了群组",

From 9071bf0b706595a4c519b804ace66415165da917 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Tue, 4 Apr 2023 17:53:55 +0000
Subject: [PATCH 099/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1541 of 1541 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 8b576b34d..12d4791fd 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -786,6 +786,7 @@
   "group.join.request_success": "申请已发送至群组拥有者",
   "group.join.success": "已成功加入群组！",
   "group.leave": "离开群组",
+  "group.leave.label": "离开",
   "group.leave.success": "离开了群组",
   "group.manage": "管理群组",
   "group.popover.action": "查看群组",

From 2ad79f28deb5aec08bc8df295196d3fc8b908a25 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 4 Apr 2023 19:54:43 +0200
Subject: [PATCH 100/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json    | 3 ---
 app/soapbox/locales/de.json    | 3 ---
 app/soapbox/locales/es.json    | 3 ---
 app/soapbox/locales/it.json    | 3 ---
 app/soapbox/locales/no.json    | 3 ---
 app/soapbox/locales/pl.json    | 1 -
 app/soapbox/locales/zh-CN.json | 3 ---
 7 files changed, 19 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 77d5d69ab..f20d5a1ca 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -944,7 +944,6 @@
   "manage_group.delete_group": "حذف المجموعة",
   "manage_group.done": "‏‎‏‪إنتهى",
   "manage_group.edit_group": "تحرير المجموعة",
-  "manage_group.edit_success": "تم تحرير المجموعة",
   "manage_group.fields.cannot_change_hint": "لا يمكن تغيير هذا بعد إنشاء المجموعة.",
   "manage_group.fields.description_label": "الوصف",
   "manage_group.fields.description_placeholder": "الوصف",
@@ -961,9 +960,7 @@
   "manage_group.privacy.private.label": "خاص (مطلوب موافقة المالك)",
   "manage_group.privacy.public.hint": "قابل للاكتشاف. يمكن لأي شخص الانضمام.",
   "manage_group.privacy.public.label": "عام",
-  "manage_group.submit_success": "تم إنشاء المجموعة",
   "manage_group.tagline": "تربطك المجموعات بالآخرين على أساس الاهتمامات المشتركة.",
-  "manage_group.update": "تحديث",
   "media_panel.empty_message": "لم يُعثر على أيّة وسائط.",
   "media_panel.title": "الوسائط",
   "mfa.confirm.success_message": "تم تأكيد إعدادات المصادقة المتعددة",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index e311c8b6a..9b15656fc 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -838,7 +838,6 @@
   "manage_group.create": "Erstellen",
   "manage_group.delete_group": "Gruppe löschen",
   "manage_group.edit_group": "Gruppe bearbeiten",
-  "manage_group.edit_success": "Gruppe wurde bearbeitet",
   "manage_group.fields.description_label": "Beschreibung",
   "manage_group.fields.description_placeholder": "Beschreibung",
   "manage_group.fields.name_label": "Gruppennname (Pflichtfeld)",
@@ -852,9 +851,7 @@
   "manage_group.privacy.private.label": "Privat (Bestätigung durch Veranstalter erforderlich)",
   "manage_group.privacy.public.hint": "Gelistet. Jede:r kann teilnehmen.",
   "manage_group.privacy.public.label": "Öffentlich",
-  "manage_group.submit_success": "Die Gruppe wurde erstellt",
   "manage_group.tagline": "Gruppen ermöglichen es dir, neue Leute auf Grundlage gemeinsamer Interessen zu finden.",
-  "manage_group.update": "Update",
   "media_panel.empty_message": "Keine Medien gefunden.",
   "media_panel.title": "Media",
   "mfa.confirm.success_message": "MFA bestätigt",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 2a3734796..4b41887f6 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -935,7 +935,6 @@
   "manage_group.delete_group": "Borrar el grupo",
   "manage_group.done": "Hecho",
   "manage_group.edit_group": "Editar el grupo",
-  "manage_group.edit_success": "El grupo ha sido editado",
   "manage_group.fields.description_label": "Descripción",
   "manage_group.fields.description_placeholder": "Descripción",
   "manage_group.fields.name_label": "Nombre del grupo (obligatorio)",
@@ -949,9 +948,7 @@
   "manage_group.privacy.private.label": "Privado (requiere aprobación del propietario)",
   "manage_group.privacy.public.hint": "Público. Cualquiera puede participar.",
   "manage_group.privacy.public.label": "Público",
-  "manage_group.submit_success": "El grupo se creó",
   "manage_group.tagline": "Los grupos te conectan con otras personas en función de los intereses comunes.",
-  "manage_group.update": "Actualizar",
   "media_panel.empty_message": "No media found.",
   "media_panel.title": "Media",
   "mfa.confirm.success_message": "MFA confirmed",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 343257e05..ecb533320 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -883,7 +883,6 @@
   "manage_group.create": "Crea",
   "manage_group.delete_group": "Elimina gruppo",
   "manage_group.edit_group": "Modifica gruppo",
-  "manage_group.edit_success": "Hai modificato il gruppo",
   "manage_group.fields.description_label": "Descrizione",
   "manage_group.fields.description_placeholder": "Descrizione",
   "manage_group.fields.name_label": "Nome del gruppo (obbligatorio)",
@@ -897,9 +896,7 @@
   "manage_group.privacy.private.label": "Privato (approvazione richiesta)",
   "manage_group.privacy.public.hint": "Esibito, può partecipare chiunque.",
   "manage_group.privacy.public.label": "Pubblico",
-  "manage_group.submit_success": "Hai creato il gruppo",
   "manage_group.tagline": "I gruppi ti collegano ad altre persone con interessi in comune.",
-  "manage_group.update": "Aggiorna",
   "media_panel.empty_message": "Nessun media.",
   "media_panel.title": "Media",
   "mfa.confirm.success_message": "Hai attivato l'autenticazione a due fattori",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 75958188f..c0265b62b 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -942,7 +942,6 @@
   "manage_group.delete_group": "Slett gruppe",
   "manage_group.done": "Ferdig",
   "manage_group.edit_group": "Rediger gruppe",
-  "manage_group.edit_success": "Gruppen ble redigert",
   "manage_group.fields.cannot_change_hint": "Dette kan ikke endres etter at gruppen er opprettet.",
   "manage_group.fields.description_label": "Beskrivelse",
   "manage_group.fields.description_placeholder": "Beskrivelse",
@@ -959,9 +958,7 @@
   "manage_group.privacy.private.label": "Privat (Eierens godkjenning kreves)",
   "manage_group.privacy.public.hint": "Kan oppdages. Alle kan bli med.",
   "manage_group.privacy.public.label": "Offentlig",
-  "manage_group.submit_success": "Gruppa ble opprettet",
   "manage_group.tagline": "Grupper setter deg i kontakt med andre basert på felles interesser.",
-  "manage_group.update": "Oppdater",
   "media_panel.empty_message": "Ingen medier funnet.",
   "media_panel.title": "Media",
   "mfa.confirm.success_message": "MFA bekreftet",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 9ed7732f4..df7f86c52 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -835,7 +835,6 @@
   "manage_group.privacy.public.hint": "Widoczna w mechanizmach odkrywania. Każdy może dołączyć.",
   "manage_group.privacy.public.label": "Publiczna",
   "manage_group.tagline": "Grupy pozwalają łączyć ludzi o podobnych zainteresowaniach.",
-  "manage_group.update": "Aktualizuj",
   "media_panel.empty_message": "Nie znaleziono mediów.",
   "media_panel.title": "Media",
   "mfa.confirm.success_message": "Potwierdzono MFA",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 12d4791fd..ae369966c 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -945,7 +945,6 @@
   "manage_group.delete_group": "删除群组",
   "manage_group.done": "完成",
   "manage_group.edit_group": "编辑群组",
-  "manage_group.edit_success": "群组已编辑",
   "manage_group.fields.cannot_change_hint": "创建群组后此设置将无法更改。",
   "manage_group.fields.description_label": "描述",
   "manage_group.fields.description_placeholder": "描述",
@@ -962,9 +961,7 @@
   "manage_group.privacy.private.label": "私有（需要群组所有者批准）",
   "manage_group.privacy.public.hint": "可发现。任何人都可以加入。",
   "manage_group.privacy.public.label": "公开",
-  "manage_group.submit_success": "群组已创建",
   "manage_group.tagline": "群组根据共同的兴趣将您与他人联系起来。",
-  "manage_group.update": "更新",
   "media_panel.empty_message": "未找到媒体。",
   "media_panel.title": "媒体",
   "mfa.confirm.success_message": "多重身份认证（MFA）已成功启用",

From ac8e6b9bde471087af66d8397b23c10e42b1d8f6 Mon Sep 17 00:00:00 2001
From: jonnysemon <johndevand@tutanota.com>
Date: Wed, 5 Apr 2023 14:25:01 +0000
Subject: [PATCH 101/298] Translated using Weblate (Arabic)

Currently translated at 98.8% (1523 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ar/
---
 app/soapbox/locales/ar.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index f20d5a1ca..d732dfe22 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -779,15 +779,18 @@
   "group.group_mod_promote_mod": "ترقية {role} الرتبة",
   "group.group_mod_reject.fail": "فشل الرفض @{name}",
   "group.group_mod_unblock": "رفع الحظر",
-  "group.group_mod_unblock.success": "أُلْغِيَّ الحظر على @ {name} من المجموعة",
+  "group.group_mod_unblock.success": "أُلْغِيَّ الحظر على @{name} من المجموعة",
   "group.header.alt": "غلاف المجموعة",
   "group.join.private": "طلب الدخول",
   "group.join.public": "الإنضمام إلى المجموعة",
   "group.join.request_success": "طلب الانضمام للمجموعة",
   "group.join.success": "تم الإنضمام إلى المجموعة بنجاح",
   "group.leave": "غادر المجموعة",
+  "group.leave.label": "غادر",
   "group.leave.success": "غادر المجموعة",
   "group.manage": "إدارة المجموعة",
+  "group.member.admin.limit.summary": "يمكنك تعيين ما يصل إلى {count} مشرفين للمجموعة في الوقت الحالي.",
+  "group.member.admin.limit.title": "تم الوصول عدد المسؤولين إلى حد",
   "group.popover.action": "عرض المجموعة",
   "group.popover.summary": "يجب أن تكون عضوًا في المجموعة للرد على هذه الحالة.",
   "group.popover.title": "العضوية مطلوبة",

From 5783676b49231c8547399e87dc82feb0b9ea3b09 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Wed, 5 Apr 2023 14:47:24 +0000
Subject: [PATCH 102/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1540 of 1540 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index ae369966c..361bde5c8 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -789,6 +789,8 @@
   "group.leave.label": "离开",
   "group.leave.success": "离开了群组",
   "group.manage": "管理群组",
+  "group.member.admin.limit.summary": "目前您可以为群组分配最多 {count} 个管理员。",
+  "group.member.admin.limit.title": "已达到管理员个数限制",
   "group.popover.action": "查看群组",
   "group.popover.summary": "您必须是群组成员才能回复此状态。",
   "group.popover.title": "需要成员身份",
@@ -936,7 +938,7 @@
   "login_form.header": "登录",
   "manage_group.blocked_members": "已封禁成员",
   "manage_group.confirmation.copy": "复制链接",
-  "manage_group.confirmation.info_1": "作为此群组的拥有者，你可以指派管理员，删除帖文等等。",
+  "manage_group.confirmation.info_1": "作为此群组的拥有者，你可以分配管理员，删除帖文等等。",
   "manage_group.confirmation.info_2": "发布群组的第一条帖文，开始对话。",
   "manage_group.confirmation.info_3": "与朋友、家人和关注者分享您的新群组，以增加其成员数量。",
   "manage_group.confirmation.share": "分享此群组",

From 66d1c681bca5df1e0c0581d537bf5cf48b813142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 5 Apr 2023 22:19:47 +0000
Subject: [PATCH 103/298] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 97.0% (1499 of 1544 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/nb_NO/
---
 app/soapbox/locales/no.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index c0265b62b..83c890d89 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -786,8 +786,11 @@
   "group.join.request_success": "Har bedt om å bli med i gruppa",
   "group.join.success": "Ble med i gruppa",
   "group.leave": "Forlat gruppa",
+  "group.leave.label": "Forlat",
   "group.leave.success": "Forlot gruppa",
   "group.manage": "Behandle gruppe",
+  "group.member.admin.limit.summary": "Du kan tilknytte maks. {count} administratorer for denne gruppen nå.",
+  "group.member.admin.limit.title": "Administratorgrense nådd",
   "group.popover.action": "Vis gruppe",
   "group.popover.summary": "Du må være medlem av gruppen for å besvare denne statusen.",
   "group.popover.title": "Medlemskap kreves",
@@ -805,6 +808,8 @@
   "group.role.owner": "Eier",
   "group.tabs.all": "Alle",
   "group.tabs.members": "Medlemmer",
+  "group.tags.hint": "Legg til maks. 3 nøkkelord som tjener som kjerneemner for diskusjoner i gruppen.",
+  "group.tags.label": "Etiketter",
   "group.upload_banner": "Last opp bilde",
   "groups.discover.popular.empty": "Kunne ikke hente populære grupper nå. Sjekk igjen senere.",
   "groups.discover.popular.show_more": "Vis mer",
@@ -945,6 +950,7 @@
   "manage_group.fields.cannot_change_hint": "Dette kan ikke endres etter at gruppen er opprettet.",
   "manage_group.fields.description_label": "Beskrivelse",
   "manage_group.fields.description_placeholder": "Beskrivelse",
+  "manage_group.fields.hashtag_placeholder": "Legg til et emne",
   "manage_group.fields.name_help": "Dette kan ikke endres etter at gruppen er opprettet.",
   "manage_group.fields.name_label": "Gruppenavn (påkrevd)",
   "manage_group.fields.name_label_optional": "Gruppenavn",
@@ -958,6 +964,7 @@
   "manage_group.privacy.private.label": "Privat (Eierens godkjenning kreves)",
   "manage_group.privacy.public.hint": "Kan oppdages. Alle kan bli med.",
   "manage_group.privacy.public.label": "Offentlig",
+  "manage_group.success": "Gruppe lagret.",
   "manage_group.tagline": "Grupper setter deg i kontakt med andre basert på felles interesser.",
   "media_panel.empty_message": "Ingen medier funnet.",
   "media_panel.title": "Media",

From 840449b797135d966988e031c112a893f7b473c2 Mon Sep 17 00:00:00 2001
From: Furkan Kalkan <furkan.kalkan3@gmail.com>
Date: Thu, 6 Apr 2023 15:07:25 +0000
Subject: [PATCH 104/298] Translated using Weblate (Turkish)

Currently translated at 92.6% (1431 of 1544 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 289 +++++++++++++++++++++++++++++++++++-
 1 file changed, 287 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 5694eb65b..eed233bec 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -47,6 +47,7 @@
   "account.report": "@{name} adlı kişiyi bildir",
   "account.requested": "Onay Bekleniyor. Takip isteğini iptal etmek için tıklayın",
   "account.requested_small": "Awaiting approval",
+  "account.rss_feed": "RSS beslemesine abone olun",
   "account.search": "Search from @{name}",
   "account.search_self": "Search your posts",
   "account.share": "@{name} kullanıcısının profilini paylaş",
@@ -84,6 +85,12 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
+  "admin.announcements.action": "Duyuru oluşturun",
+  "admin.announcements.all_day": "Tüm gün",
+  "admin.announcements.delete": "Sil",
+  "admin.announcements.edit": "Düzenle",
+  "admin.announcements.ends_at": "Bitiyor:",
+  "admin.announcements.starts_at": "Başlıyor:",
   "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
   "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
   "admin.dashboard.registration_mode.approval_label": "Approval Required",
@@ -100,6 +107,18 @@
   "admin.dashcounters.user_count_label": "total users",
   "admin.dashwidgets.email_list_header": "Email list",
   "admin.dashwidgets.software_header": "Software",
+  "admin.edit_announcement.created": "Duyuru oluşturuldu",
+  "admin.edit_announcement.deleted": "Duyuru silindi",
+  "admin.edit_announcement.fields.all_day_hint": "İşaretlendiğinde, yalnızca zaman aralığındaki tarihler görüntülenir",
+  "admin.edit_announcement.fields.all_day_label": "Tüm gün süren etkinlik",
+  "admin.edit_announcement.fields.content_label": "İçerik",
+  "admin.edit_announcement.fields.content_placeholder": "Duyuru içeriği",
+  "admin.edit_announcement.fields.end_time_label": "Bitiş tarihi",
+  "admin.edit_announcement.fields.end_time_placeholder": "Duyuru şu tarihte sona erer:",
+  "admin.edit_announcement.fields.start_time_label": "Başlangıç tarihi",
+  "admin.edit_announcement.fields.start_time_placeholder": "Duyuru başlıyor:",
+  "admin.edit_announcement.save": "Kaydet",
+  "admin.edit_announcement.updated": "Duyuru düzenlendi",
   "admin.latest_accounts_panel.more": "Click to see {count} {count, plural, one {account} other {accounts}}",
   "admin.latest_accounts_panel.title": "Latest Accounts",
   "admin.moderation_log.empty_message": "You have not performed any moderation actions yet. When you do, a history will be shown here.",
@@ -108,12 +127,15 @@
   "admin.reports.empty_message": "There are no open reports. If a user gets reported, they will show up here.",
   "admin.reports.report_closed_message": "Report on @{name} was closed",
   "admin.reports.report_title": "Report on {acct}",
+  "admin.software.backend": "Arka uç",
+  "admin.software.frontend": "Önyüz",
   "admin.statuses.actions.delete_status": "Delete post",
   "admin.statuses.actions.mark_status_not_sensitive": "Mark post not sensitive",
   "admin.statuses.actions.mark_status_sensitive": "Mark post sensitive",
   "admin.statuses.status_deleted_message": "Post by @{acct} was deleted",
   "admin.statuses.status_marked_message_not_sensitive": "Post by @{acct} was marked not sensitive",
   "admin.statuses.status_marked_message_sensitive": "Post by @{acct} was marked sensitive",
+  "admin.theme.title": "Tema",
   "admin.user_index.empty": "No users found.",
   "admin.user_index.search_input_placeholder": "Who are you looking for?",
   "admin.users.actions.deactivate_user": "Deactivate @{name}",
@@ -134,7 +156,7 @@
   "admin_nav.awaiting_approval": "Awaiting Approval",
   "admin_nav.dashboard": "Dashboard",
   "admin_nav.reports": "Reports",
-  "age_verification.body": "{siteTitle} requires users to be at least {ageMinimum} years old to access its platform. Anyone under the age of {ageMinimum} years old cannot access this platform.",
+  "age_verification.body": "{siteTitle} platformuna erişmek için kullanıcıların en az {ageMinimum} yaşında olmasını gerektirir. {ageMinimum} yaşından küçükler bu platforma erişemez.",
   "age_verification.fail": "You must be {ageMinimum, plural, one {# year} other {# years}} old or older.",
   "age_verification.header": "Enter your birth date",
   "alert.unexpected.body": "We're sorry for the interruption. If the problem persists, please reach out to our support team. You may also try to {clearCookies} (this will log you out).",
@@ -164,9 +186,11 @@
   "app_create.scopes_placeholder": "e.g. 'read write follow'",
   "app_create.submit": "Create app",
   "app_create.website_label": "Website",
+  "auth.awaiting_approval": "Hesabınız onay bekliyor",
   "auth.invalid_credentials": "Wrong username or password",
   "auth.logged_out": "Logged out.",
   "auth_layout.register": "Create an account",
+  "authorize.success": "Onaylandı",
   "backups.actions.create": "Create backup",
   "backups.empty_message": "No backups found. {action}",
   "backups.empty_message.action": "Create one now?",
@@ -183,13 +207,52 @@
   "bundle_modal_error.message": "Bu bileşen yüklenirken bir şeyler ters gitti.",
   "bundle_modal_error.retry": "Tekrar deneyin",
   "card.back.label": "Back",
+  "chat.actions.send": "Gönder",
+  "chat.failed_to_send": "Mesaj gönderilirken hata oluştu.",
+  "chat.input.placeholder": "Mesaj giriniz",
+  "chat.new_message.title": "Yeni Mesaj",
+  "chat.page_settings.play_sounds.label": "Mesaj geldiğinde ses çıkar",
+  "chat.page_settings.preferences": "Tercihler",
+  "chat.page_settings.privacy": "Gizlilik",
+  "chat.page_settings.submit": "Kaydet",
+  "chat_settings.auto_delete.hint": "Gönderilen mesajlar seçilen zaman periyodundan sonra otomatik olarak silinecektir",
+  "chat_settings.auto_delete.label": "Mesajları otomatik sil",
+  "chat_settings.block.confirm": "Engelle",
+  "chat_settings.block.heading": "@{acct} Engelle",
+  "chat_settings.block.message": "Engellemek bu profilden gelecek özel mesajları ve profil görüntülenmelerini engelleyecektir. Kararınızı değiştirirseniz daha sonra engeli kaldırabilirsiniz.",
+  "chat_settings.leave.confirm": "Sohbetten ayrıl",
+  "chat_settings.leave.heading": "Sohbetten Ayrıl",
+  "chat_settings.leave.message": "Bu sohbetten ayrılmaktan emin misiniz? Ayrıldığınızda sohbet ve mesajlar gelen kutunuzdan kaldırılacaktır.",
+  "chat_settings.options.block_user": "@{acct} Engelle",
+  "chat_settings.options.leave_chat": "Sohbetten Ayrıl",
+  "chat_settings.options.report_user": "@{acct} Raporla",
+  "chat_settings.options.unblock_user": "Engeli Kaldır @{acct}",
+  "chat_settings.title": "Sohbet Detayları",
+  "chat_settings.unblock.confirm": "Engeli Kaldır",
+  "chat_settings.unblock.heading": "Engeli Kaldır @{acct}",
+  "chat_settings.unblock.message": "Engeli kaldırmak bu profilin gönderilerinizi görmesine ve size özel mesaj göndermesine izin verir.",
+  "chats.actions.copy": "Kopyala",
   "chats.actions.delete": "Delete message",
+  "chats.actions.deleteForMe": "Benden kaldır",
   "chats.actions.more": "More",
   "chats.actions.report": "Report user",
   "chats.dividers.today": "Today",
+  "chats.main.blankslate.title": "Henüz mesaj yok",
+  "chats.main.blankslate_with_chats.subtitle": "Açık sohbetlerinizden birini seçin veya yeni bir mesaj oluşturun.",
+  "chats.main.blankslate_with_chats.title": "Sohbet seçiniz",
   "chats.search_placeholder": "Start a chat with…",
+  "colum.filters.expiration.1800": "30 dakika",
+  "colum.filters.expiration.21600": "6 saat",
+  "colum.filters.expiration.3600": "1 saat",
+  "colum.filters.expiration.43200": "12 saat",
+  "colum.filters.expiration.604800": "1 hafta",
+  "colum.filters.expiration.86400": "1 gün",
+  "colum.filters.expiration.never": "Asla",
+  "column.admin.announcements": "Duyurular",
   "column.admin.awaiting_approval": "Awaiting Approval",
+  "column.admin.create_announcement": "Duyuru oluşturun",
   "column.admin.dashboard": "Dashboard",
+  "column.admin.edit_announcement": "Duyuruyu düzenle",
   "column.admin.moderation_log": "Moderation Log",
   "column.admin.reports": "Reports",
   "column.admin.reports.menu.moderation_log": "Moderation Log",
@@ -214,12 +277,16 @@
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Gizli alan adları",
   "column.edit_profile": "Edit profile",
+  "column.event_map": "Etkinlik konumu",
+  "column.event_participants": "Etkinlik katılımcıları",
+  "column.events": "Etkinlikler",
   "column.export_data": "Export data",
   "column.familiar_followers": "People you know following {name}",
   "column.favourited_statuses": "Liked posts",
   "column.favourites": "Likes",
   "column.federation_restrictions": "Federation Restrictions",
   "column.filters": "Muted words",
+  "column.filters.accounts": "Hesaplar",
   "column.filters.add_new": "Add New Filter",
   "column.filters.conversations": "Conversations",
   "column.filters.create_error": "Error adding filter",
@@ -227,19 +294,29 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
+  "column.filters.edit": "Düzenle",
   "column.filters.expires": "Expire after",
+  "column.filters.hide_header": "Tamamen gizle",
+  "column.filters.hide_hint": "Uyarı göstermek yerine filtrelenen içeriği tamamen gizle",
   "column.filters.home_timeline": "Home timeline",
   "column.filters.keyword": "Keyword or phrase",
+  "column.filters.keywords": "Anahtar kelimeler veya ifadeler",
   "column.filters.notifications": "Notifications",
   "column.filters.public_timeline": "Public timeline",
   "column.filters.subheading_add_new": "Add New Filter",
+  "column.filters.title": "Başlık",
+  "column.filters.whole_word": "Tüm kelime",
   "column.follow_requests": "Takip istekleri",
   "column.followers": "Followers",
   "column.following": "Following",
+  "column.group_blocked_members": "Engellenen üyeler",
+  "column.group_pending_requests": "Bekleyen istekler",
+  "column.groups": "Gruplar",
   "column.home": "Anasayfa",
   "column.import_data": "Import data",
   "column.info": "Server information",
   "column.lists": "Listeler",
+  "column.manage_group": "Grubu yönet",
   "column.mentions": "Mentions",
   "column.mfa": "Multi-Factor Authentication",
   "column.mfa_cancel": "Cancel",
@@ -252,6 +329,7 @@
   "column.pins": "Pinned posts",
   "column.preferences": "Preferences",
   "column.public": "Federe zaman tüneli",
+  "column.quotes": "Alıntıla",
   "column.reactions": "Reactions",
   "column.reblogs": "Reposts",
   "column.scheduled_statuses": "Scheduled Posts",
@@ -264,10 +342,33 @@
   "common.cancel": "Cancel",
   "common.error": "Something isn't right. Try reloading the page.",
   "compare_history_modal.header": "Edit history",
-  "compose.character_counter.title": "Used {chars} out of {maxChars} characters",
+  "compose.character_counter.title": "{chars} /{maxChars} karakter kullanıldı",
   "compose.edit_success": "Your post was edited",
   "compose.invalid_schedule": "You must schedule a post at least 5 minutes out.",
   "compose.submit_success": "Your post was sent",
+  "compose_event.create": "Oluştur",
+  "compose_event.edit_success": "Etkinliğiniz düzenlendi",
+  "compose_event.fields.approval_required": "Katılım isteklerini elle onaylamak istiyorum",
+  "compose_event.fields.banner_label": "Etkinlik afişi",
+  "compose_event.fields.description_hint": "Markdown sözdizimi destekleniyor",
+  "compose_event.fields.description_label": "Etkinlik açıklaması",
+  "compose_event.fields.description_placeholder": "Açıklama",
+  "compose_event.fields.end_time_label": "Etkinlik bitiş tarihi",
+  "compose_event.fields.end_time_placeholder": "Etkinlik şu tarihte sona eriyor:…",
+  "compose_event.fields.has_end_time": "Etkinliğin bitiş tarihi var",
+  "compose_event.fields.location_label": "Etkinlik konumu",
+  "compose_event.fields.name_label": "Etkinlik adı",
+  "compose_event.fields.name_placeholder": "Etkinlik adı",
+  "compose_event.fields.start_time_label": "Etkinlik başlangıç tarihi",
+  "compose_event.fields.start_time_placeholder": "Etkinlik şu tarihte başlıyor…",
+  "compose_event.participation_requests.authorize": "Yetkilendir",
+  "compose_event.participation_requests.reject": "Reddet",
+  "compose_event.reset_location": "Konumu sıfırla",
+  "compose_event.submit_success": "Etkinliğiniz oluşturuldu",
+  "compose_event.tabs.edit": "Detayları düzenle",
+  "compose_event.tabs.pending": "İstekleri yönet",
+  "compose_event.update": "Güncelle",
+  "compose_event.upload_banner": "Etkinlik başlık resmi yükleyiniz",
   "compose_form.direct_message_warning": "Bu gönderi sadece belirtilen kullanıcılara gönderilecektir.",
   "compose_form.hashtag_warning": "Bu paylaşım liste dışı olduğu için hiç bir hashtag'de yer almayacak. Sadece herkese açık gönderiler hashtaglerde bulunabilir.",
   "compose_form.lock_disclaimer": "Hesabınız {locked} değil. Sadece takipçilerle paylaştığınız gönderileri görebilmek için sizi herhangi bir kullanıcı takip edebilir.",
@@ -297,10 +398,14 @@
   "compose_form.spoiler_placeholder": "İçerik uyarısı",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
+  "compose_group.share_to_followers": "Takipçilerimle paylaş",
   "confirmation_modal.cancel": "İptal",
   "confirmations.admin.deactivate_user.confirm": "Deactivate @{name}",
   "confirmations.admin.deactivate_user.heading": "Deactivate @{acct}",
   "confirmations.admin.deactivate_user.message": "You are about to deactivate @{acct}. Deactivating a user is a reversible action.",
+  "confirmations.admin.delete_announcement.confirm": "Sil",
+  "confirmations.admin.delete_announcement.heading": "Duyuruyu sil",
+  "confirmations.admin.delete_announcement.message": "Duyuruyu silmek istediğinizden emin misiniz?",
   "confirmations.admin.delete_local_user.checkbox": "I understand that I am about to delete a local user.",
   "confirmations.admin.delete_status.confirm": "Delete post",
   "confirmations.admin.delete_status.heading": "Delete post",
@@ -321,18 +426,40 @@
   "confirmations.block.confirm": "Engelle",
   "confirmations.block.heading": "Block @{name}",
   "confirmations.block.message": "{name} kullanıcısını engellemek istiyor musunuz?",
+  "confirmations.block_from_group.confirm": "Engelle",
+  "confirmations.block_from_group.heading": "Gruptan Engelle",
+  "confirmations.block_from_group.message": "@{name} kullanıcısının bu grupla etkileşime girmesini engellemek istediğinizden emin misiniz?",
+  "confirmations.cancel.message": "Bu gönderiyi oluşturmayı iptal etmek istediğinizden emin misiniz?",
   "confirmations.cancel_editing.confirm": "Cancel editing",
   "confirmations.cancel_editing.heading": "Cancel post editing",
   "confirmations.cancel_editing.message": "Are you sure you want to cancel editing this post? All changes will be lost.",
+  "confirmations.cancel_event_editing.heading": "Etkinlik düzenlemeyi iptal et",
+  "confirmations.cancel_event_editing.message": "Bu etkinliği düzenlemeyi iptal etmek istediğinizden emin misiniz? Tüm değişiklikler kaybolacak.",
   "confirmations.delete.confirm": "Sil",
   "confirmations.delete.heading": "Delete post",
   "confirmations.delete.message": "Bu gönderiyi silmek istiyor musunuz?",
+  "confirmations.delete_event.confirm": "Sil",
+  "confirmations.delete_event.heading": "Etkinliği sil",
+  "confirmations.delete_event.message": "Bu etkinliği silmek istediğinizden emin misiniz?",
+  "confirmations.delete_from_group.heading": "Gruptan sil",
+  "confirmations.delete_from_group.message": "@{name} kullanıcısının gönderisini silmek istediğinizden emin misiniz?",
+  "confirmations.delete_group.confirm": "Sil",
+  "confirmations.delete_group.heading": "Grubu sil",
+  "confirmations.delete_group.message": "Bu grubu silmek istediğinizden emin misiniz? Bu, geri alınamayan kalıcı bir eylemdir.",
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.heading": "Delete list",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinize emin misiniz?",
   "confirmations.domain_block.confirm": "Alan adının tamamını gizle",
   "confirmations.domain_block.heading": "Block {domain}",
   "confirmations.domain_block.message": "tüm {domain} alan adını engellemek istediğinizden emin misiniz? Genellikle birkaç hedefli engel ve susturma işi görür ve tercih edilir.",
+  "confirmations.kick_from_group.confirm": "Gruptan At",
+  "confirmations.kick_from_group.heading": "Grup üyesini gruptan at",
+  "confirmations.kick_from_group.message": "@{name} kullanıcısını gruptan atmak istediğinizden emin misiniz?",
+  "confirmations.leave_event.confirm": "Etkinlikten ayrıl",
+  "confirmations.leave_event.message": "Etkinliğe yeniden katılmak isterseniz, istek tekrar incelenecektir. Devam etmek istediğinizden emin misiniz?",
+  "confirmations.leave_group.confirm": "Ayrıl",
+  "confirmations.leave_group.heading": "Gruptan ayrılın",
+  "confirmations.leave_group.message": "Gruptan ayrılmak üzeresiniz. Devam etmek istiyor musunuz?",
   "confirmations.mute.confirm": "Sessize al",
   "confirmations.mute.heading": "Mute @{name}",
   "confirmations.mute.message": "{name} kullanıcısını sessize almak istiyor musunuz?",
@@ -380,6 +507,7 @@
   "developers.navigation.network_error_label": "Network error",
   "developers.navigation.service_worker_label": "Service Worker",
   "developers.navigation.settings_store_label": "Settings store",
+  "developers.navigation.show_toast": "Açılır bildirimi tetikle",
   "developers.navigation.test_timeline_label": "Test timeline",
   "developers.settings_store.advanced": "Advanced settings",
   "developers.settings_store.hint": "It is possible to directly edit your user settings here. BE CAREFUL! Editing this section can break your account, and you will only be able to recover through the API.",
@@ -454,6 +582,7 @@
   "email_verifilcation.exists": "This email has already been taken.",
   "embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
   "emoji_button.activity": "Aktivite",
+  "emoji_button.add_custom": "Özel emoji ekle",
   "emoji_button.custom": "Özel",
   "emoji_button.flags": "Bayraklar",
   "emoji_button.food": "Yiyecek ve İçecek",
@@ -461,16 +590,21 @@
   "emoji_button.nature": "Doğa",
   "emoji_button.not_found": "İfade yok!! (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "Nesneler",
+  "emoji_button.oh_no": "Olamaz!",
   "emoji_button.people": "İnsanlar",
+  "emoji_button.pick": "Bir emoji seç…",
   "emoji_button.recent": "Sık kullanılan",
   "emoji_button.search": "Ara...",
   "emoji_button.search_results": "Arama sonuçları",
+  "emoji_button.skins_1": "Varsayılan",
+  "emoji_button.skins_choose": "Varsayılan cilt tonunu seçin",
   "emoji_button.symbols": "Semboller",
   "emoji_button.travel": "Seyahat ve Yerler",
   "empty_column.account_blocked": "You are blocked by @{accountUsername}.",
   "empty_column.account_favourited_statuses": "This user doesn't have any liked posts yet.",
   "empty_column.account_timeline": "Burada hiç gönderi yok!",
   "empty_column.account_unavailable": "Profil kullanılamıyor",
+  "empty_column.admin.announcements": "Henüz bir duyuru yok.",
   "empty_column.aliases": "You haven't created any account alias yet.",
   "empty_column.aliases.suggestions": "There are no account suggestions available for the provided term.",
   "empty_column.blocks": "Henüz bir kullanıcıyı engellemediniz.",
@@ -478,11 +612,16 @@
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
   "empty_column.direct": "Henüz doğrudan mesajınız yok. Bir tane gönderdiğinizde veya aldığınızda burada görünecektir.",
   "empty_column.domain_blocks": "Henüz hiçbir gizli alan adı yok.",
+  "empty_column.event_participant_requests": "Bekleyen etkinlik katılım isteği yok.",
+  "empty_column.event_participants": "Bu etkinliğe henüz kimse katılmadı. Birisi katıldığında, burada görünecektir.",
   "empty_column.favourited_statuses": "Hiç favori gönderiminiz yok. Bir tane olursa burada görünecek.",
   "empty_column.favourites": "Kimse bu gönderiyi favorilerine eklememiş. Biri eklerse burada görünecek.",
   "empty_column.filters": "You haven't created any muted words yet.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "Hiç takip isteğiniz yok. Bir tane aldığınızda burada görünecek.",
+  "empty_column.group": "Bu grupta henüz bir gönderi yok.",
+  "empty_column.group_blocks": "Grup henüz hiçbir kullanıcıyı engellemedi.",
+  "empty_column.group_membership_requests": "Bu grup için bekleyen üyelik talebi bulunmamaktadır.",
   "empty_column.hashtag": "Henüz bu hashtag’e sahip hiçbir gönderi yok.",
   "empty_column.home": "Henüz kimseyi takip etmiyorsunuz. {public} ziyaret edebilir veya arama kısmını kullanarak diğer kullanıcılarla iletişime geçebilirsiniz.",
   "empty_column.home.local_tab": "the {site_title} tab",
@@ -494,12 +633,36 @@
   "empty_column.notifications": "Henüz hiçbir bildiriminiz yok. Diğer insanlarla sobhet edebilmek için etkileşime geçebilirsiniz.",
   "empty_column.notifications_filtered": "You don't have any notifications of this type yet.",
   "empty_column.public": "Burada hiçbir şey yok! Herkese açık bir şeyler yazın veya burayı doldurmak için diğer sunuculardaki kullanıcıları takip edin",
+  "empty_column.quotes": "Bu gönderi henüz alıntılanmadı.",
   "empty_column.remote": "There is nothing here! Manually follow users from {instance} to fill it up.",
   "empty_column.scheduled_statuses": "You don't have any scheduled statuses yet. When you add one, it will show up here.",
   "empty_column.search.accounts": "There are no people results for \"{term}\"",
+  "empty_column.search.groups": "\"{term}\" için grup sonucu yok",
   "empty_column.search.hashtags": "There are no hashtags results for \"{term}\"",
   "empty_column.search.statuses": "There are no posts results for \"{term}\"",
   "empty_column.test": "The test timeline is empty.",
+  "event.banner": "Etkinlik afişi",
+  "event.copy": "Etkinliğin bağlantısını kopyala",
+  "event.date": "Tarih",
+  "event.description": "Açıklama",
+  "event.discussion.empty": "Henüz kimse bu etkinliğe yorum yapmadı. Birisi yotum yaptığında, burada görünecektir.",
+  "event.export_ics": "Takviminize aktarın",
+  "event.external": "{domain} üzerindeki etkinliği görün",
+  "event.join_state.accept": "Gidiyorum",
+  "event.join_state.empty": "Katılımcı",
+  "event.location": "Konum",
+  "event.manage": "Yönet",
+  "event.organized_by": "{name} tarafından organize edildi",
+  "event.quote": "Etkinliği alıntıla",
+  "event.reblog": "Etkşnliği yeniden paylaş",
+  "event.show_on_map": "Haritada göster",
+  "event.website": "Harici bağlantılar",
+  "event_map.navigate": "Gezin",
+  "events.create_event": "Etkinlik oluştur",
+  "events.joined_events": "Katılınan etkinlikler",
+  "events.joined_events.empty": "Henüz herhangi bir etkinliğe katılmadınız.",
+  "events.recent_events": "Yakındaki etkinlikler",
+  "events.recent_events.empty": "Henüz halka açık bir etkinlik yok.",
   "export_data.actions.export": "Export",
   "export_data.actions.export_blocks": "Export blocks",
   "export_data.actions.export_follows": "Export follows",
@@ -530,9 +693,14 @@
   "filters.added": "Filter added.",
   "filters.context_header": "Filter contexts",
   "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.create_filter": "Filtre oluştur",
   "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_drop": "Drop",
+  "filters.filters_list_expired": "Süresi doldu",
   "filters.filters_list_hide": "Hide",
+  "filters.filters_list_hide_completely": "İçeriği gizle",
+  "filters.filters_list_phrases_label": "Anahtar kelimeler veya ifadeler:",
+  "filters.filters_list_warn": "Uyarı göster",
   "filters.removed": "Filter deleted.",
   "followRecommendations.heading": "Suggested Profiles",
   "follow_request.authorize": "Yetkilendir",
@@ -542,6 +710,70 @@
   "gdpr.message": "{siteTitle} uses session cookies, which are essential to the website's functioning.",
   "gdpr.title": "{siteTitle} uses cookies",
   "getting_started.open_source_notice": "{code_name} açık kaynaklı bir yazılımdır. Gitlab {code_link} (v{code_version}).",
+  "group.cancel_request": "Talebi iptal et",
+  "group.delete.success": "Grup başarıyla silindi",
+  "group.demote.user.success": "@{name} artık bir üye",
+  "group.group_mod_authorize.fail": "@{name} onaylanamadı",
+  "group.group_mod_block": "@{name} kullanıcısını gruptan engelle",
+  "group.group_mod_block.success": "@{name} engellendi",
+  "group.group_mod_kick": "@{name} kullanıcısını gruptan at",
+  "group.group_mod_kick.success": "@{name} kullanıcısı gruptan atıldı",
+  "group.group_mod_reject.fail": "@{name} reddedilemedi",
+  "group.group_mod_unblock": "Engellemeyi Kaldır",
+  "group.group_mod_unblock.success": "@{name} kullanıcısının gruptaki engeli kaldırıldı",
+  "group.header.alt": "Grup başlığı",
+  "group.join.private": "Erişim İsteği",
+  "group.join.public": "Gruba Katıl",
+  "group.join.request_success": "Gruba katılma isteği grup sahibine iletildi",
+  "group.leave": "Gruptan ayrıl",
+  "group.leave.label": "Ayrıl",
+  "group.leave.success": "Gruptan ayrıldı",
+  "group.manage": "Grubu Yönet",
+  "group.member.admin.limit.summary": "Şu an için gruba en fazla {count} yönetici atayabilirsiniz.",
+  "group.member.admin.limit.title": "Yönetici sınırına ulaşıldı",
+  "group.popover.action": "Grubu Görüntüle",
+  "group.popover.summary": "Bu gönderiye yanıt verebilmek için grup üyesi olmanız gerekmektedir.",
+  "group.popover.title": "Üyelik gerekli",
+  "group.privacy.locked": "Özel",
+  "group.privacy.locked.full": "Özel Grup",
+  "group.privacy.locked.info": "Keşfedilebilir. Kullanıcılar, talepleri onaylandıktan sonra katılabilirler.",
+  "group.privacy.public": "Herkese açık",
+  "group.privacy.public.full": "Herkese Açık Grup",
+  "group.privacy.public.info": "Keşfedilebilir. Herkes katılabilir.",
+  "group.promote.admin.confirmation.message": "Yönetici rolünü @{name}'e atamak istediğinizden emin misiniz?",
+  "group.promote.admin.confirmation.title": "Yönetici Rolü Atama",
+  "group.promote.admin.success": "@{name} artık bir yönetici",
+  "group.report.label": "Raporla",
+  "group.role.admin": "Yönetici",
+  "group.role.owner": "Sahibi",
+  "group.tabs.all": "Tümü",
+  "group.tabs.members": "Üyeler",
+  "group.tags.hint": "Grupta temel tartışma konuları olarak kullanılacak en fazla 3 anahtar kelime ekleyin.",
+  "group.tags.label": "Etiketler",
+  "group.upload_banner": "Fotoğraf yükle",
+  "groups.discover.popular.empty": "Şu anda popüler gruplar getirilemiyor. Lütfen daha sonra tekrar kontrol edin.",
+  "groups.discover.popular.show_more": "Daha Fazla Göster",
+  "groups.discover.popular.title": "Popüler Gruplar",
+  "groups.discover.search.error.subtitle": "Lütfen daha sonra tekrar deneyin.",
+  "groups.discover.search.error.title": "Bir hata oluştu",
+  "groups.discover.search.no_results.subtitle": "Başka bir grup aramayı deneyin.",
+  "groups.discover.search.no_results.title": "Eşleşme bulunamadı",
+  "groups.discover.search.placeholder": "Ara",
+  "groups.discover.search.recent_searches.blankslate.subtitle": "Grup adlarını, konuları veya anahtar kelimeleri arama",
+  "groups.discover.search.recent_searches.blankslate.title": "Son arama yok",
+  "groups.discover.search.recent_searches.clear_all": "Tümünü temizle",
+  "groups.discover.search.recent_searches.title": "Son aramalar",
+  "groups.discover.search.results.groups": "Gruplar",
+  "groups.discover.suggested.empty": "Şu anda önerilen gruplar getirilemiyor. Lütfen daha sonra tekrar kontrol edin.",
+  "groups.discover.suggested.show_more": "Daha Fazla Göster",
+  "groups.discover.suggested.title": "Sizin İçin Önerilenler",
+  "groups.empty.subtitle": "Katılabileceğiniz grupları keşfetmeye başlayın veya kendi grubunuzu oluşturun.",
+  "groups.empty.title": "Henüz Grup Yok",
+  "groups.pending.empty.subtitle": "Şu anda bekleyen bir isteğiniz yok.",
+  "groups.pending.empty.title": "Bekleyen istek yok",
+  "groups.pending.label": "Bekleyen İstekler",
+  "groups.popular.label": "Önerilen Gruplar",
+  "groups.search.placeholder": "Gruplarımda Ara",
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
@@ -575,6 +807,11 @@
   "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
   "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
+  "join_event.hint": "Organizatöre neden bu etkinliğe katılmak istediğinizi söyleyebilirsiniz:",
+  "join_event.placeholder": "Organizatöre mesaj",
+  "join_event.request_success": "Etkinliğe katılma isteği gönderildi",
+  "join_event.success": "Etkinliğe katılındı",
+  "join_event.title": "Etkinliğe katıl",
   "keyboard_shortcuts.back": "geriye gitmek için",
   "keyboard_shortcuts.blocked": "engelli kullanıcılar listesini açmak için",
   "keyboard_shortcuts.boost": "boostlamak için",
@@ -623,6 +860,7 @@
   "lists.search": "Takip ettiğiniz kişiler arasından arayın",
   "lists.subheading": "Listeleriniz",
   "loading_indicator.label": "Yükleniyor...",
+  "location_search.placeholder": "Adres ara",
   "login.fields.instance_label": "Instance",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
@@ -637,6 +875,35 @@
   "login_external.errors.instance_fail": "The instance returned an error.",
   "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?",
   "login_form.header": "Sign In",
+  "manage_group.blocked_members": "Engellenen üyeler",
+  "manage_group.confirmation.copy": "Bağlantıyı kopyala",
+  "manage_group.confirmation.info_1": "Bu grubun sahibi olarak yetkili kullanıcı atayabilir, gönderileri silebilir ve çok daha fazlasını yapabilirsiniz.",
+  "manage_group.confirmation.info_2": "Grubun ilk gönderisini yayınlayın ve sohbeti başlatın.",
+  "manage_group.confirmation.info_3": "Üye sayısını artırmak için yeni grubunuzu arkadaşlarınız, aileniz ve takipçilerinizle paylaşın.",
+  "manage_group.confirmation.share": "Bu grubu paylaşın",
+  "manage_group.confirmation.title": "Her şey hazır!",
+  "manage_group.create": "Oluştur",
+  "manage_group.delete_group": "Grubu sil",
+  "manage_group.edit_group": "Grubu düzenle",
+  "manage_group.fields.cannot_change_hint": "Grup oluşturulduktan sonra bu değiştirilemez.",
+  "manage_group.fields.description_label": "Açıklama",
+  "manage_group.fields.description_placeholder": "Açıklama",
+  "manage_group.fields.hashtag_placeholder": "Bir konu ekleyin",
+  "manage_group.fields.name_help": "Grup oluşturulduktan sonra bu değiştirilemez.",
+  "manage_group.fields.name_label": "Grup adı (gerekli)",
+  "manage_group.fields.name_label_optional": "Grup adı",
+  "manage_group.fields.name_placeholder": "Grup Adı",
+  "manage_group.get_started": "Haydi başlayalım!",
+  "manage_group.next": "Sonraki",
+  "manage_group.pending_requests": "Bekleyen İstekler",
+  "manage_group.privacy.hint": "Bu ayarlar daha sonra değiştirilemez.",
+  "manage_group.privacy.label": "Gizlilik ayarları",
+  "manage_group.privacy.private.hint": "Keşfedilebilir. Kullanıcılar, talepleri onaylandıktan sonra katılabilirler.",
+  "manage_group.privacy.private.label": "Özel (Grup sahibi onayı gereklidir)",
+  "manage_group.privacy.public.hint": "Keşfedilebilir. Herkes katılabilir.",
+  "manage_group.privacy.public.label": "Herkese açık",
+  "manage_group.success": "Grup kaydedildi!",
+  "manage_group.tagline": "Gruplar sizi ortak ilgi alanlarına göre başkalarıyla buluşturur.",
   "media_panel.empty_message": "No media found.",
   "media_panel.title": "Media",
   "mfa.confirm.success_message": "MFA confirmed",
@@ -671,6 +938,8 @@
   "missing_description_modal.text": "You have not entered a description for all attachments. Continue anyway?",
   "missing_indicator.label": "Bulunamadı",
   "missing_indicator.sublabel": "Bu kaynak bulunamadı",
+  "modals.policy.submit": "Kabul Et ve Devam Et",
+  "modals.policy.updateTitle": "{siteTitle} en son sürümünü puanladınız! Üzerinde çalıştığımız heyecan verici yeni şeyleri gözden geçirmek için bir dakikanızı ayırın.",
   "moderation_overlay.contact": "Contact",
   "moderation_overlay.hide": "Hide content",
   "moderation_overlay.show": "Show Content",
@@ -697,9 +966,13 @@
   "navigation_bar.compose": "Yeni bir gönderi yazın",
   "navigation_bar.compose_direct": "Direct message",
   "navigation_bar.compose_edit": "Edit post",
+  "navigation_bar.compose_event": "Etkinliği yönet",
   "navigation_bar.compose_quote": "Quote post",
   "navigation_bar.compose_reply": "Reply to post",
+  "navigation_bar.create_event": "Yeni etkinlik oluştur",
+  "navigation_bar.create_group": "Grup Oluştur",
   "navigation_bar.domain_blocks": "Gizli alan adları",
+  "navigation_bar.edit_group": "Grubu Düzenle",
   "navigation_bar.favourites": "Favoriler",
   "navigation_bar.filters": "Susturulmuş kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
@@ -711,6 +984,12 @@
   "navigation_bar.preferences": "Tercihler",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "new_event_panel.action": "Etkinlik oluştur",
+  "new_event_panel.subtitle": "Aradığınızı bulamadınız mı? Kendi etkinliğinizi planlayın.",
+  "new_event_panel.title": "Yeni Etkinlik Oluştur",
+  "new_group_panel.action": "Grup oluştur",
+  "new_group_panel.subtitle": "Aradığınızı bulamıyor musunuz? Kendi özel veya genel grubunuzu başlatın.",
+  "new_group_panel.title": "Yeni Grup Oluştur",
   "notification.favourite": "{name} senin durumunu favorilere ekledi",
   "notification.follow": "{name} seni takip ediyor",
   "notification.follow_request": "{name} has requested to follow you",
@@ -721,6 +1000,9 @@
   "notification.others": " + {count} {count, plural, one {other} other {others}}",
   "notification.pleroma:chat_mention": "{name} sent you a message",
   "notification.pleroma:emoji_reaction": "{name} reacted to your post",
+  "notification.pleroma:event_reminder": "Katıldığınız bir etkinlik yakında başlıyor",
+  "notification.pleroma:participation_accepted": "Etkinliğe katılmak için kabul edildiniz",
+  "notification.pleroma:participation_request": "{name} etkinliğinize katılmak istiyor",
   "notification.poll": "Oy verdiğiniz bir anket bitti",
   "notification.reblog": "{name} senin durumunu boost etti",
   "notification.status": "{name} just posted",
@@ -794,6 +1076,8 @@
   "preferences.fields.content_type_label": "Default post format",
   "preferences.fields.delete_modal_label": "Show confirmation dialog before deleting a post",
   "preferences.fields.demetricator_label": "Use Demetricator",
+  "preferences.fields.demo_hint": "Varsayılan Soapbox logosunu ve renk düzenini kullanın. Ekran görüntüsü almak için kullanışlıdır.",
+  "preferences.fields.demo_label": "Demo modu",
   "preferences.fields.display_media.default": "Hide media marked as sensitive",
   "preferences.fields.display_media.hide_all": "Always hide media",
   "preferences.fields.display_media.show_all": "Always show media",
@@ -866,6 +1150,7 @@
   "registrations.unprocessable_entity": "This username has already been taken.",
   "registrations.username.hint": "May only contain A-Z, 0-9, and underscores",
   "registrations.username.label": "Your username",
+  "reject.success": "Reddedildi",
   "relative_time.days": "{number}g",
   "relative_time.hours": "{number}s",
   "relative_time.just_now": "şimdi",

From 790d2e071696a363a82fd8b500003130177efe9f Mon Sep 17 00:00:00 2001
From: Furkan Kalkan <furkan.kalkan3@gmail.com>
Date: Fri, 7 Apr 2023 11:50:00 +0000
Subject: [PATCH 105/298] Translated using Weblate (Turkish)

Currently translated at 99.2% (1533 of 1544 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 861 ++++++++++++++++++++----------------
 1 file changed, 480 insertions(+), 381 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index eed233bec..5619b0bd4 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -1,112 +1,112 @@
 {
-  "about.also_available": "Available in:",
-  "accordion.collapse": "Collapse",
-  "accordion.expand": "Expand",
+  "about.also_available": "Şurada mevcuttur:",
+  "accordion.collapse": "Daralt",
+  "accordion.expand": "Genişlet",
   "account.add_or_remove_from_list": "Listeye ekle veya kaldır",
   "account.badges.bot": "Bot",
-  "account.birthday": "Born {date}",
-  "account.birthday_today": "Birthday is today!",
+  "account.birthday": "{date} tarihinde doğdu",
+  "account.birthday_today": "Doğum günü bugün!",
   "account.block": "@{name} adlı kişiyi engelle",
-  "account.block_domain": "{domain} alanından her şeyi gizle",
+  "account.block_domain": "{domain} alan adından her şeyi gizle",
   "account.blocked": "Engellenmiş",
-  "account.chat": "Chat with @{name}",
-  "account.deactivated": "Deactivated",
-  "account.direct": "Mesaj gönder : @{name}",
-  "account.domain_blocked": "Domain hidden",
+  "account.chat": "@{name} ile sohbet",
+  "account.deactivated": "Devre dışı bırakıldı",
+  "account.direct": "Özel mesaj gönder : @{name}",
+  "account.domain_blocked": "Alan adı gizli",
   "account.edit_profile": "Profili düzenle",
   "account.endorse": "Profildeki özellik",
-  "account.endorse.success": "You are now featuring @{acct} on your profile",
-  "account.familiar_followers": "Followed by {accounts}",
-  "account.familiar_followers.empty": "No one you know follows {name}.",
+  "account.endorse.success": "Artık profilinizde @{acct}'a yer veriyorsunuz",
+  "account.familiar_followers": "{accounts} tarafından takip edildi",
+  "account.familiar_followers.empty": "{name} tanıdığınız kimse tarafından takip edilmiyor.",
   "account.familiar_followers.more": "{count} {count, plural, one {other} other {others}} you follow",
   "account.follow": "Takip et",
-  "account.followers": "Takipçi",
+  "account.followers": "Takipçiler",
   "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
-  "account.follows": "Takip ettikleri",
+  "account.follows": "Takip edilenler",
   "account.follows.empty": "Bu kullanıcı henüz kimseyi takip etmiyor.",
   "account.follows_you": "Seni takip ediyor",
-  "account.header.alt": "Profile header",
-  "account.hide_reblogs": "@{name} kişisinin yinelemelerini gizle",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Bu bağlantının mülkiyeti {date} tarihinde kontrol edildi",
-  "account.locked_info": "Bu hesabın gizlilik durumu kilitli olarak ayarlanmış. Sahibi, onu kimin takip edebileceğini elle inceliyor.",
-  "account.login": "Log in",
+  "account.header.alt": "Profil başlığı",
+  "account.hide_reblogs": "@{name} kişisinin yeniden gönderilerini gizle",
+  "account.last_status": "Son görülme",
+  "account.link_verified_on": "Bu bağlantının sahipliği {date} tarihinde kontrol edildi",
+  "account.locked_info": "Bu hesabın gizlilik durumu kilitli olarak ayarlanmış. Takip istekleri hesap sahibi tarafından onaylanır.",
+  "account.login": "Giriş yap",
   "account.media": "Medya",
-  "account.member_since": "Joined {date}",
+  "account.member_since": "{date} tarihinde katıldı",
   "account.mention": "kullanıcısından bahset",
   "account.mute": "@{name} adlı kişiyi sessize al",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.muted": "Sessize alındı",
+  "account.never_active": "Asla",
   "account.posts": "Gönderi",
   "account.posts_with_replies": "Gönderiler ve yanıtlar",
-  "account.profile": "Profile",
-  "account.profile_external": "View profile on {domain}",
-  "account.register": "Sign up",
-  "account.remote_follow": "Remote follow",
-  "account.remove_from_followers": "Remove this follower",
+  "account.profile": "Profil",
+  "account.profile_external": "Profili {domain} üzerinde görüntüle",
+  "account.register": "Kayıt ol",
+  "account.remote_follow": "Aracılığıyla takip et",
+  "account.remove_from_followers": "Bu takipçiyi kaldır",
   "account.report": "@{name} adlı kişiyi bildir",
   "account.requested": "Onay Bekleniyor. Takip isteğini iptal etmek için tıklayın",
-  "account.requested_small": "Awaiting approval",
+  "account.requested_small": "Onay bekleniyor",
   "account.rss_feed": "RSS beslemesine abone olun",
-  "account.search": "Search from @{name}",
-  "account.search_self": "Search your posts",
+  "account.search": "@{name} içerisinde ara",
+  "account.search_self": "Gönderilerinizi arayın",
   "account.share": "@{name} kullanıcısının profilini paylaş",
-  "account.show_reblogs": "@{name} kullanıcısının yinelemelerini göster",
-  "account.subscribe": "Subscribe to notifications from @{name}",
-  "account.subscribe.failure": "An error occurred trying to subscribe to this account.",
-  "account.subscribe.success": "You have subscribed to this account.",
+  "account.show_reblogs": "@{name} kullanıcısının yeniden gönderilerini göster",
+  "account.subscribe": "@{name} tarafından gönderilen bildirimlere abone olun",
+  "account.subscribe.failure": "Bu hesaba abone olmaya çalışırken bir hata oluştu.",
+  "account.subscribe.success": "Bu hesaba abone oldunuz.",
   "account.unblock": "@{name} adlı kişinin engelini kaldır",
   "account.unblock_domain": "{domain} göster",
-  "account.unendorse": "Profilde özellik yok",
+  "account.unendorse": "Profilde gösterme",
   "account.unendorse.success": "You are no longer featuring @{acct}",
   "account.unfollow": "Takipi bırak",
-  "account.unmute": "@{name} adlı kişinin sesini aç",
-  "account.unsubscribe": "Unsubscribe to notifications from @{name}",
-  "account.unsubscribe.failure": "An error occurred trying to unsubscribe to this account.",
-  "account.unsubscribe.success": "You have unsubscribed from this account.",
-  "account.verified": "Verified Account",
-  "account_gallery.none": "No media to show.",
-  "account_moderation_modal.admin_fe": "Open in AdminFE",
-  "account_moderation_modal.fields.account_role": "Staff level",
-  "account_moderation_modal.fields.badges": "Custom badges",
-  "account_moderation_modal.fields.deactivate": "Deactivate account",
-  "account_moderation_modal.fields.delete": "Delete account",
+  "account.unmute": "@{name} adlı kişiyi sessizden çıkart",
+  "account.unsubscribe": "@{name} tarafından gönderilen bildirimlerin aboneliğinden çıkın",
+  "account.unsubscribe.failure": "Bu hesabın aboneliğinden çıkılırken bir hata oluştu.",
+  "account.unsubscribe.success": "Bu hesabın aboneliğinden çıktınız.",
+  "account.verified": "Onaylanmış Hesap",
+  "account_gallery.none": "Gösterilecek medya yok.",
+  "account_moderation_modal.admin_fe": "Yönetici arayüzünde aç",
+  "account_moderation_modal.fields.account_role": "Yetkili personel seviyesi",
+  "account_moderation_modal.fields.badges": "Özel etiketler",
+  "account_moderation_modal.fields.deactivate": "Hesabı devre dışı bırak",
+  "account_moderation_modal.fields.delete": "Hesabı sil",
   "account_moderation_modal.fields.suggested": "Suggested in people to follow",
-  "account_moderation_modal.fields.verified": "Verified account",
-  "account_moderation_modal.info.id": "ID: {id}",
-  "account_moderation_modal.roles.admin": "Admin",
-  "account_moderation_modal.roles.moderator": "Moderator",
-  "account_moderation_modal.roles.user": "User",
-  "account_moderation_modal.title": "Moderate @{acct}",
-  "account_note.hint": "You can keep notes about this user for yourself (this will not be shared with them):",
-  "account_note.placeholder": "No comment provided",
-  "account_note.save": "Save",
-  "account_note.target": "Note for @{target}",
-  "account_search.placeholder": "Search for an account",
-  "actualStatus.edited": "Edited {date}",
-  "actualStatuses.quote_tombstone": "Post is unavailable.",
+  "account_moderation_modal.fields.verified": "Onaylanmış hesap",
+  "account_moderation_modal.info.id": "Kimlik: {id}",
+  "account_moderation_modal.roles.admin": "Yönetici",
+  "account_moderation_modal.roles.moderator": "Moderatör",
+  "account_moderation_modal.roles.user": "Kullanıcı",
+  "account_moderation_modal.title": "Moderasyon: @{acct}",
+  "account_note.hint": "Bu kullanıcı hakkında kendiniz için notlar tutabilirsiniz (bu, onlarla paylaşılmayacaktır):",
+  "account_note.placeholder": "Yorum sağlanmadı",
+  "account_note.save": "Kaydet",
+  "account_note.target": "@{target} için not",
+  "account_search.placeholder": "Hesap arayın",
+  "actualStatus.edited": "{date} tarihinde düzenlendi",
+  "actualStatuses.quote_tombstone": "Gönderi bulunamadı.",
   "admin.announcements.action": "Duyuru oluşturun",
   "admin.announcements.all_day": "Tüm gün",
   "admin.announcements.delete": "Sil",
   "admin.announcements.edit": "Düzenle",
   "admin.announcements.ends_at": "Bitiyor:",
   "admin.announcements.starts_at": "Başlıyor:",
-  "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.",
-  "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.",
-  "admin.dashboard.registration_mode.approval_label": "Approval Required",
-  "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.",
-  "admin.dashboard.registration_mode.closed_label": "Closed",
-  "admin.dashboard.registration_mode.open_hint": "Anyone can join.",
-  "admin.dashboard.registration_mode.open_label": "Open",
-  "admin.dashboard.registration_mode_label": "Registrations",
-  "admin.dashboard.settings_saved": "Settings saved!",
-  "admin.dashcounters.domain_count_label": "peers",
-  "admin.dashcounters.mau_label": "monthly active users",
-  "admin.dashcounters.retention_label": "user retention",
-  "admin.dashcounters.status_count_label": "posts",
-  "admin.dashcounters.user_count_label": "total users",
-  "admin.dashwidgets.email_list_header": "Email list",
-  "admin.dashwidgets.software_header": "Software",
+  "admin.awaiting_approval.empty_message": "Onay bekleyen kimse yok. Yeni bir kullanıcı kaydolduğunda, onları buradan inceleyebilirsiniz.",
+  "admin.dashboard.registration_mode.approval_hint": "Kullanıcılar kaydolabilir, ancak hesapları yalnızca bir yönetici onayladığında etkinleştirilir.",
+  "admin.dashboard.registration_mode.approval_label": "Onay Gerekli",
+  "admin.dashboard.registration_mode.closed_hint": "Kimse kaydolamaz. Yine de insanları davet edebilirsiniz.",
+  "admin.dashboard.registration_mode.closed_label": "Kapalı",
+  "admin.dashboard.registration_mode.open_hint": "Herkes katılabilir.",
+  "admin.dashboard.registration_mode.open_label": "Açık",
+  "admin.dashboard.registration_mode_label": "Kayıtlar",
+  "admin.dashboard.settings_saved": "Ayarlar kaydedildi!",
+  "admin.dashcounters.domain_count_label": "eşler",
+  "admin.dashcounters.mau_label": "aylık aktif kullanıcılar",
+  "admin.dashcounters.retention_label": "onaylanmış kullanıcı",
+  "admin.dashcounters.status_count_label": "gönderiler",
+  "admin.dashcounters.user_count_label": "toplam kullanıcı",
+  "admin.dashwidgets.email_list_header": "E-posta listesi",
+  "admin.dashwidgets.software_header": "Yazılım",
   "admin.edit_announcement.created": "Duyuru oluşturuldu",
   "admin.edit_announcement.deleted": "Duyuru silindi",
   "admin.edit_announcement.fields.all_day_hint": "İşaretlendiğinde, yalnızca zaman aralığındaki tarihler görüntülenir",
@@ -120,101 +120,136 @@
   "admin.edit_announcement.save": "Kaydet",
   "admin.edit_announcement.updated": "Duyuru düzenlendi",
   "admin.latest_accounts_panel.more": "Click to see {count} {count, plural, one {account} other {accounts}}",
-  "admin.latest_accounts_panel.title": "Latest Accounts",
-  "admin.moderation_log.empty_message": "You have not performed any moderation actions yet. When you do, a history will be shown here.",
-  "admin.reports.actions.close": "Close",
-  "admin.reports.actions.view_status": "View post",
-  "admin.reports.empty_message": "There are no open reports. If a user gets reported, they will show up here.",
-  "admin.reports.report_closed_message": "Report on @{name} was closed",
+  "admin.latest_accounts_panel.title": "Son Hesaplar",
+  "admin.moderation_log.empty_message": "Henüz herhangi bir moderasyon işlemi gerçekleştirmediniz. Bunu yaptığınızda, burada bir geçmiş gösterilecektir.",
+  "admin.reports.actions.close": "Kapat",
+  "admin.reports.actions.view_status": "Gönderiyi gör",
+  "admin.reports.empty_message": "Açık bildirim yok. Bir kullanıcı şikayet edilirse burada görünür.",
+  "admin.reports.report_closed_message": "@{name} hakkındaki bildirim kapatıldı",
   "admin.reports.report_title": "Report on {acct}",
   "admin.software.backend": "Arka uç",
   "admin.software.frontend": "Önyüz",
-  "admin.statuses.actions.delete_status": "Delete post",
-  "admin.statuses.actions.mark_status_not_sensitive": "Mark post not sensitive",
-  "admin.statuses.actions.mark_status_sensitive": "Mark post sensitive",
-  "admin.statuses.status_deleted_message": "Post by @{acct} was deleted",
-  "admin.statuses.status_marked_message_not_sensitive": "Post by @{acct} was marked not sensitive",
-  "admin.statuses.status_marked_message_sensitive": "Post by @{acct} was marked sensitive",
+  "admin.statuses.actions.delete_status": "Gönderiyi sil",
+  "admin.statuses.actions.mark_status_not_sensitive": "Gönderiyi hassas değil olarak işaretle",
+  "admin.statuses.actions.mark_status_sensitive": "Gönderiyi hassas olarak işaretle",
+  "admin.statuses.status_deleted_message": "@{acct} tarafından gönderilen gönderi silindi",
+  "admin.statuses.status_marked_message_not_sensitive": "@{acct} tarafından gönderilen gönderi hassas değil olarak işaretlendi",
+  "admin.statuses.status_marked_message_sensitive": "@{acct} tarafından gönderilen gönderi hassas olarak işaretlendi",
   "admin.theme.title": "Tema",
-  "admin.user_index.empty": "No users found.",
-  "admin.user_index.search_input_placeholder": "Who are you looking for?",
-  "admin.users.actions.deactivate_user": "Deactivate @{name}",
-  "admin.users.actions.delete_user": "Delete @{name}",
-  "admin.users.actions.demote_to_moderator_message": "@{acct} was demoted to a moderator",
-  "admin.users.actions.demote_to_user_message": "@{acct} was demoted to a regular user",
-  "admin.users.actions.promote_to_admin_message": "@{acct} was promoted to an admin",
-  "admin.users.actions.promote_to_moderator_message": "@{acct} was promoted to a moderator",
-  "admin.users.badges_saved_message": "Custom badges updated.",
+  "admin.user_index.empty": "Kullanıcı bulunamadı.",
+  "admin.user_index.search_input_placeholder": "Kimi arıyorsunuz?",
+  "admin.users.actions.deactivate_user": "@{name} kullanıcısını devre dışı bırak",
+  "admin.users.actions.delete_user": "@{name} kullanıcısını sil",
+  "admin.users.actions.demote_to_moderator_message": "@{acct}, moderatörlüğe düşürüldü",
+  "admin.users.actions.demote_to_user_message": "@{acct}, normal kullanıcıya düşürüldü",
+  "admin.users.actions.promote_to_admin_message": "@{acct}, yönetici konumuna yükseltildi",
+  "admin.users.actions.promote_to_moderator_message": "@{acct}, moderatör konumuna yükseltildi",
+  "admin.users.badges_saved_message": "Özel etiketler güncellendi.",
   "admin.users.remove_donor_message": "@{acct} was removed as a donor",
   "admin.users.set_donor_message": "@{acct} was set as a donor",
-  "admin.users.user_deactivated_message": "@{acct} was deactivated",
-  "admin.users.user_deleted_message": "@{acct} was deleted",
-  "admin.users.user_suggested_message": "@{acct} was suggested",
-  "admin.users.user_unsuggested_message": "@{acct} was unsuggested",
-  "admin.users.user_unverified_message": "@{acct} was unverified",
-  "admin.users.user_verified_message": "@{acct} was verified",
-  "admin_nav.awaiting_approval": "Awaiting Approval",
-  "admin_nav.dashboard": "Dashboard",
-  "admin_nav.reports": "Reports",
-  "age_verification.body": "{siteTitle} platformuna erişmek için kullanıcıların en az {ageMinimum} yaşında olmasını gerektirir. {ageMinimum} yaşından küçükler bu platforma erişemez.",
-  "age_verification.fail": "You must be {ageMinimum, plural, one {# year} other {# years}} old or older.",
-  "age_verification.header": "Enter your birth date",
-  "alert.unexpected.body": "We're sorry for the interruption. If the problem persists, please reach out to our support team. You may also try to {clearCookies} (this will log you out).",
-  "alert.unexpected.browser": "Browser",
-  "alert.unexpected.clear_cookies": "clear cookies and browser data",
-  "alert.unexpected.links.help": "Help Center",
-  "alert.unexpected.links.status": "Status",
-  "alert.unexpected.links.support": "Support",
+  "admin.users.user_deactivated_message": "@{acct} devre dışı bırakıldı",
+  "admin.users.user_deleted_message": "@{acct} silindi",
+  "admin.users.user_suggested_message": "@{acct} önerildi",
+  "admin.users.user_unsuggested_message": "@{acct} önerilerden çıkarıldı",
+  "admin.users.user_unverified_message": "@{acct} onaylanmadı",
+  "admin.users.user_verified_message": "@{acct} onaylandı",
+  "admin_nav.awaiting_approval": "Onay Bekleniyor",
+  "admin_nav.dashboard": "Yönetici Paneli",
+  "admin_nav.reports": "Bildirimler",
+  "age_verification.body": "{siteTitle} platformuna erişmek için kullanıcıların en az {ageMinimum} yaşında olması gerekir. {ageMinimum} yaşından küçükler bu platforma erişemez.",
+  "age_verification.fail": "{ageMinimum} yaşında veya daha büyük olmalısınız.",
+  "age_verification.header": "Doğum tarihinizi giriniz",
+  "alert.unexpected.body": "Kesinti için özür dileriz. Sorun devam ederse, lütfen destek ekibimizle iletişime geçin. {clearCookies} işlemini de deneyebilirsiniz (bu işlem oturumunuzu kapatır).",
+  "alert.unexpected.browser": "Tarayıcı",
+  "alert.unexpected.clear_cookies": "çerezleri ve tarayıcı verilerini temizle",
+  "alert.unexpected.links.help": "Yardım Merkezi",
+  "alert.unexpected.links.status": "Durum",
+  "alert.unexpected.links.support": "Destek",
   "alert.unexpected.message": "Beklenmedik bir hata oluştu.",
-  "alert.unexpected.return_home": "Return Home",
-  "aliases.account.add": "Create alias",
-  "aliases.account_label": "Old account:",
-  "aliases.aliases_list_delete": "Unlink alias",
-  "aliases.search": "Search your old account",
-  "aliases.success.add": "Account alias created successfully",
-  "aliases.success.remove": "Account alias removed successfully",
-  "announcements.title": "Announcements",
-  "app_create.name_label": "App name",
-  "app_create.name_placeholder": "e.g. 'Soapbox'",
-  "app_create.redirect_uri_label": "Redirect URIs",
-  "app_create.restart": "Create another",
-  "app_create.results.app_label": "App",
-  "app_create.results.explanation_text": "You created a new app and token! Please copy the credentials somewhere; you will not see them again after navigating away from this page.",
-  "app_create.results.explanation_title": "App created successfully",
+  "alert.unexpected.return_home": "Ana sayfaya dön",
+  "aliases.account.add": "Takma ad oluştur",
+  "aliases.account_label": "Eski hesap:",
+  "aliases.aliases_list_delete": "Takma adın bağlantısını kaldır",
+  "aliases.search": "Eski hesabınızı arayın",
+  "aliases.success.add": "Hesap takma adı başarıyla oluşturuldu",
+  "aliases.success.remove": "Hesap takma adı başarıyla kaldırıldı",
+  "announcements.title": "Duyurular",
+  "app_create.name_label": "Uygulama adı",
+  "app_create.name_placeholder": "Ör: 'Soapbox'",
+  "app_create.redirect_uri_label": "Yönlendirme URI'leri",
+  "app_create.restart": "Başka oluştur",
+  "app_create.results.app_label": "Uygulama",
+  "app_create.results.explanation_text": "Yeni bir uygulama ve token oluşturdunuz! Lütfen kimlik bilgilerini bir yere kopyalayın; bu sayfadan ayrıldıktan sonra onları bir daha görmeyeceksiniz.",
+  "app_create.results.explanation_title": "Uygulama başarıyla oluşturuldu",
   "app_create.results.token_label": "OAuth token",
   "app_create.scopes_label": "Scopes",
-  "app_create.scopes_placeholder": "e.g. 'read write follow'",
-  "app_create.submit": "Create app",
+  "app_create.scopes_placeholder": "Ör: 'read write follow'",
+  "app_create.submit": "Uygulama oluştur",
   "app_create.website_label": "Website",
   "auth.awaiting_approval": "Hesabınız onay bekliyor",
-  "auth.invalid_credentials": "Wrong username or password",
-  "auth.logged_out": "Logged out.",
-  "auth_layout.register": "Create an account",
+  "auth.invalid_credentials": "Kullanıcı adı ya da parola yanlış",
+  "auth.logged_out": "Çıkış yapıldı.",
+  "auth_layout.register": "Hesap oluşturun",
   "authorize.success": "Onaylandı",
-  "backups.actions.create": "Create backup",
-  "backups.empty_message": "No backups found. {action}",
-  "backups.empty_message.action": "Create one now?",
-  "backups.pending": "Pending",
-  "badge_input.placeholder": "Enter a badge…",
-  "birthday_panel.title": "Birthdays",
-  "birthdays_modal.empty": "None of your friends have birthday today.",
+  "backups.actions.create": "Yedek oluştur",
+  "backups.empty_message": "Yedek bulunamadı. {action}",
+  "backups.empty_message.action": "Şimdi bir tane oluştur?",
+  "backups.pending": "Beklemede",
+  "badge_input.placeholder": "Etiket giriniz…",
+  "birthday_panel.title": "Doğum günleri",
+  "birthdays_modal.empty": "Bugün hiçbir arkadaşının doğum günü yok.",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsiniz",
-  "boost_modal.title": "Repost?",
-  "bundle_column_error.body": "Bu bileşen yüklenirken bir şeyler ters gitti.",
-  "bundle_column_error.retry": "Tekrar deneyin",
+  "boost_modal.title": "Yeniden gönderilsin mi?",
+  "bundle_column_error.body": "Bu sayfa yüklenirken bir şeyler ters gitti.",
+  "bundle_column_error.retry": "Tekrar deneyiniz",
   "bundle_column_error.title": "Ağ hatası",
   "bundle_modal_error.close": "Kapat",
   "bundle_modal_error.message": "Bu bileşen yüklenirken bir şeyler ters gitti.",
-  "bundle_modal_error.retry": "Tekrar deneyin",
-  "card.back.label": "Back",
+  "bundle_modal_error.retry": "Tekrar deneyiniz",
+  "card.back.label": "Geri",
   "chat.actions.send": "Gönder",
   "chat.failed_to_send": "Mesaj gönderilirken hata oluştu.",
   "chat.input.placeholder": "Mesaj giriniz",
   "chat.new_message.title": "Yeni Mesaj",
+  "chat.page_settings.accepting_messages.label": "Kullanıcıların sizinle yeni bir sohbet başlatmasına izin verin",
   "chat.page_settings.play_sounds.label": "Mesaj geldiğinde ses çıkar",
   "chat.page_settings.preferences": "Tercihler",
   "chat.page_settings.privacy": "Gizlilik",
   "chat.page_settings.submit": "Kaydet",
+  "chat.page_settings.title": "Mesaj Ayarları",
+  "chat.retry": "Tekrar dene?",
+  "chat.welcome.accepting_messages.label": "Kullanıcıların sizinle yeni bir sohbet başlatmasına izin verin",
+  "chat.welcome.notice": "Bu ayarları daha sonra değiştirebilirsiniz.",
+  "chat.welcome.submit": "Kaydet ve ilerle",
+  "chat_composer.unblock": "Engeli kaldır",
+  "chat_list_item.blocked_you": "Bu kullanıcı sizi engelledi",
+  "chat_list_item.blocking": "Bu kullanıcıyı engellediniz",
+  "chat_message_list.blocked": "Bu kullanıcıyı engellediniz",
+  "chat_message_list.blockedBy": "tarafından engellendin",
+  "chat_message_list.network_failure.action": "Tekrar deneyiniz",
+  "chat_message_list.network_failure.subtitle": "Bir ağ hatasıyla karşılaşıldı.",
+  "chat_message_list.network_failure.title": "Hay aksi!",
+  "chat_message_list_intro.actions.accept": "Kabul et",
+  "chat_message_list_intro.actions.leave_chat": "Sohbetten ayrıl",
+  "chat_message_list_intro.actions.message_lifespan": "{day} günden eski mesajlar silinir.",
+  "chat_message_list_intro.actions.report": "Bildir",
+  "chat_message_list_intro.intro": "seninle sohbet başlatmak istiyor",
+  "chat_message_list_intro.leave_chat.confirm": "Sohbetten Ayrıl",
+  "chat_message_list_intro.leave_chat.heading": "Sohbetten Ayrıl",
+  "chat_message_list_intro.leave_chat.message": "Bu sohbetten ayrılmaktan emin misiniz? Ayrıldığınızda sohbet ve mesajlar gelen kutunuzdan kaldırılacaktır.",
+  "chat_search.blankslate.body": "Sohbet edecek birini arayın.",
+  "chat_search.blankslate.title": "Sohbet başlat",
+  "chat_search.empty_results_blankslate.action": "Birine mesaj gönder",
+  "chat_search.empty_results_blankslate.body": "Başka bir isim aramayı deneyin.",
+  "chat_search.empty_results_blankslate.title": "Eşleşme bulunamadı",
+  "chat_search.placeholder": "Bir isim yazın",
+  "chat_search.title": "Mesajlar",
+  "chat_settings.auto_delete.14days": "14 gün",
+  "chat_settings.auto_delete.2minutes": "2 dakika",
+  "chat_settings.auto_delete.30days": "30 gün",
+  "chat_settings.auto_delete.7days": "7 gün",
+  "chat_settings.auto_delete.90days": "90 gün",
+  "chat_settings.auto_delete.days": "{day} gün",
   "chat_settings.auto_delete.hint": "Gönderilen mesajlar seçilen zaman periyodundan sonra otomatik olarak silinecektir",
   "chat_settings.auto_delete.label": "Mesajları otomatik sil",
   "chat_settings.block.confirm": "Engelle",
@@ -225,22 +260,26 @@
   "chat_settings.leave.message": "Bu sohbetten ayrılmaktan emin misiniz? Ayrıldığınızda sohbet ve mesajlar gelen kutunuzdan kaldırılacaktır.",
   "chat_settings.options.block_user": "@{acct} Engelle",
   "chat_settings.options.leave_chat": "Sohbetten Ayrıl",
-  "chat_settings.options.report_user": "@{acct} Raporla",
+  "chat_settings.options.report_user": "@{acct} Bildir",
   "chat_settings.options.unblock_user": "Engeli Kaldır @{acct}",
   "chat_settings.title": "Sohbet Detayları",
   "chat_settings.unblock.confirm": "Engeli Kaldır",
   "chat_settings.unblock.heading": "Engeli Kaldır @{acct}",
   "chat_settings.unblock.message": "Engeli kaldırmak bu profilin gönderilerinizi görmesine ve size özel mesaj göndermesine izin verir.",
+  "chat_window.auto_delete_label": "{day} gün sonra otomatik sil",
+  "chat_window.auto_delete_tooltip": "Sohbet mesajları, gönderildikten {day} gün sonra otomatik olarak silinecek şekilde ayarlandı.",
   "chats.actions.copy": "Kopyala",
-  "chats.actions.delete": "Delete message",
+  "chats.actions.delete": "Mesajı sil",
   "chats.actions.deleteForMe": "Benden kaldır",
-  "chats.actions.more": "More",
-  "chats.actions.report": "Report user",
-  "chats.dividers.today": "Today",
+  "chats.actions.more": "Daha fazla",
+  "chats.actions.report": "Kullanıcıyı bildir",
+  "chats.dividers.today": "Bugün",
+  "chats.main.blankslate.new_chat": "Birine mesaj gönder",
+  "chats.main.blankslate.subtitle": "Sohbet etmek için birini arayın",
   "chats.main.blankslate.title": "Henüz mesaj yok",
   "chats.main.blankslate_with_chats.subtitle": "Açık sohbetlerinizden birini seçin veya yeni bir mesaj oluşturun.",
   "chats.main.blankslate_with_chats.title": "Sohbet seçiniz",
-  "chats.search_placeholder": "Start a chat with…",
+  "chats.search_placeholder": "Şununla sohbet başlat…",
   "colum.filters.expiration.1800": "30 dakika",
   "colum.filters.expiration.21600": "6 saat",
   "colum.filters.expiration.3600": "1 saat",
@@ -249,106 +288,107 @@
   "colum.filters.expiration.86400": "1 gün",
   "colum.filters.expiration.never": "Asla",
   "column.admin.announcements": "Duyurular",
-  "column.admin.awaiting_approval": "Awaiting Approval",
+  "column.admin.awaiting_approval": "Onay Bekleniyor",
   "column.admin.create_announcement": "Duyuru oluşturun",
-  "column.admin.dashboard": "Dashboard",
+  "column.admin.dashboard": "Yönetici Paneli",
   "column.admin.edit_announcement": "Duyuruyu düzenle",
-  "column.admin.moderation_log": "Moderation Log",
-  "column.admin.reports": "Reports",
-  "column.admin.reports.menu.moderation_log": "Moderation Log",
-  "column.admin.users": "Users",
-  "column.aliases": "Account aliases",
-  "column.aliases.create_error": "Error creating alias",
-  "column.aliases.delete": "Delete",
-  "column.aliases.delete_error": "Error deleting alias",
-  "column.aliases.subheading_add_new": "Add New Alias",
-  "column.aliases.subheading_aliases": "Current aliases",
-  "column.app_create": "Create app",
-  "column.backups": "Backups",
-  "column.birthdays": "Birthdays",
+  "column.admin.moderation_log": "Moderasyon Günlüğü",
+  "column.admin.reports": "Bildirimler",
+  "column.admin.reports.menu.moderation_log": "Moderasyon Günlüğü",
+  "column.admin.users": "Kullanıcılar",
+  "column.aliases": "Hesap takma adları",
+  "column.aliases.create_error": "Takma ad oluşturulurken hata oluştu",
+  "column.aliases.delete": "Sil",
+  "column.aliases.delete_error": "Takma ad silinirken hata oluştu",
+  "column.aliases.subheading_add_new": "Yeni Takma Ad Ekle",
+  "column.aliases.subheading_aliases": "Mevcut takma adlar",
+  "column.app_create": "Uygulama oluştur",
+  "column.backups": "Yedekler",
+  "column.birthdays": "Doğum günleri",
   "column.blocks": "Engellenen kullanıcılar",
-  "column.bookmarks": "Bookmarks",
-  "column.chats": "Chats",
+  "column.bookmarks": "Yer imleri",
+  "column.chats": "Sohbetler",
   "column.community": "Yerel zaman tüneli",
-  "column.crypto_donate": "Donate Cryptocurrency",
-  "column.developers": "Developers",
+  "column.crypto_donate": "Kripto Para Bağışları",
+  "column.developers": "Geliştiriciler",
   "column.developers.service_worker": "Service Worker",
-  "column.direct": "Doğrudan mesajlar",
-  "column.directory": "Browse profiles",
+  "column.direct": "Özel mesajlar",
+  "column.directory": "Profillere göz atın",
+  "column.dislikes": "Beğenmemeler",
   "column.domain_blocks": "Gizli alan adları",
-  "column.edit_profile": "Edit profile",
+  "column.edit_profile": "Profili düzenle",
   "column.event_map": "Etkinlik konumu",
   "column.event_participants": "Etkinlik katılımcıları",
   "column.events": "Etkinlikler",
-  "column.export_data": "Export data",
-  "column.familiar_followers": "People you know following {name}",
-  "column.favourited_statuses": "Liked posts",
-  "column.favourites": "Likes",
-  "column.federation_restrictions": "Federation Restrictions",
-  "column.filters": "Muted words",
+  "column.export_data": "Verileri dışa aktar",
+  "column.familiar_followers": "{name}'i takip eden tanıdığınız kişiler",
+  "column.favourited_statuses": "Beğenilen gönderiler",
+  "column.favourites": "Beğeniler",
+  "column.federation_restrictions": "Federasyon Kısıtlamaları",
+  "column.filters": "Susturulmuş kelimeler",
   "column.filters.accounts": "Hesaplar",
-  "column.filters.add_new": "Add New Filter",
-  "column.filters.conversations": "Conversations",
-  "column.filters.create_error": "Error adding filter",
-  "column.filters.delete": "Delete",
-  "column.filters.delete_error": "Error deleting filter",
+  "column.filters.add_new": "Yeni Filtre Ekle",
+  "column.filters.conversations": "Sohbetler",
+  "column.filters.create_error": "Filtre eklenirken hata oluştu",
+  "column.filters.delete": "Sil",
+  "column.filters.delete_error": "Filtre silinirken hata oluştu",
   "column.filters.drop_header": "Drop instead of hide",
-  "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
+  "column.filters.drop_hint": "Filtrelenen gönderiler, filtre daha sonra kaldırılsa bile geri alınamayacak şekilde kaybolacak",
   "column.filters.edit": "Düzenle",
-  "column.filters.expires": "Expire after",
+  "column.filters.expires": "Şu tarihten sonra sona eriyor:",
   "column.filters.hide_header": "Tamamen gizle",
   "column.filters.hide_hint": "Uyarı göstermek yerine filtrelenen içeriği tamamen gizle",
-  "column.filters.home_timeline": "Home timeline",
-  "column.filters.keyword": "Keyword or phrase",
+  "column.filters.home_timeline": "Ana zaman çizelgesi",
+  "column.filters.keyword": "Anahtar kelime veya ifade",
   "column.filters.keywords": "Anahtar kelimeler veya ifadeler",
-  "column.filters.notifications": "Notifications",
-  "column.filters.public_timeline": "Public timeline",
-  "column.filters.subheading_add_new": "Add New Filter",
+  "column.filters.notifications": "Bildirimler",
+  "column.filters.public_timeline": "Herkese açık zaman çizelgesi",
+  "column.filters.subheading_add_new": "Yeni Filtre Ekle",
   "column.filters.title": "Başlık",
   "column.filters.whole_word": "Tüm kelime",
   "column.follow_requests": "Takip istekleri",
-  "column.followers": "Followers",
-  "column.following": "Following",
-  "column.group_blocked_members": "Engellenen üyeler",
+  "column.followers": "Takipçiler",
+  "column.following": "Takip edilenler",
+  "column.group_blocked_members": "Engellenen Üyeler",
   "column.group_pending_requests": "Bekleyen istekler",
   "column.groups": "Gruplar",
   "column.home": "Anasayfa",
-  "column.import_data": "Import data",
-  "column.info": "Server information",
+  "column.import_data": "Verileri içe aktar",
+  "column.info": "Sunucu bilgisi",
   "column.lists": "Listeler",
   "column.manage_group": "Grubu yönet",
-  "column.mentions": "Mentions",
-  "column.mfa": "Multi-Factor Authentication",
-  "column.mfa_cancel": "Cancel",
-  "column.mfa_confirm_button": "Confirm",
-  "column.mfa_disable_button": "Disable",
-  "column.mfa_setup": "Proceed to Setup",
-  "column.migration": "Account migration",
+  "column.mentions": "Bahsetmeler",
+  "column.mfa": "Çok Faktörlü Kimlik Doğrulama",
+  "column.mfa_cancel": "İptal",
+  "column.mfa_confirm_button": "Onayla",
+  "column.mfa_disable_button": "Devre dışı bırak",
+  "column.mfa_setup": "Kuruluma Devam Edin",
+  "column.migration": "Hesap taşıma",
   "column.mutes": "Susturulmuş kullanıcılar",
   "column.notifications": "Bildirimler",
-  "column.pins": "Pinned posts",
-  "column.preferences": "Preferences",
+  "column.pins": "Sabitlenmiş gönderiler",
+  "column.preferences": "Tercihler",
   "column.public": "Federe zaman tüneli",
   "column.quotes": "Alıntıla",
-  "column.reactions": "Reactions",
-  "column.reblogs": "Reposts",
-  "column.scheduled_statuses": "Scheduled Posts",
-  "column.search": "Search",
-  "column.settings_store": "Settings store",
-  "column.soapbox_config": "Soapbox config",
-  "column.test": "Test timeline",
-  "column_forbidden.body": "You do not have permission to access this page.",
-  "column_forbidden.title": "Forbidden",
-  "common.cancel": "Cancel",
-  "common.error": "Something isn't right. Try reloading the page.",
-  "compare_history_modal.header": "Edit history",
-  "compose.character_counter.title": "{chars} /{maxChars} karakter kullanıldı",
-  "compose.edit_success": "Your post was edited",
-  "compose.invalid_schedule": "You must schedule a post at least 5 minutes out.",
-  "compose.submit_success": "Your post was sent",
+  "column.reactions": "Tepkiler",
+  "column.reblogs": "Yeniden gönderimler",
+  "column.scheduled_statuses": "Planlanmış Gönderiler",
+  "column.search": "Arama",
+  "column.settings_store": "Ayar deposu",
+  "column.soapbox_config": "Soapbox ayarları",
+  "column.test": "Test zaman çizelgesi",
+  "column_forbidden.body": "Bu sayfaya erişim izniniz yok.",
+  "column_forbidden.title": "Yasaklı",
+  "common.cancel": "İptal",
+  "common.error": "Bir sorun var. Sayfayı yeniden yüklemeyi deneyin.",
+  "compare_history_modal.header": "Düzenleme geçmişi",
+  "compose.character_counter.title": "{chars}/{maxChars} karakter kullanıldı",
+  "compose.edit_success": "Gönderiniz düzenlendi",
+  "compose.invalid_schedule": "Bir gönderiyi en az 5 dakika sonrasına planlayabilirsiniz.",
+  "compose.submit_success": "Gönderiniz gönderildi!",
   "compose_event.create": "Oluştur",
   "compose_event.edit_success": "Etkinliğiniz düzenlendi",
-  "compose_event.fields.approval_required": "Katılım isteklerini elle onaylamak istiyorum",
+  "compose_event.fields.approval_required": "Katılım isteklerini kendim onaylamak istiyorum",
   "compose_event.fields.banner_label": "Etkinlik afişi",
   "compose_event.fields.description_hint": "Markdown sözdizimi destekleniyor",
   "compose_event.fields.description_label": "Etkinlik açıklaması",
@@ -362,7 +402,9 @@
   "compose_event.fields.start_time_label": "Etkinlik başlangıç tarihi",
   "compose_event.fields.start_time_placeholder": "Etkinlik şu tarihte başlıyor…",
   "compose_event.participation_requests.authorize": "Yetkilendir",
+  "compose_event.participation_requests.authorize_success": "Kullanıcı kabul edildi",
   "compose_event.participation_requests.reject": "Reddet",
+  "compose_event.participation_requests.reject_success": "Kullanıcı reddedildi",
   "compose_event.reset_location": "Konumu sıfırla",
   "compose_event.submit_success": "Etkinliğiniz oluşturuldu",
   "compose_event.tabs.edit": "Detayları düzenle",
@@ -370,73 +412,76 @@
   "compose_event.update": "Güncelle",
   "compose_event.upload_banner": "Etkinlik başlık resmi yükleyiniz",
   "compose_form.direct_message_warning": "Bu gönderi sadece belirtilen kullanıcılara gönderilecektir.",
+  "compose_form.event_placeholder": "Bu etkinliğe gönder",
   "compose_form.hashtag_warning": "Bu paylaşım liste dışı olduğu için hiç bir hashtag'de yer almayacak. Sadece herkese açık gönderiler hashtaglerde bulunabilir.",
   "compose_form.lock_disclaimer": "Hesabınız {locked} değil. Sadece takipçilerle paylaştığınız gönderileri görebilmek için sizi herhangi bir kullanıcı takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
-  "compose_form.markdown.marked": "Post markdown enabled",
-  "compose_form.markdown.unmarked": "Post markdown disabled",
-  "compose_form.message": "Message",
+  "compose_form.markdown.marked": "Gönderi için markdown formatı etkin",
+  "compose_form.markdown.unmarked": "Gönderi için markdown formatı devre dışı",
+  "compose_form.message": "Mesaj",
   "compose_form.placeholder": "Aklınızdan ne geçiyor?",
   "compose_form.poll.add_option": "Bir seçenek ekleyin",
   "compose_form.poll.duration": "Anket süresi",
-  "compose_form.poll.multiselect": "Multi-Select",
-  "compose_form.poll.multiselect_detail": "Allow users to select multiple answers",
+  "compose_form.poll.multiselect": "Çoklu seçim",
+  "compose_form.poll.multiselect_detail": "Kullanıcıların birden çok yanıt seçmesine izin ver",
   "compose_form.poll.option_placeholder": "Seçim {number}",
-  "compose_form.poll.remove": "Remove poll",
+  "compose_form.poll.remove": "Anketi kaldır",
   "compose_form.poll.remove_option": "Bu seçimi kaldır",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.poll_placeholder": "Add a poll topic...",
+  "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştirin",
+  "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştirin",
+  "compose_form.poll_placeholder": "Anket konusu ekleyin...",
   "compose_form.publish": "Gönder",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.schedule": "Schedule",
-  "compose_form.scheduled_statuses.click_here": "Click here",
-  "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
+  "compose_form.save_changes": "Değişiklikleri kaydet",
+  "compose_form.schedule": "Zamanla",
+  "compose_form.scheduled_statuses.click_here": "Buraya tıklayınız",
+  "compose_form.scheduled_statuses.message": "Planlanmış gönderileriniz var. Onları görmek için {click_here}.",
   "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
   "compose_form.spoiler.unmarked": "Metin gizli değil",
-  "compose_form.spoiler_placeholder": "İçerik uyarısı",
-  "compose_form.spoiler_remove": "Remove sensitive",
-  "compose_form.spoiler_title": "Sensitive content",
+  "compose_form.spoiler_placeholder": "İçerik uyarısı (opsiyonel)",
+  "compose_form.spoiler_remove": "Hassasiyeti kaldır",
+  "compose_form.spoiler_title": "Hassas içerik",
   "compose_group.share_to_followers": "Takipçilerimle paylaş",
   "confirmation_modal.cancel": "İptal",
-  "confirmations.admin.deactivate_user.confirm": "Deactivate @{name}",
-  "confirmations.admin.deactivate_user.heading": "Deactivate @{acct}",
-  "confirmations.admin.deactivate_user.message": "You are about to deactivate @{acct}. Deactivating a user is a reversible action.",
+  "confirmations.admin.deactivate_user.confirm": "@{name} kullanıcısını devre dışı bırak",
+  "confirmations.admin.deactivate_user.heading": "Devre dışı bırak: @{acct}",
+  "confirmations.admin.deactivate_user.message": "@{acct} kullanıcısını devre dışı bırakmak üzeresiniz. Bir kullanıcıyı devre dışı bırakmak geri alınabilir bir işlemdir.",
   "confirmations.admin.delete_announcement.confirm": "Sil",
   "confirmations.admin.delete_announcement.heading": "Duyuruyu sil",
   "confirmations.admin.delete_announcement.message": "Duyuruyu silmek istediğinizden emin misiniz?",
-  "confirmations.admin.delete_local_user.checkbox": "I understand that I am about to delete a local user.",
-  "confirmations.admin.delete_status.confirm": "Delete post",
-  "confirmations.admin.delete_status.heading": "Delete post",
-  "confirmations.admin.delete_status.message": "You are about to delete a post by @{acct}. This action cannot be undone.",
-  "confirmations.admin.delete_user.confirm": "Delete @{name}",
-  "confirmations.admin.delete_user.heading": "Delete @{acct}",
-  "confirmations.admin.delete_user.message": "You are about to delete @{acct}. THIS IS A DESTRUCTIVE ACTION THAT CANNOT BE UNDONE.",
-  "confirmations.admin.mark_status_not_sensitive.confirm": "Mark post not sensitive",
-  "confirmations.admin.mark_status_not_sensitive.heading": "Mark post not sensitive.",
-  "confirmations.admin.mark_status_not_sensitive.message": "You are about to mark a post by @{acct} not sensitive.",
-  "confirmations.admin.mark_status_sensitive.confirm": "Mark post sensitive",
-  "confirmations.admin.mark_status_sensitive.heading": "Mark post sensitive",
-  "confirmations.admin.mark_status_sensitive.message": "You are about to mark a post by @{acct} sensitive.",
-  "confirmations.admin.reject_user.confirm": "Reject @{name}",
-  "confirmations.admin.reject_user.heading": "Reject @{acct}",
-  "confirmations.admin.reject_user.message": "You are about to reject @{acct} registration request. This action cannot be undone.",
-  "confirmations.block.block_and_report": "Engelle & Bildir",
+  "confirmations.admin.delete_local_user.checkbox": "Yerel bir kullanıcıyı silmek üzere olduğumu onaylıyorum.",
+  "confirmations.admin.delete_status.confirm": "Gönderiyi sil",
+  "confirmations.admin.delete_status.heading": "Gönderiyi sil",
+  "confirmations.admin.delete_status.message": "@{acct} tarafından gönderilen bir gönderiyi silmek üzeresiniz. Bu işlem geri alınamaz.",
+  "confirmations.admin.delete_user.confirm": "Sil: @{name}",
+  "confirmations.admin.delete_user.heading": "Sil: @{acct}",
+  "confirmations.admin.delete_user.message": "@{acct} hesabını silmek üzeresiniz. BU, GERİ DÖNÜŞÜ OLMAYAN YIKICI BİR EYLEMDİR.",
+  "confirmations.admin.mark_status_not_sensitive.confirm": "Gönderiyi hassas değil olarak işaretle",
+  "confirmations.admin.mark_status_not_sensitive.heading": "Gönderiyi hassas değil olarak işaretle",
+  "confirmations.admin.mark_status_not_sensitive.message": "@{acct} tarafından gönderilen bir gönderiyi hassas değil olarak işaretlemek üzeresiniz.",
+  "confirmations.admin.mark_status_sensitive.confirm": "Gönderiyi hassas olarak işaretle",
+  "confirmations.admin.mark_status_sensitive.heading": "Gönderiyi hassas olarak işaretle",
+  "confirmations.admin.mark_status_sensitive.message": "@{acct} tarafından gönderilen bir gönderiyi hassas olarak işaretlemek üzeresiniz.",
+  "confirmations.admin.reject_user.confirm": "Reddet: @{name}",
+  "confirmations.admin.reject_user.heading": "Reddet: @{acct}",
+  "confirmations.admin.reject_user.message": "@{acct} tarafından yapılan kayıt isteğini reddetmek üzeresiniz. Bu işlem geri alınamaz.",
+  "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
-  "confirmations.block.heading": "Block @{name}",
-  "confirmations.block.message": "{name} kullanıcısını engellemek istiyor musunuz?",
+  "confirmations.block.heading": "@{name} adlı kişiyi engelle",
+  "confirmations.block.message": "{name} adlı kullanıcıyı engellemek istiyor musunuz?",
   "confirmations.block_from_group.confirm": "Engelle",
   "confirmations.block_from_group.heading": "Gruptan Engelle",
   "confirmations.block_from_group.message": "@{name} kullanıcısının bu grupla etkileşime girmesini engellemek istediğinizden emin misiniz?",
+  "confirmations.cancel.confirm": "İptal et",
+  "confirmations.cancel.heading": "Gönderiyi iptal et",
   "confirmations.cancel.message": "Bu gönderiyi oluşturmayı iptal etmek istediğinizden emin misiniz?",
-  "confirmations.cancel_editing.confirm": "Cancel editing",
-  "confirmations.cancel_editing.heading": "Cancel post editing",
-  "confirmations.cancel_editing.message": "Are you sure you want to cancel editing this post? All changes will be lost.",
+  "confirmations.cancel_editing.confirm": "Düzenlemeyi iptal et",
+  "confirmations.cancel_editing.heading": "Gönderi düzenlemesini iptal et",
+  "confirmations.cancel_editing.message": "Bu gönderiyi düzenlemeyi iptal etmek istediğinize emin misiniz? Tüm değişiklikler kaybolacak.",
   "confirmations.cancel_event_editing.heading": "Etkinlik düzenlemeyi iptal et",
   "confirmations.cancel_event_editing.message": "Bu etkinliği düzenlemeyi iptal etmek istediğinizden emin misiniz? Tüm değişiklikler kaybolacak.",
   "confirmations.delete.confirm": "Sil",
-  "confirmations.delete.heading": "Delete post",
+  "confirmations.delete.heading": "Gönderiyi sil",
   "confirmations.delete.message": "Bu gönderiyi silmek istiyor musunuz?",
   "confirmations.delete_event.confirm": "Sil",
   "confirmations.delete_event.heading": "Etkinliği sil",
@@ -447,11 +492,11 @@
   "confirmations.delete_group.heading": "Grubu sil",
   "confirmations.delete_group.message": "Bu grubu silmek istediğinizden emin misiniz? Bu, geri alınamayan kalıcı bir eylemdir.",
   "confirmations.delete_list.confirm": "Sil",
-  "confirmations.delete_list.heading": "Delete list",
+  "confirmations.delete_list.heading": "Listeyi sil",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinize emin misiniz?",
   "confirmations.domain_block.confirm": "Alan adının tamamını gizle",
-  "confirmations.domain_block.heading": "Block {domain}",
-  "confirmations.domain_block.message": "tüm {domain} alan adını engellemek istediğinizden emin misiniz? Genellikle birkaç hedefli engel ve susturma işi görür ve tercih edilir.",
+  "confirmations.domain_block.heading": "Engelle: {domain}",
+  "confirmations.domain_block.message": "Tüm {domain} alan adını engellemek istediğinizden emin misiniz? Genellikle birkaç hedefli engel ve susturma işi görür ve tercih edilir.",
   "confirmations.kick_from_group.confirm": "Gruptan At",
   "confirmations.kick_from_group.heading": "Grup üyesini gruptan at",
   "confirmations.kick_from_group.message": "@{name} kullanıcısını gruptan atmak istediğinizden emin misiniz?",
@@ -461,125 +506,125 @@
   "confirmations.leave_group.heading": "Gruptan ayrılın",
   "confirmations.leave_group.message": "Gruptan ayrılmak üzeresiniz. Devam etmek istiyor musunuz?",
   "confirmations.mute.confirm": "Sessize al",
-  "confirmations.mute.heading": "Mute @{name}",
+  "confirmations.mute.heading": "Sessize al: @{name}",
   "confirmations.mute.message": "{name} kullanıcısını sessize almak istiyor musunuz?",
   "confirmations.redraft.confirm": "Sil ve yeniden tasarla",
-  "confirmations.redraft.heading": "Delete & redraft",
+  "confirmations.redraft.heading": "Sil ve yeniden tasarla",
   "confirmations.redraft.message": "Bu durumu silip tekrar taslaklaştırmak istediğinizden emin misiniz? Tüm cevapları, boostları ve favorileri kaybedeceksiniz.",
-  "confirmations.register.needs_approval": "Your account will be manually approved by an admin. Please be patient while we review your details.",
-  "confirmations.register.needs_approval.header": "Approval needed",
-  "confirmations.register.needs_confirmation": "Please check your inbox at {email} for confirmation instructions. You will need to verify your email address to continue.",
-  "confirmations.register.needs_confirmation.header": "Confirmation needed",
-  "confirmations.remove_from_followers.confirm": "Remove",
-  "confirmations.remove_from_followers.message": "Are you sure you want to remove {name} from your followers?",
+  "confirmations.register.needs_approval": "Hesabınız bir yönetici tarafından onaylanacaktır. Ayrıntılarınızı incelerken lütfen sabırlı olun.",
+  "confirmations.register.needs_approval.header": "Onay gerekli",
+  "confirmations.register.needs_confirmation": "Onay talimatları için lütfen {email} adresinden gelen e-postayı kontrol ediniz. Devam etmek için e-posta adresinizi doğrulamanız gerekecek.",
+  "confirmations.register.needs_confirmation.header": "Onay gerekli",
+  "confirmations.remove_from_followers.confirm": "Kaldır",
+  "confirmations.remove_from_followers.message": "{name} kullanıcısını takipçilerinizden çıkarmak istediğinizden emin misiniz?",
   "confirmations.reply.confirm": "Yanıtla",
   "confirmations.reply.message": "Şimdi yanıtlarken o an oluşturduğunuz mesajın üzerine yazılır. Devam etmek istediğinize emin misiniz?",
-  "confirmations.revoke_session.confirm": "Revoke",
-  "confirmations.revoke_session.heading": "Revoke current session",
-  "confirmations.revoke_session.message": "You are about to revoke your current session. You will be signed out.",
-  "confirmations.scheduled_status_delete.confirm": "Cancel",
-  "confirmations.scheduled_status_delete.heading": "Cancel scheduled post",
-  "confirmations.scheduled_status_delete.message": "Are you sure you want to cancel this scheduled post?",
+  "confirmations.revoke_session.confirm": "İptal et",
+  "confirmations.revoke_session.heading": "Geçerli oturumu iptal et",
+  "confirmations.revoke_session.message": "Geçerli oturumunuzu iptal etmek üzeresiniz. Oturumunuz kapatılacak.",
+  "confirmations.scheduled_status_delete.confirm": "İptal",
+  "confirmations.scheduled_status_delete.heading": "Planlanan gönderiyi iptal et",
+  "confirmations.scheduled_status_delete.message": "Bu planlanmış gönderiyi iptal etmek istediğinizden emin misiniz?",
   "confirmations.unfollow.confirm": "Takibi kaldır",
-  "crypto_donate.explanation_box.message": "{siteTitle} accepts cryptocurrency donations. You may send a donation to any of the addresses below. Thank you for your support!",
-  "crypto_donate.explanation_box.title": "Sending cryptocurrency donations",
+  "crypto_donate.explanation_box.message": "{siteTitle}, kripto para bağışlarını kabul eder. Aşağıdaki adreslerden herhangi birine bağış gönderebilirsiniz. Desteğin için teşekkürler!",
+  "crypto_donate.explanation_box.title": "Kripto para birimi bağışları gönderme",
   "crypto_donate_panel.actions.view": "Click to see {count} {count, plural, one {wallet} other {wallets}}",
-  "crypto_donate_panel.heading": "Donate Cryptocurrency",
-  "crypto_donate_panel.intro.message": "{siteTitle} accepts cryptocurrency donations to fund our service. Thank you for your support!",
+  "crypto_donate_panel.heading": "Kripto Para Bağışlayın",
+  "crypto_donate_panel.intro.message": "{siteTitle}, hizmetlerini finanse etmek için kripto para bağışlarını kabul eder. Desteğin için teşekkürler!",
   "datepicker.day": "Day",
-  "datepicker.hint": "Scheduled to post at…",
-  "datepicker.month": "Month",
-  "datepicker.next_month": "Next month",
-  "datepicker.next_year": "Next year",
-  "datepicker.previous_month": "Previous month",
-  "datepicker.previous_year": "Previous year",
-  "datepicker.year": "Year",
-  "developers.challenge.answer_label": "Answer",
-  "developers.challenge.answer_placeholder": "Your answer",
-  "developers.challenge.fail": "Wrong answer",
-  "developers.challenge.message": "What is the result of calling {function}?",
-  "developers.challenge.submit": "Become a developer",
-  "developers.challenge.success": "You are now a developer",
-  "developers.leave": "You have left developers",
-  "developers.navigation.app_create_label": "Create an app",
+  "datepicker.hint": "Yayınlanmak üzere planlandı…",
+  "datepicker.month": "Ay",
+  "datepicker.next_month": "Gelecek ay",
+  "datepicker.next_year": "Gelecek sene",
+  "datepicker.previous_month": "Geçen ay",
+  "datepicker.previous_year": "Geçen yıl",
+  "datepicker.year": "Yıl",
+  "developers.challenge.answer_label": "Cevap",
+  "developers.challenge.answer_placeholder": "Cevabınız",
+  "developers.challenge.fail": "Yanlış cevap",
+  "developers.challenge.message": "{function} çağrısının sonucu nedir?",
+  "developers.challenge.submit": "Geliştirici ol",
+  "developers.challenge.success": "Artık bir geliştiricisiniz",
+  "developers.leave": "Geliştiricilikten ayrıldınız",
+  "developers.navigation.app_create_label": "Uygulama oluştur",
   "developers.navigation.intentional_error_label": "Trigger an error",
-  "developers.navigation.leave_developers_label": "Leave developers",
+  "developers.navigation.leave_developers_label": "Geliştiricilikten ayrıl",
   "developers.navigation.network_error_label": "Network error",
   "developers.navigation.service_worker_label": "Service Worker",
-  "developers.navigation.settings_store_label": "Settings store",
+  "developers.navigation.settings_store_label": "Ayar deposu",
   "developers.navigation.show_toast": "Açılır bildirimi tetikle",
-  "developers.navigation.test_timeline_label": "Test timeline",
-  "developers.settings_store.advanced": "Advanced settings",
-  "developers.settings_store.hint": "It is possible to directly edit your user settings here. BE CAREFUL! Editing this section can break your account, and you will only be able to recover through the API.",
+  "developers.navigation.test_timeline_label": "Test zaman çizelgesi",
+  "developers.settings_store.advanced": "Gelişmiş Ayarlar",
+  "developers.settings_store.hint": "Burada kullanıcı ayarlarınızı doğrudan düzenlemeniz mümkündür. DİKKATLİ OLUN! Bu bölümü düzenlemek hesabınızı bozabilir ve yalnızca API aracılığıyla kurtarabilirsiniz.",
   "direct.search_placeholder": "Send a message to…",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "edit_email.header": "Change Email",
+  "directory.federated": "Bilinen fediverse'den",
+  "directory.local": "Yalnızca {domain} adresinden",
+  "directory.new_arrivals": "Yeni gelenler",
+  "directory.recently_active": "Yakın zamanda aktif",
+  "edit_email.header": "E-postayı Değiştir",
   "edit_email.placeholder": "me@example.com",
-  "edit_federation.followers_only": "Hide posts except to followers",
-  "edit_federation.force_nsfw": "Force attachments to be marked sensitive",
+  "edit_federation.followers_only": "Takipçiler dışındaki gönderileri gizle",
+  "edit_federation.force_nsfw": "Ekleri hassas olarak işaretlenmeye zorla",
   "edit_federation.media_removal": "Strip media",
-  "edit_federation.reject": "Reject all activities",
-  "edit_federation.save": "Save",
-  "edit_federation.success": "{host} federation was updated",
-  "edit_federation.unlisted": "Force posts unlisted",
-  "edit_password.header": "Change Password",
-  "edit_profile.error": "Profile update failed",
-  "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
+  "edit_federation.reject": "Tüm etkinlikleri reddet",
+  "edit_federation.save": "Kaydet",
+  "edit_federation.success": "{host} federasyonu güncellendi",
+  "edit_federation.unlisted": "Gönderileri listelenmemiş olmaya zorla",
+  "edit_password.header": "Şifre Değiştir",
+  "edit_profile.error": "Profil güncellemesi başarısız oldu",
+  "edit_profile.fields.accepts_email_list_label": "Bültene abone ol",
   "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
-  "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
-  "edit_profile.fields.birthday_label": "Birthday",
-  "edit_profile.fields.birthday_placeholder": "Your birthday",
-  "edit_profile.fields.bot_label": "This is a bot account",
-  "edit_profile.fields.discoverable_label": "Allow account discovery",
-  "edit_profile.fields.display_name_label": "Display name",
+  "edit_profile.fields.bio_placeholder": "Bize kendinden bahset.",
+  "edit_profile.fields.birthday_label": "Doğum günü",
+  "edit_profile.fields.birthday_placeholder": "Doğum gününüz",
+  "edit_profile.fields.bot_label": "Bu bir bot hesaptır",
+  "edit_profile.fields.discoverable_label": "Hesap keşfine izin ver",
+  "edit_profile.fields.display_name_label": "Görünen isim",
   "edit_profile.fields.display_name_placeholder": "Name",
   "edit_profile.fields.header_label": "Header",
-  "edit_profile.fields.hide_network_label": "Hide network",
-  "edit_profile.fields.location_label": "Location",
-  "edit_profile.fields.location_placeholder": "Location",
+  "edit_profile.fields.hide_network_label": "Ağı gizle",
+  "edit_profile.fields.location_label": "Konum",
+  "edit_profile.fields.location_placeholder": "Konum",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
-  "edit_profile.fields.meta_fields_label": "Profile fields",
-  "edit_profile.fields.stranger_notifications_label": "Block notifications from strangers",
+  "edit_profile.fields.meta_fields_label": "Profil alanları",
+  "edit_profile.fields.stranger_notifications_label": "Yabancılardan gelen bildirimleri engelle",
   "edit_profile.fields.website_label": "Website",
-  "edit_profile.fields.website_placeholder": "Display a Link",
-  "edit_profile.header": "Edit Profile",
-  "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
-  "edit_profile.hints.avatar": "PNG, GIF or JPG. Will be downscaled to {size}",
-  "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
-  "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
-  "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
-  "edit_profile.hints.locked": "Requires you to manually approve followers",
-  "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
-  "edit_profile.hints.stranger_notifications": "Only show notifications from people you follow",
-  "edit_profile.save": "Save",
+  "edit_profile.fields.website_placeholder": "Bağlantı Görüntüle",
+  "edit_profile.header": "Profili Düzenle",
+  "edit_profile.hints.accepts_email_list": "Haberlere ve pazarlama güncellemelerine kaydolun.",
+  "edit_profile.hints.avatar": "PNG, GIF veya JPG kabul edilmektedir. {size} boyutuna küçültülecek",
+  "edit_profile.hints.bot": "Bu hesap çoğunlukla otomatik işlemler gerçekleştirir ve izlenemeyebilir",
+  "edit_profile.hints.discoverable": "Hesabı profil dizininde görüntüleyin ve harici hizmetler tarafından dizine eklenmesine izin verin",
+  "edit_profile.hints.header": "PNG, GIF veya JPG kabul edilmektedir. {size} boyutuna küçültülecek",
+  "edit_profile.hints.hide_network": "Kimleri takip ettiğiniz ve kimlerin sizi takip ettiği profilinizde gösterilmeyecek",
+  "edit_profile.hints.locked": "Takipçileri manuel olarak onaylamanızı gerektirir",
+  "edit_profile.hints.meta_fields": "Profilinize {count}'a kadar ek alan ekleyebilirsiniz.",
+  "edit_profile.hints.stranger_notifications": "Yalnızca takip ettiğiniz kişilerden gelen bildirimleri gösterin",
+  "edit_profile.save": "Kaydet",
   "edit_profile.success": "Profile saved!",
-  "email_confirmation.success": "Your email has been confirmed!",
-  "email_passthru.confirmed.body": "Close this tab and continue the registration process on the {bold} from which you sent this email confirmation.",
-  "email_passthru.confirmed.heading": "Email Confirmed!",
-  "email_passthru.fail.expired": "Your email token has expired",
-  "email_passthru.fail.generic": "Unable to confirm your email",
-  "email_passthru.fail.invalid_token": "Your token is invalid",
-  "email_passthru.fail.not_found": "Your email token is invalid.",
-  "email_passthru.generic_fail.body": "Please request a new email confirmation.",
-  "email_passthru.generic_fail.heading": "Something Went Wrong",
-  "email_passthru.success": "Your email has been verified!",
-  "email_passthru.token_expired.body": "Your email token has expired. Please request a new email confirmation from the {bold} from which you sent this email confirmation.",
-  "email_passthru.token_expired.heading": "Token Expired",
-  "email_passthru.token_not_found.body": "Your email token was not found. Please request a new email confirmation from the {bold} from which you sent this email confirmation.",
-  "email_passthru.token_not_found.heading": "Invalid Token",
+  "email_confirmation.success": "E-posta adresiniz onaylandı!",
+  "email_passthru.confirmed.body": "Bu sekmeyi kapatın ve bu onay e-postasını gönderdiğiniz {bold} üzerinde kayıt işlemine devam edin.",
+  "email_passthru.confirmed.heading": "E-posta Onaylandı!",
+  "email_passthru.fail.expired": "E-posta bağlantınızın süresi doldu",
+  "email_passthru.fail.generic": "E-postanızı onaylayamadık",
+  "email_passthru.fail.invalid_token": "Bağlantı hatalı",
+  "email_passthru.fail.not_found": "E-posta bağlantınız geçersiz",
+  "email_passthru.generic_fail.body": "Lütfen yeni bir e-posta onayı isteyin.",
+  "email_passthru.generic_fail.heading": "Bir şeyler yanlış gitti",
+  "email_passthru.success": "Email adresin onaylandı!",
+  "email_passthru.token_expired.body": "E-posta bağlantınızın süresi doldu. Lütfen bu e-posta onayını gönderdiğiniz {bold}'dan yeni bir e-posta onayı isteyin.",
+  "email_passthru.token_expired.heading": "Bağlantının Süresi Doldu",
+  "email_passthru.token_not_found.body": "E-posta bağlantınız bulunamadı. Lütfen bu e-posta onayını gönderdiğiniz {bold}'dan yeni bir e-posta onayı isteyin.",
+  "email_passthru.token_not_found.heading": "Geçersiz Bağlantı",
   "email_verification.email.label": "E-mail address",
-  "email_verification.fail": "Failed to request email verification.",
-  "email_verification.header": "Enter your email address",
-  "email_verification.success": "Verification email sent successfully.",
-  "email_verification.taken": "is taken",
-  "email_verifilcation.exists": "This email has already been taken.",
+  "email_verification.fail": "E-posta doğrulama isteğinde bulunulamadı.",
+  "email_verification.header": "E-posta adresinizi giriniz",
+  "email_verification.success": "Doğrulama e-postası başarıyla gönderildi.",
+  "email_verification.taken": "alınmış",
+  "email_verifilcation.exists": "Bu email zaten alınmış.",
   "embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
   "emoji_button.activity": "Aktivite",
   "emoji_button.add_custom": "Özel emoji ekle",
@@ -597,20 +642,26 @@
   "emoji_button.search": "Ara...",
   "emoji_button.search_results": "Arama sonuçları",
   "emoji_button.skins_1": "Varsayılan",
+  "emoji_button.skins_2": "Beyaz ten",
+  "emoji_button.skins_3": "Buğday ten",
+  "emoji_button.skins_4": "Bronz ten",
+  "emoji_button.skins_5": "Esmer ten",
+  "emoji_button.skins_6": "Koyu esmer ten",
   "emoji_button.skins_choose": "Varsayılan cilt tonunu seçin",
   "emoji_button.symbols": "Semboller",
   "emoji_button.travel": "Seyahat ve Yerler",
-  "empty_column.account_blocked": "You are blocked by @{accountUsername}.",
-  "empty_column.account_favourited_statuses": "This user doesn't have any liked posts yet.",
+  "empty_column.account_blocked": "@{accountUsername} tarafından engellendiniz.",
+  "empty_column.account_favourited_statuses": "Bu kullanıcının henüz beğendiği gönderi yok.",
   "empty_column.account_timeline": "Burada hiç gönderi yok!",
   "empty_column.account_unavailable": "Profil kullanılamıyor",
   "empty_column.admin.announcements": "Henüz bir duyuru yok.",
-  "empty_column.aliases": "You haven't created any account alias yet.",
+  "empty_column.aliases": "Henüz bir hesap takma adı oluşturmadınız.",
   "empty_column.aliases.suggestions": "There are no account suggestions available for the provided term.",
   "empty_column.blocks": "Henüz bir kullanıcıyı engellemediniz.",
   "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
   "empty_column.direct": "Henüz doğrudan mesajınız yok. Bir tane gönderdiğinizde veya aldığınızda burada görünecektir.",
+  "empty_column.dislikes": "Bu gönderiyi henüz beğenmeyen yok. Birisi yaptığında, burada görünecek.",
   "empty_column.domain_blocks": "Henüz hiçbir gizli alan adı yok.",
   "empty_column.event_participant_requests": "Bekleyen etkinlik katılım isteği yok.",
   "empty_column.event_participants": "Bu etkinliğe henüz kimse katılmadı. Birisi katıldığında, burada görünecektir.",
@@ -650,12 +701,16 @@
   "event.external": "{domain} üzerindeki etkinliği görün",
   "event.join_state.accept": "Gidiyorum",
   "event.join_state.empty": "Katılımcı",
+  "event.join_state.pending": "Beklemede",
+  "event.join_state.rejected": "Gidiyorum",
   "event.location": "Konum",
   "event.manage": "Yönet",
   "event.organized_by": "{name} tarafından organize edildi",
+  "event.participants": "{count} kişi gidiyor",
   "event.quote": "Etkinliği alıntıla",
   "event.reblog": "Etkşnliği yeniden paylaş",
   "event.show_on_map": "Haritada göster",
+  "event.unreblog": "Etkinliği yeniden yayınlamayı kaldır",
   "event.website": "Harici bağlantılar",
   "event_map.navigate": "Gezin",
   "events.create_event": "Etkinlik oluştur",
@@ -716,8 +771,10 @@
   "group.group_mod_authorize.fail": "@{name} onaylanamadı",
   "group.group_mod_block": "@{name} kullanıcısını gruptan engelle",
   "group.group_mod_block.success": "@{name} engellendi",
+  "group.group_mod_demote": "{role} rolünü kaldır",
   "group.group_mod_kick": "@{name} kullanıcısını gruptan at",
   "group.group_mod_kick.success": "@{name} kullanıcısı gruptan atıldı",
+  "group.group_mod_promote_mod": "{role} rolünü atayın",
   "group.group_mod_reject.fail": "@{name} reddedilemedi",
   "group.group_mod_unblock": "Engellemeyi Kaldır",
   "group.group_mod_unblock.success": "@{name} kullanıcısının gruptaki engeli kaldırıldı",
@@ -764,11 +821,13 @@
   "groups.discover.search.recent_searches.clear_all": "Tümünü temizle",
   "groups.discover.search.recent_searches.title": "Son aramalar",
   "groups.discover.search.results.groups": "Gruplar",
+  "groups.discover.search.results.member_count": "üye",
   "groups.discover.suggested.empty": "Şu anda önerilen gruplar getirilemiyor. Lütfen daha sonra tekrar kontrol edin.",
   "groups.discover.suggested.show_more": "Daha Fazla Göster",
   "groups.discover.suggested.title": "Sizin İçin Önerilenler",
   "groups.empty.subtitle": "Katılabileceğiniz grupları keşfetmeye başlayın veya kendi grubunuzu oluşturun.",
   "groups.empty.title": "Henüz Grup Yok",
+  "groups.pending.count": "bekleyen istek",
   "groups.pending.empty.subtitle": "Şu anda bekleyen bir isteğiniz yok.",
   "groups.pending.empty.title": "Bekleyen istek yok",
   "groups.pending.label": "Bekleyen İstekler",
@@ -808,6 +867,7 @@
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
   "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
   "join_event.hint": "Organizatöre neden bu etkinliğe katılmak istediğinizi söyleyebilirsiniz:",
+  "join_event.join": "Katılma isteği",
   "join_event.placeholder": "Organizatöre mesaj",
   "join_event.request_success": "Etkinliğe katılma isteği gönderildi",
   "join_event.success": "Etkinliğe katılındı",
@@ -884,6 +944,7 @@
   "manage_group.confirmation.title": "Her şey hazır!",
   "manage_group.create": "Oluştur",
   "manage_group.delete_group": "Grubu sil",
+  "manage_group.done": "Bitti",
   "manage_group.edit_group": "Grubu düzenle",
   "manage_group.fields.cannot_change_hint": "Grup oluşturulduktan sonra bu değiştirilemez.",
   "manage_group.fields.description_label": "Açıklama",
@@ -954,7 +1015,7 @@
   "navbar.login.username.placeholder": "Email or username",
   "navigation.chats": "Chats",
   "navigation.compose": "Compose",
-  "navigation.dashboard": "Dashboard",
+  "navigation.dashboard": "Yönetici Paneli",
   "navigation.developers": "Developers",
   "navigation.direct_messages": "Messages",
   "navigation.home": "Home",
@@ -973,17 +1034,17 @@
   "navigation_bar.create_group": "Grup Oluştur",
   "navigation_bar.domain_blocks": "Gizli alan adları",
   "navigation_bar.edit_group": "Grubu Düzenle",
-  "navigation_bar.favourites": "Favoriler",
+  "navigation_bar.favourites": "Beğeniler",
   "navigation_bar.filters": "Susturulmuş kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
-  "navigation_bar.import_data": "Import data",
+  "navigation_bar.import_data": "Verileri içe aktar",
   "navigation_bar.in_reply_to": "In reply to",
   "navigation_bar.invites": "Invites",
   "navigation_bar.logout": "Çıkış",
   "navigation_bar.mutes": "Sessize alınmış kullanıcılar",
   "navigation_bar.preferences": "Tercihler",
   "navigation_bar.profile_directory": "Profile directory",
-  "navigation_bar.soapbox_config": "Soapbox config",
+  "navigation_bar.soapbox_config": "Soapbox ayarları",
   "new_event_panel.action": "Etkinlik oluştur",
   "new_event_panel.subtitle": "Aradığınızı bulamadınız mı? Kendi etkinliğinizi planlayın.",
   "new_event_panel.title": "Yeni Etkinlik Oluştur",
@@ -997,7 +1058,7 @@
   "notification.mentioned": "{name} mentioned you",
   "notification.move": "{name} moved to {targetName}",
   "notification.name": "{link}{others}",
-  "notification.others": " + {count} {count, plural, one {other} other {others}}",
+  "notification.others": " + {count} diğer",
   "notification.pleroma:chat_mention": "{name} sent you a message",
   "notification.pleroma:emoji_reaction": "{name} reacted to your post",
   "notification.pleroma:event_reminder": "Katıldığınız bir etkinlik yakında başlıyor",
@@ -1009,9 +1070,9 @@
   "notification.update": "{name} edited a post you interacted with",
   "notification.user_approved": "Welcome to {instance}!",
   "notifications.filter.all": "Tümü",
-  "notifications.filter.boosts": "Boostlar",
+  "notifications.filter.boosts": "Yeniden gönderimler",
   "notifications.filter.emoji_reacts": "Emoji reacts",
-  "notifications.filter.favourites": "Favoriler",
+  "notifications.filter.favourites": "Beğeniler",
   "notifications.filter.follows": "Takip edilenler",
   "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuçları",
@@ -1164,7 +1225,10 @@
   "remote_instance.pin_host": "Pin {host}",
   "remote_instance.unpin_host": "Unpin {host}",
   "remote_interaction.account_placeholder": "Enter your username@domain you want to act from",
+  "remote_interaction.dislike": "Beğenmemeyi onaylayın",
+  "remote_interaction.dislike_title": "Gönderiyi uzaktan beğenmeme",
   "remote_interaction.divider": "or",
+  "remote_interaction.event_join_title": "Etkinliğe uzaktan katılın",
   "remote_interaction.favourite": "Proceed to like",
   "remote_interaction.favourite_title": "Like a post remotely",
   "remote_interaction.follow": "Proceed to follow",
@@ -1186,11 +1250,16 @@
   "reply_mentions.reply_empty": "Replying to post",
   "report.block": "Block {target}",
   "report.block_hint": "Do you also want to block this account?",
-  "report.confirmation.content": "If we find that this account is violating the {link} we will take further action on the matter.",
+  "report.chatMessage.context": "Bir kullanıcının mesajını bildirirken, seçilen mesajdan önceki ve sonraki beş mesaj bağlam için moderasyon ekibimize iletilecektir.",
+  "report.chatMessage.title": "Mesajı bildir",
+  "report.confirmation.content": "Bu hesabın {link}'i ihlal ettiğini tespit edersek, konuyla ilgili daha fazla işlem yapacağız.",
+  "report.confirmation.entity.account": "hesap",
+  "report.confirmation.entity.group": "grup",
   "report.confirmation.title": "Thanks for submitting your report.",
   "report.done": "Done",
   "report.forward": "Şu kişiye ilet : {target}",
   "report.forward_hint": "Bu hesap başka bir sunucudan. Anonimleştirilmiş bir rapor oraya da gönderilsin mi?",
+  "report.group.title": "Grubu Bildir",
   "report.next": "Next",
   "report.otherActions.addAdditional": "Would you like to add additional statuses to this report?",
   "report.otherActions.addMore": "Add more",
@@ -1207,7 +1276,7 @@
   "reset_password.header": "Set New Password",
   "reset_password.password.label": "Password",
   "reset_password.password.placeholder": "Placeholder",
-  "save": "Save",
+  "save": "Kaydet",
   "schedule.post_time": "Post Date/Time",
   "schedule.remove": "Remove schedule",
   "schedule_button.add_schedule": "Schedule post for later",
@@ -1217,6 +1286,7 @@
   "search.placeholder": "Ara",
   "search_results.accounts": "İnsanlar",
   "search_results.filter_message": "You are searching for posts from @{acct}.",
+  "search_results.groups": "Gruplar",
   "search_results.hashtags": "Hashtagler",
   "search_results.statuses": "Gönderiler",
   "security.codes.fail": "Failed to fetch backup codes",
@@ -1247,6 +1317,7 @@
   "settings.configure_mfa": "Configure MFA",
   "settings.delete_account": "Delete Account",
   "settings.edit_profile": "Edit Profile",
+  "settings.messages.label": "Kullanıcıların sizinle yeni bir sohbet başlatmasına izin verin",
   "settings.other": "Other options",
   "settings.preferences": "Preferences",
   "settings.profile": "Profile",
@@ -1287,6 +1358,7 @@
   "soapbox_config.feed_injection_hint": "Inject the feed with additional content, such as suggested profiles.",
   "soapbox_config.feed_injection_label": "Feed injection",
   "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses",
+  "soapbox_config.fields.edit_theme_label": "Temayı düzenle",
   "soapbox_config.fields.home_footer_fields_label": "Home footer items",
   "soapbox_config.fields.logo_label": "Logo",
   "soapbox_config.fields.promo_panel_fields_label": "Promo panel items",
@@ -1294,6 +1366,7 @@
   "soapbox_config.greentext_label": "Enable greentext support",
   "soapbox_config.headings.advanced": "Advanced",
   "soapbox_config.headings.cryptocurrency": "Cryptocurrency",
+  "soapbox_config.headings.events": "Etkinlikler",
   "soapbox_config.headings.navigation": "Navigation",
   "soapbox_config.headings.options": "Options",
   "soapbox_config.headings.theme": "Theme",
@@ -1304,19 +1377,27 @@
   "soapbox_config.hints.promo_panel_icons.link": "Soapbox Icons List",
   "soapbox_config.home_footer.meta_fields.label_placeholder": "Label",
   "soapbox_config.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_config.media_preview_hint": "Bazı yazılımlar zaman çizelgelerinde görüntülenmek üzere resim ve videoların optimize edilmiş bir ön izleme sürümünü sağlar. Ancak, bu ön izleme görüntüleri ek yapılandırma olmadan çok küçük olabilir.",
   "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon",
   "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label",
   "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL",
   "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.",
+  "soapbox_config.raw_json_invalid": "geçersiz",
   "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data",
-  "soapbox_config.save": "Save",
+  "soapbox_config.redirect_root_no_login_hint": "Oturum açılmadığında anasayfanın yönlendirileceği sayfanın yolu.",
+  "soapbox_config.redirect_root_no_login_label": "Ana sayfayı yönlendir",
+  "soapbox_config.save": "Kaydet",
   "soapbox_config.saved": "Soapbox config saved!",
+  "soapbox_config.tile_server_attribution_label": "Harita atıf bilgisi",
+  "soapbox_config.tile_server_label": "Harita sunucusu",
   "soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.",
   "sponsored.info.message": "{siteTitle} displays ads to help fund our service.",
   "sponsored.info.title": "Why am I seeing this ad?",
   "sponsored.subtitle": "Sponsored post",
   "status.admin_account": "@{name} için denetim arayüzünü açın",
   "status.admin_status": "Denetim arayüzünde bu durumu açın",
+  "status.approval.pending": "Onay bekliyor",
+  "status.approval.rejected": "Reddedildi",
   "status.bookmark": "Bookmark",
   "status.bookmarked": "Bookmark added.",
   "status.cancel_reblog_private": "Boost'u geri al",
@@ -1326,12 +1407,20 @@
   "status.delete": "Sil",
   "status.detailed_status": "Detaylı yazışma dökümü",
   "status.direct": "@{name}'e gönder",
+  "status.disabled_replies.group_membership": "Yalnızca grup üyeleri yanıt verebilir",
+  "status.disfavourite": "Beğenme",
   "status.edit": "Edit",
   "status.embed": "Gömülü",
   "status.external": "View post on {domain}",
   "status.favourite": "Favorilere ekle",
   "status.filtered": "Filtrelenmiş",
+  "status.group": "{grup} içerisinde yayınlandı",
+  "status.group_mod_block": "Gruptan @{name}'i engelle",
+  "status.group_mod_delete": "Gönderiyi gruptan sil",
+  "status.group_mod_kick": "@{name}'i gruptan at",
+  "status.interactions.dislikes": "Beğenmeme",
   "status.interactions.favourites": "{count, plural, one {Like} other {Likes}}",
+  "status.interactions.quotes": "Alıntı",
   "status.interactions.reblogs": "{count, plural, one {Repost} other {Reposts}}",
   "status.load_more": "Daha fazla",
   "status.mention": "Bahset : @{name}",
@@ -1358,10 +1447,11 @@
   "status.remove_post_from_group": "Remove post from group",
   "status.reply": "Cevapla",
   "status.replyAll": "Konuşmayı cevapla",
-  "status.report": "@{name}'i raporla",
+  "status.report": "@{name} adlı kişiyi bildir",
   "status.sensitive_warning": "Hassas içerik",
   "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Paylaş",
+  "status.show_filter_reason": "Yine de göster",
   "status.show_less_all": "Hepsi için daha az göster",
   "status.show_more_all": "Hepsi için daha fazla göster",
   "status.show_original": "Show original",
@@ -1388,8 +1478,9 @@
   "sw.status": "Status",
   "sw.url": "Script URL",
   "tabs_bar.all": "All",
-  "tabs_bar.dashboard": "Dashboard",
+  "tabs_bar.dashboard": "Yönetici Paneli",
   "tabs_bar.fediverse": "Fediverse",
+  "tabs_bar.groups": "Gruplar",
   "tabs_bar.home": "Ana sayfa",
   "tabs_bar.local": "Local",
   "tabs_bar.more": "More",
@@ -1397,6 +1488,14 @@
   "tabs_bar.profile": "Profile",
   "tabs_bar.search": "Ara",
   "tabs_bar.settings": "Settings",
+  "textarea.counter.label": "{count} karakter kaldı",
+  "theme_editor.Reset": "Sıfırla",
+  "theme_editor.export": "Temayı dışa aktar",
+  "theme_editor.import": "Temayı içe aktar",
+  "theme_editor.import_success": "Tema başarıyla içe aktarıldı!",
+  "theme_editor.restore": "Varsayılan temayı geri yükle",
+  "theme_editor.save": "Temayı kaydet",
+  "theme_editor.saved": "Tema güncellendi!",
   "theme_toggle.dark": "Dark",
   "theme_toggle.light": "Light",
   "theme_toggle.system": "System",
@@ -1409,7 +1508,7 @@
   "time_remaining.minutes": "{number, plural, one {# dakika} other {# dakika}} kaldı",
   "time_remaining.moments": "Sadece birkaç dakika kaldı",
   "time_remaining.seconds": "{number, plural, one {# saniye} other {# saniye}} kaldı",
-  "toast.view": "View",
+  "toast.view": "Gör",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {kişi} other {kişi}} konuşuyor",
   "trends.title": "Trends",
   "trendsPanel.viewAll": "View all",
@@ -1420,7 +1519,7 @@
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
-  "upload_error.video_duration_limit": "Video exceeds the current duration limit ({limit} seconds)",
+  "upload_error.video_duration_limit": "Video geçerli süre sınırını aşıyor ({limit} saniye)",
   "upload_error.video_size_limit": "Video exceeds the current file size limit ({limit})",
   "upload_form.description": "Görme engelliler için açıklama",
   "upload_form.preview": "Preview",

From 784fce48c528ded1c8e9355f92be7a431751e396 Mon Sep 17 00:00:00 2001
From: Furkan Kalkan <furkan.kalkan3@gmail.com>
Date: Fri, 7 Apr 2023 14:40:13 +0000
Subject: [PATCH 106/298] Translated using Weblate (Turkish)

Currently translated at 99.2% (1533 of 1544 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 474 ++++++++++++++++++------------------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 5619b0bd4..579d0d67c 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -656,9 +656,9 @@
   "empty_column.account_unavailable": "Profil kullanılamıyor",
   "empty_column.admin.announcements": "Henüz bir duyuru yok.",
   "empty_column.aliases": "Henüz bir hesap takma adı oluşturmadınız.",
-  "empty_column.aliases.suggestions": "There are no account suggestions available for the provided term.",
+  "empty_column.aliases.suggestions": "Verilen ifade için önerilen hesap yok.",
   "empty_column.blocks": "Henüz bir kullanıcıyı engellemediniz.",
-  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
+  "empty_column.bookmarks": "Henüz yer işaretiniz yok. Eklediğinizde, burada görünecektir.",
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
   "empty_column.direct": "Henüz doğrudan mesajınız yok. Bir tane gönderdiğinizde veya aldığınızda burada görünecektir.",
   "empty_column.dislikes": "Bu gönderiyi henüz beğenmeyen yok. Birisi yaptığında, burada görünecek.",
@@ -667,8 +667,8 @@
   "empty_column.event_participants": "Bu etkinliğe henüz kimse katılmadı. Birisi katıldığında, burada görünecektir.",
   "empty_column.favourited_statuses": "Hiç favori gönderiminiz yok. Bir tane olursa burada görünecek.",
   "empty_column.favourites": "Kimse bu gönderiyi favorilerine eklememiş. Biri eklerse burada görünecek.",
-  "empty_column.filters": "You haven't created any muted words yet.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.filters": "Henüz sessize alınan kelime oluşturmadınız.",
+  "empty_column.follow_recommendations": "Görünüşe göre sizin için hiçbir öneri oluşturulamadı. Tanıyor olabileceğiniz kişileri aramak veya trend olan hashtag'leri keşfetmek için aramayı kullanmayı deneyebilirsiniz.",
   "empty_column.follow_requests": "Hiç takip isteğiniz yok. Bir tane aldığınızda burada görünecek.",
   "empty_column.group": "Bu grupta henüz bir gönderi yok.",
   "empty_column.group_blocks": "Grup henüz hiçbir kullanıcıyı engellemedi.",
@@ -676,22 +676,22 @@
   "empty_column.hashtag": "Henüz bu hashtag’e sahip hiçbir gönderi yok.",
   "empty_column.home": "Henüz kimseyi takip etmiyorsunuz. {public} ziyaret edebilir veya arama kısmını kullanarak diğer kullanıcılarla iletişime geçebilirsiniz.",
   "empty_column.home.local_tab": "the {site_title} tab",
-  "empty_column.home.subtitle": "{siteTitle} gets more interesting once you follow other users.",
-  "empty_column.home.title": "You're not following anyone yet",
+  "empty_column.home.subtitle": "{siteTitle}, diğer kullanıcıları takip ettiğinizde daha da ilginç hale geliyor.",
+  "empty_column.home.title": "Henüz kimseyi takip etmiyorsun",
   "empty_column.list": "Bu listede henüz hiçbir şey yok.",
   "empty_column.lists": "Henüz hiç listeniz yok. Bir tane oluşturduğunuzda burada görünecek.",
   "empty_column.mutes": "Henüz hiçbir kullanıcıyı sessize almadınız.",
   "empty_column.notifications": "Henüz hiçbir bildiriminiz yok. Diğer insanlarla sobhet edebilmek için etkileşime geçebilirsiniz.",
-  "empty_column.notifications_filtered": "You don't have any notifications of this type yet.",
+  "empty_column.notifications_filtered": "Henüz bu tür için bir bildiriminiz yok.",
   "empty_column.public": "Burada hiçbir şey yok! Herkese açık bir şeyler yazın veya burayı doldurmak için diğer sunuculardaki kullanıcıları takip edin",
   "empty_column.quotes": "Bu gönderi henüz alıntılanmadı.",
   "empty_column.remote": "There is nothing here! Manually follow users from {instance} to fill it up.",
-  "empty_column.scheduled_statuses": "You don't have any scheduled statuses yet. When you add one, it will show up here.",
-  "empty_column.search.accounts": "There are no people results for \"{term}\"",
+  "empty_column.scheduled_statuses": "Henüz planlanmış durumunuz yok. Bir tane eklediğinizde, burada görünecektir.",
+  "empty_column.search.accounts": "\"{term}\" için hiç kişi sonucu yok",
   "empty_column.search.groups": "\"{term}\" için grup sonucu yok",
-  "empty_column.search.hashtags": "There are no hashtags results for \"{term}\"",
-  "empty_column.search.statuses": "There are no posts results for \"{term}\"",
-  "empty_column.test": "The test timeline is empty.",
+  "empty_column.search.hashtags": "\"{term}\" için hashtag sonucu yok",
+  "empty_column.search.statuses": "\"{term}\" için gönderi sonucu yok",
+  "empty_column.test": "Test zaman çizelgesi boş.",
   "event.banner": "Etkinlik afişi",
   "event.copy": "Etkinliğin bağlantısını kopyala",
   "event.date": "Tarih",
@@ -719,51 +719,51 @@
   "events.recent_events": "Yakındaki etkinlikler",
   "events.recent_events.empty": "Henüz halka açık bir etkinlik yok.",
   "export_data.actions.export": "Export",
-  "export_data.actions.export_blocks": "Export blocks",
-  "export_data.actions.export_follows": "Export follows",
-  "export_data.actions.export_mutes": "Export mutes",
-  "export_data.blocks_label": "Blocks",
-  "export_data.follows_label": "Follows",
-  "export_data.hints.blocks": "Get a CSV file containing a list of blocked accounts",
-  "export_data.hints.follows": "Get a CSV file containing a list of followed accounts",
-  "export_data.hints.mutes": "Get a CSV file containing a list of muted accounts",
-  "export_data.mutes_label": "Mutes",
-  "export_data.success.blocks": "Blocks exported successfully",
-  "export_data.success.followers": "Followers exported successfully",
-  "export_data.success.mutes": "Mutes exported successfully",
-  "federation_restriction.federated_timeline_removal": "Fediverse timeline removal",
-  "federation_restriction.followers_only": "Hidden except to followers",
-  "federation_restriction.full_media_removal": "Full media removal",
-  "federation_restriction.media_nsfw": "Attachments marked NSFW",
-  "federation_restriction.partial_media_removal": "Partial media removal",
-  "federation_restrictions.empty_message": "{siteTitle} has not restricted any instances.",
-  "federation_restrictions.explanation_box.message": "Normally servers on the Fediverse can communicate freely. {siteTitle} has imposed restrictions on the following servers.",
-  "federation_restrictions.explanation_box.title": "Instance-specific policies",
-  "federation_restrictions.not_disclosed_message": "{siteTitle} does not disclose federation restrictions through the API.",
-  "fediverse_tab.explanation_box.dismiss": "Don't show again",
-  "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
-  "fediverse_tab.explanation_box.title": "What is the Fediverse?",
-  "feed_suggestions.heading": "Suggested Profiles",
-  "feed_suggestions.view_all": "View all",
-  "filters.added": "Filter added.",
-  "filters.context_header": "Filter contexts",
-  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "export_data.actions.export_blocks": "Engellemeleri dışa aktar",
+  "export_data.actions.export_follows": "Takipleri dışa aktar",
+  "export_data.actions.export_mutes": "Sessize almaları dışa aktar",
+  "export_data.blocks_label": "Engellemeler",
+  "export_data.follows_label": "Takip edilenler",
+  "export_data.hints.blocks": "Engellenen hesapların listesini içeren bir CSV dosyası alın",
+  "export_data.hints.follows": "Takip edilen hesapların listesini içeren bir CSV dosyası alın",
+  "export_data.hints.mutes": "Sessize alınan hesapların listesini içeren bir CSV dosyası alın",
+  "export_data.mutes_label": "Sessize alınmış kullanıcılar",
+  "export_data.success.blocks": "Engellenenler başarıyla dışa aktarıldı",
+  "export_data.success.followers": "Takipçiler başarıyla dışa aktarıldı",
+  "export_data.success.mutes": "Sessize alınanlar başarıyla dışa aktarıldı",
+  "federation_restriction.federated_timeline_removal": "Fediverse zaman çizelgesi kaldırma",
+  "federation_restriction.followers_only": "Takipçiler dışında gizli",
+  "federation_restriction.full_media_removal": "Tam medya kaldırma",
+  "federation_restriction.media_nsfw": "NSFW olarak işaretlenmiş ekler",
+  "federation_restriction.partial_media_removal": "Kısmi medya kaldırma",
+  "federation_restrictions.empty_message": "{siteTitle} herhangi bir sunucuyu kısıtlamadı.",
+  "federation_restrictions.explanation_box.message": "Normalde Fediverse'teki sunucular serbestçe iletişim kurabilir. {siteTitle}, aşağıdaki sunuculara kısıtlamalar getirdi.",
+  "federation_restrictions.explanation_box.title": "Sunucuya özgü politikalar",
+  "federation_restrictions.not_disclosed_message": "{siteTitle}, API aracılığıyla federasyon kısıtlamalarını açıklamaz.",
+  "fediverse_tab.explanation_box.dismiss": "Tekrar gösterme",
+  "fediverse_tab.explanation_box.explanation": "{site_title}, binlerce bağımsız sosyal medya sitesinden (\"sunucular\" olarak da bilinir) oluşan bir sosyal ağ olan Fediverse'nin bir parçasıdır. Burada gördüğünüz gönderiler 3. taraf sunuculardandır. Onlarla etkileşime girme veya sevmediğiniz herhangi bir sunucuyu engelleme özgürlüğüne sahipsiniz. Bir gönderinin hangi sunucudan olduğunu bilmek için ikinci @ simgesinden sonra tam kullanıcı adına dikkat edin. Yalnızca {site_title} gönderilerini görmek için {local} adresini ziyaret edin.",
+  "fediverse_tab.explanation_box.title": "Fediverse nedir?",
+  "feed_suggestions.heading": "Önerilen Profiller",
+  "feed_suggestions.view_all": "Hepsini gör",
+  "filters.added": "Filtre eklendi.",
+  "filters.context_header": "Bağlamları filtrele",
+  "filters.context_hint": "Filtrenin uygulanması gereken bir veya daha fazla bağlam",
   "filters.create_filter": "Filtre oluştur",
-  "filters.filters_list_context_label": "Filter contexts:",
+  "filters.filters_list_context_label": "Bağlamları filtrele:",
   "filters.filters_list_drop": "Drop",
   "filters.filters_list_expired": "Süresi doldu",
-  "filters.filters_list_hide": "Hide",
+  "filters.filters_list_hide": "Gizle",
   "filters.filters_list_hide_completely": "İçeriği gizle",
   "filters.filters_list_phrases_label": "Anahtar kelimeler veya ifadeler:",
   "filters.filters_list_warn": "Uyarı göster",
-  "filters.removed": "Filter deleted.",
-  "followRecommendations.heading": "Suggested Profiles",
+  "filters.removed": "Filtre silindi.",
+  "followRecommendations.heading": "Önerilen Profiller",
   "follow_request.authorize": "Yetkilendir",
   "follow_request.reject": "Reddet",
-  "gdpr.accept": "Accept",
-  "gdpr.learn_more": "Learn more",
-  "gdpr.message": "{siteTitle} uses session cookies, which are essential to the website's functioning.",
-  "gdpr.title": "{siteTitle} uses cookies",
+  "gdpr.accept": "Kabul et",
+  "gdpr.learn_more": "Daha fazla bilgi edinin",
+  "gdpr.message": "{siteTitle}, web sitesinin çalışması için gerekli olan oturum tanımlama bilgilerini kullanır.",
+  "gdpr.title": "{siteTitle} çerezleri kullanır",
   "getting_started.open_source_notice": "{code_name} açık kaynaklı bir yazılımdır. Gitlab {code_link} (v{code_version}).",
   "group.cancel_request": "Talebi iptal et",
   "group.delete.success": "Grup başarıyla silindi",
@@ -837,32 +837,32 @@
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
   "header.home.label": "Home",
-  "header.login.forgot_password": "Forgot password?",
+  "header.login.forgot_password": "Parolanızı mı unuttunuz?",
   "header.login.label": "Log in",
   "header.login.password.label": "Password",
-  "header.login.username.placeholder": "Email or username",
+  "header.login.username.placeholder": "E-posta ya da kullanıcı adı",
   "header.menu.title": "Open menu",
-  "header.register.label": "Register",
+  "header.register.label": "Kayıt ol",
   "home.column_settings.show_reblogs": "Boost edilenleri göster",
   "home.column_settings.show_replies": "Cevapları göster",
   "icon_button.icons": "Icons",
-  "icon_button.label": "Select icon",
+  "icon_button.label": "Simge seç",
   "import_data.actions.import": "Import",
-  "import_data.actions.import_blocks": "Import blocks",
-  "import_data.actions.import_follows": "Import follows",
-  "import_data.actions.import_mutes": "Import mutes",
-  "import_data.blocks_label": "Blocks",
-  "import_data.follows_label": "Follows",
-  "import_data.hints.blocks": "CSV file containing a list of blocked accounts",
-  "import_data.hints.follows": "CSV file containing a list of followed accounts",
-  "import_data.hints.mutes": "CSV file containing a list of muted accounts",
-  "import_data.mutes_label": "Mutes",
-  "import_data.success.blocks": "Blocks imported successfully",
-  "import_data.success.followers": "Followers imported successfully",
-  "import_data.success.mutes": "Mutes imported successfully",
-  "input.copy": "Copy",
-  "input.password.hide_password": "Hide password",
-  "input.password.show_password": "Show password",
+  "import_data.actions.import_blocks": "Engellemeleri içe aktar",
+  "import_data.actions.import_follows": "Takipleri içe aktar",
+  "import_data.actions.import_mutes": "Sessize almaları içe aktar",
+  "import_data.blocks_label": "Engellemeler",
+  "import_data.follows_label": "Takipler",
+  "import_data.hints.blocks": "Engellenen hesapların listesini içeren CSV dosyası",
+  "import_data.hints.follows": "Takip edilen hesapların listesini içeren CSV dosyası",
+  "import_data.hints.mutes": "Sessize alınan hesapların listesini içeren CSV dosyası",
+  "import_data.mutes_label": "Sessize almalar",
+  "import_data.success.blocks": "Engellenenler başarıyla içe aktarıldı",
+  "import_data.success.followers": "Takipçiler başarıyla içe aktarıldı",
+  "import_data.success.mutes": "Sessize alınanlar başarıyla içe aktarıldı",
+  "input.copy": "Kopyala",
+  "input.password.hide_password": "Şifreyi gizle",
+  "input.password.show_password": "Şifreyi göster",
   "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
   "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
@@ -901,13 +901,13 @@
   "keyboard_shortcuts.unfocus": "aramada bir gönderiye odaklanmamak için",
   "keyboard_shortcuts.up": "listede yukarıya çıkmak için",
   "landing_page_modal.download": "Download",
-  "landing_page_modal.helpCenter": "Help Center",
+  "landing_page_modal.helpCenter": "Yardım Merkezi",
   "lightbox.close": "Kapat",
   "lightbox.next": "Sonraki",
   "lightbox.previous": "Önceli",
   "lightbox.view_context": "İçeriği göster",
-  "list.click_to_add": "Click here to add people",
-  "list_adder.header_title": "Add or Remove from Lists",
+  "list.click_to_add": "Kişi eklemek için burayı tıklayın",
+  "list_adder.header_title": "Listelere Ekle veya Listelerden Çıkar",
   "lists.account.add": "Listeye ekle",
   "lists.account.remove": "Listeden kaldır",
   "lists.delete": "Delete list",
@@ -915,25 +915,25 @@
   "lists.edit.submit": "Başlığı değiştir",
   "lists.new.create": "Liste ekle",
   "lists.new.create_title": "Add list",
-  "lists.new.save_title": "Save Title",
+  "lists.new.save_title": "Başlığı Kaydet",
   "lists.new.title_placeholder": "Yeni liste başlığı",
   "lists.search": "Takip ettiğiniz kişiler arasından arayın",
   "lists.subheading": "Listeleriniz",
   "loading_indicator.label": "Yükleniyor...",
   "location_search.placeholder": "Adres ara",
-  "login.fields.instance_label": "Instance",
+  "login.fields.instance_label": "Sunucu",
   "login.fields.instance_placeholder": "example.com",
-  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
-  "login.fields.otp_code_label": "Two-factor code:",
+  "login.fields.otp_code_hint": "Telefon uygulamanız tarafından oluşturulan iki faktörlü kodu girin veya kurtarma kodlarınızdan birini kullanın",
+  "login.fields.otp_code_label": "İki faktörlü kod:",
   "login.fields.password_placeholder": "Password",
-  "login.fields.username_label": "Email or username",
+  "login.fields.username_label": "E-posta ya da kullanıcı adı",
   "login.log_in": "Log in",
-  "login.otp_log_in": "OTP Login",
-  "login.otp_log_in.fail": "Invalid code, please try again.",
-  "login.reset_password_hint": "Trouble logging in?",
+  "login.otp_log_in": "OTP Girişi",
+  "login.otp_log_in.fail": "Geçersiz kod, lütfen tekrar deneyiniz.",
+  "login.reset_password_hint": "Giriş yaparken sorun mu yaşıyorsunuz?",
   "login.sign_in": "Sign in",
-  "login_external.errors.instance_fail": "The instance returned an error.",
-  "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?",
+  "login_external.errors.instance_fail": "Sunucu bir hata döndürdü.",
+  "login_external.errors.network_fail": "Bağlantı başarısız oldu. Bir tarayıcı uzantısı bağlantıyı engelliyor olabilir.",
   "login_form.header": "Sign In",
   "manage_group.blocked_members": "Engellenen üyeler",
   "manage_group.confirmation.copy": "Bağlantıyı kopyala",
@@ -965,71 +965,71 @@
   "manage_group.privacy.public.label": "Herkese açık",
   "manage_group.success": "Grup kaydedildi!",
   "manage_group.tagline": "Gruplar sizi ortak ilgi alanlarına göre başkalarıyla buluşturur.",
-  "media_panel.empty_message": "No media found.",
+  "media_panel.empty_message": "Medya bulunamadı.",
   "media_panel.title": "Media",
-  "mfa.confirm.success_message": "MFA confirmed",
-  "mfa.disable.success_message": "MFA disabled",
-  "mfa.disabled": "Disabled",
-  "mfa.enabled": "Enabled",
+  "mfa.confirm.success_message": "Çok Faktörlü Kimlik Doğrulama onaylandı",
+  "mfa.disable.success_message": "Çok Faktörlü Kimlik Doğrulama devre dışı",
+  "mfa.disabled": "Devre dışı",
+  "mfa.enabled": "Etkin",
   "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
-  "mfa.mfa_setup.code_hint": "Enter the code from your two-factor app.",
+  "mfa.mfa_setup.code_hint": "İki faktörlü uygulamanızdaki kodu girin.",
   "mfa.mfa_setup.code_placeholder": "Code",
-  "mfa.mfa_setup.password_hint": "Enter your current password to confirm your identity.",
+  "mfa.mfa_setup.password_hint": "Kimliğinizi doğrulamak için mevcut şifrenizi girin.",
   "mfa.mfa_setup.password_placeholder": "Password",
   "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
-  "mfa.mfa_setup_scan_title": "Scan",
-  "mfa.mfa_setup_verify_title": "Verify",
-  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
-  "mfa.otp_enabled_title": "OTP Enabled",
-  "mfa.setup_recoverycodes": "Recovery codes",
-  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
+  "mfa.mfa_setup_scan_title": "Tara",
+  "mfa.mfa_setup_verify_title": "Doğrulama",
+  "mfa.otp_enabled_description": "OTP aracılığıyla iki faktörlü kimlik doğrulamayı etkinleştirdiniz.",
+  "mfa.otp_enabled_title": "OTP Etkin",
+  "mfa.setup_recoverycodes": "Kurtarma kodları",
+  "mfa.setup_warning": "Bu kodları not edin veya güvenli bir yere kaydedin - aksi halde bir daha görmezsiniz. 2FA uygulamanıza ve kurtarma kodlarına erişiminizi kaybederseniz, hesabınız kilitlenir.",
   "migration.fields.acct.label": "Handle of the new account",
   "migration.fields.acct.placeholder": "username@domain",
-  "migration.fields.confirm_password.label": "Current password",
-  "migration.hint": "This will move your followers to the new account. No other data will be moved. To perform migration, you need to {link} on your new account first.",
-  "migration.hint.cooldown_period": "If you migrate your account, you will not be able to migrate your account for {cooldownPeriod, plural, one {one day} other {the next # days}}.",
-  "migration.hint.link": "create an account alias",
-  "migration.move_account.fail": "Account migration failed.",
-  "migration.move_account.fail.cooldown_period": "You have moved your account too recently. Please try again later.",
-  "migration.move_account.success": "Account successfully moved.",
-  "migration.submit": "Move followers",
-  "missing_description_modal.cancel": "Cancel",
+  "migration.fields.confirm_password.label": "Mevcut Şifre",
+  "migration.hint": "Bu, takipçilerinizi yeni hesaba taşıyacaktır. Başka hiçbir veri taşınmayacak. Taşıma işlemini gerçekleştirmek için önce yeni hesabınızda {link} oluşturmanız gerekir.",
+  "migration.hint.cooldown_period": "Hesabınızı taşırsanız, {cooldownPeriod, plural, one {bir gün} other {sonraki # gün}} boyunca hesabınızı tekrar taşıyamazsınız.",
+  "migration.hint.link": "hesap takma adı oluştur",
+  "migration.move_account.fail": "Hesap taşıma işlemi başarısız oldu.",
+  "migration.move_account.fail.cooldown_period": "Hesabınızı yakın zaman önce taşıdınız. Lütfen daha sonra tekrar deneyiniz.",
+  "migration.move_account.success": "Hesap başarıyla taşındı.",
+  "migration.submit": "Takipçileri taşı",
+  "missing_description_modal.cancel": "İptal",
   "missing_description_modal.continue": "Post",
-  "missing_description_modal.description": "Continue anyway?",
-  "missing_description_modal.text": "You have not entered a description for all attachments. Continue anyway?",
+  "missing_description_modal.description": "Yine de devam edilsin mi?",
+  "missing_description_modal.text": "Tüm ekler için bir açıklama girmediniz. Yine de devam edilsin mi?",
   "missing_indicator.label": "Bulunamadı",
   "missing_indicator.sublabel": "Bu kaynak bulunamadı",
   "modals.policy.submit": "Kabul Et ve Devam Et",
   "modals.policy.updateTitle": "{siteTitle} en son sürümünü puanladınız! Üzerinde çalıştığımız heyecan verici yeni şeyleri gözden geçirmek için bir dakikanızı ayırın.",
   "moderation_overlay.contact": "Contact",
-  "moderation_overlay.hide": "Hide content",
-  "moderation_overlay.show": "Show Content",
-  "moderation_overlay.subtitle": "This Post has been sent to Moderation for review and is only visible to you. If you believe this is an error please contact Support.",
-  "moderation_overlay.title": "Content Under Review",
-  "mute_modal.auto_expire": "Automatically expire mute?",
-  "mute_modal.duration": "Duration",
+  "moderation_overlay.hide": "İçeriği gizle",
+  "moderation_overlay.show": "İçeriği Göster",
+  "moderation_overlay.subtitle": "Bu Gönderi incelenmek üzere denetime gönderildi ve yalnızca siz görebilirsiniz. Bunun bir hata olduğunu düşünüyorsanız, lütfen destek ile iletişime geçin.",
+  "moderation_overlay.title": "İçerik İnceleniyor",
+  "mute_modal.auto_expire": "Sessize alma işlemi otomatik olarak sona ersin mi?",
+  "mute_modal.duration": "Süre",
   "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
   "navbar.login.action": "Log in",
-  "navbar.login.forgot_password": "Forgot password?",
+  "navbar.login.forgot_password": "Parolanızı mı unuttunuz?",
   "navbar.login.password.label": "Password",
-  "navbar.login.username.placeholder": "Email or username",
-  "navigation.chats": "Chats",
-  "navigation.compose": "Compose",
+  "navbar.login.username.placeholder": "E-posta ya da kullanıcı adı",
+  "navigation.chats": "Sohbetler",
+  "navigation.compose": "Gönderi oluştur",
   "navigation.dashboard": "Yönetici Paneli",
-  "navigation.developers": "Developers",
+  "navigation.developers": "Geliştiriciler",
   "navigation.direct_messages": "Messages",
   "navigation.home": "Home",
   "navigation.notifications": "Notifications",
-  "navigation.search": "Search",
+  "navigation.search": "Arama",
   "navigation_bar.account_aliases": "Account aliases",
-  "navigation_bar.account_migration": "Move account",
+  "navigation_bar.account_migration": "Hesabı taşı",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
   "navigation_bar.compose": "Yeni bir gönderi yazın",
-  "navigation_bar.compose_direct": "Direct message",
-  "navigation_bar.compose_edit": "Edit post",
+  "navigation_bar.compose_direct": "Özel mesaj",
+  "navigation_bar.compose_edit": "Gönderiyi düzenle",
   "navigation_bar.compose_event": "Etkinliği yönet",
-  "navigation_bar.compose_quote": "Quote post",
-  "navigation_bar.compose_reply": "Reply to post",
+  "navigation_bar.compose_quote": "Gönderiyi alıntıla",
+  "navigation_bar.compose_reply": "Gönderiyi yanıtla",
   "navigation_bar.create_event": "Yeni etkinlik oluştur",
   "navigation_bar.create_group": "Grup Oluştur",
   "navigation_bar.domain_blocks": "Gizli alan adları",
@@ -1038,12 +1038,12 @@
   "navigation_bar.filters": "Susturulmuş kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
   "navigation_bar.import_data": "Verileri içe aktar",
-  "navigation_bar.in_reply_to": "In reply to",
-  "navigation_bar.invites": "Invites",
+  "navigation_bar.in_reply_to": "Cevap olarak",
+  "navigation_bar.invites": "Davetler",
   "navigation_bar.logout": "Çıkış",
   "navigation_bar.mutes": "Sessize alınmış kullanıcılar",
   "navigation_bar.preferences": "Tercihler",
-  "navigation_bar.profile_directory": "Profile directory",
+  "navigation_bar.profile_directory": "Profil dizini",
   "navigation_bar.soapbox_config": "Soapbox ayarları",
   "new_event_panel.action": "Etkinlik oluştur",
   "new_event_panel.subtitle": "Aradığınızı bulamadınız mı? Kendi etkinliğinizi planlayın.",
@@ -1053,112 +1053,112 @@
   "new_group_panel.title": "Yeni Grup Oluştur",
   "notification.favourite": "{name} senin durumunu favorilere ekledi",
   "notification.follow": "{name} seni takip ediyor",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} sizi takip etmek istiyor",
   "notification.mention": "{name} senden bahsetti",
-  "notification.mentioned": "{name} mentioned you",
-  "notification.move": "{name} moved to {targetName}",
+  "notification.mentioned": "{name} senden bahsetti",
+  "notification.move": "{name}, {targetName} konumuna taşındı.",
   "notification.name": "{link}{others}",
   "notification.others": " + {count} diğer",
-  "notification.pleroma:chat_mention": "{name} sent you a message",
-  "notification.pleroma:emoji_reaction": "{name} reacted to your post",
+  "notification.pleroma:chat_mention": "{name} sana bir mesaj gönderdi",
+  "notification.pleroma:emoji_reaction": "{name} gönderinize tepki verdi",
   "notification.pleroma:event_reminder": "Katıldığınız bir etkinlik yakında başlıyor",
   "notification.pleroma:participation_accepted": "Etkinliğe katılmak için kabul edildiniz",
   "notification.pleroma:participation_request": "{name} etkinliğinize katılmak istiyor",
   "notification.poll": "Oy verdiğiniz bir anket bitti",
   "notification.reblog": "{name} senin durumunu boost etti",
-  "notification.status": "{name} just posted",
-  "notification.update": "{name} edited a post you interacted with",
-  "notification.user_approved": "Welcome to {instance}!",
+  "notification.status": "{isim} az önce yayınladı",
+  "notification.update": "{name}, etkileşimde bulunduğunuz bir gönderiyi düzenledi",
+  "notification.user_approved": "{instance}'a hoş geldiniz!",
   "notifications.filter.all": "Tümü",
   "notifications.filter.boosts": "Yeniden gönderimler",
-  "notifications.filter.emoji_reacts": "Emoji reacts",
+  "notifications.filter.emoji_reacts": "Emoji tepkileri",
   "notifications.filter.favourites": "Beğeniler",
   "notifications.filter.follows": "Takip edilenler",
   "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuçları",
-  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.filter.statuses": "Takip ettiğiniz kişilerden gelen güncellemeler",
   "notifications.group": "{count} bildirim",
-  "notifications.queue_label": "Click to see {count} new {count, plural, one {notification} other {notifications}}",
+  "notifications.queue_label": "{count} yeni {count, plural, one {bildirimi} other {bildirimleri}} görmek için tıklayınız",
   "oauth_consumer.tooltip": "Sign in with {provider}",
-  "oauth_consumers.title": "Other ways to sign in",
-  "onboarding.avatar.subtitle": "Just have fun with it.",
-  "onboarding.avatar.title": "Choose a profile picture",
-  "onboarding.bio.hint": "Max 500 characters",
-  "onboarding.bio.placeholder": "Tell the world a little about yourself…",
-  "onboarding.display_name.label": "Display name",
-  "onboarding.display_name.placeholder": "Eg. John Smith",
-  "onboarding.display_name.subtitle": "You can always edit this later.",
-  "onboarding.display_name.title": "Choose a display name",
-  "onboarding.done": "Done",
-  "onboarding.error": "An unexpected error occurred. Please try again or skip this step.",
-  "onboarding.fediverse.its_you": "This is you! Other people can follow you from other servers by using your full @-handle.",
-  "onboarding.fediverse.message": "The Fediverse is a social network made up of thousands of diverse and independently-run social media sites (aka \"servers\"). You can follow users — and like, repost, and reply to posts — from most other Fediverse servers, because they can communicate with {siteTitle}.",
+  "oauth_consumers.title": "Diğer oturum açma yöntemleri",
+  "onboarding.avatar.subtitle": "Onunla iyi eğlenceler.",
+  "onboarding.avatar.title": "Bir profil resmi seçin",
+  "onboarding.bio.hint": "Maks. 500 karakter",
+  "onboarding.bio.placeholder": "Dünyaya biraz kendinden bahset…",
+  "onboarding.display_name.label": "Görünen isim",
+  "onboarding.display_name.placeholder": "Ör: Mehmet Yılmaz",
+  "onboarding.display_name.subtitle": "Bunu daha sonra istediğiniz zaman düzenleyebilirsiniz.",
+  "onboarding.display_name.title": "Görünen ismi seç",
+  "onboarding.done": "Bitti",
+  "onboarding.error": "Beklenmedik bir hata oluştu. Lütfen tekrar deneyin veya bu adımı atlayın.",
+  "onboarding.fediverse.its_you": "Bu sensin! Fediverse'teki diğer kişiler tam kullanıcı adınızı (@kullanici@example.com) kullanarak sizi diğer sunuculardan takip edebilir.",
+  "onboarding.fediverse.message": "Fediverse, binlerce farklı ve bağımsız olarak yönetilen sosyal medya sitesinden (\"sunucular\" olarak da bilinir) oluşan bir sosyal ağdır. {siteTitle} ile iletişim kurabildikleri için diğer birçok Fediverse sunucusundaki kullanıcıları takip edebilir ve gönderileri beğenebilir, yeniden yayınlayabilir ve yanıtlayabilirsiniz.",
   "onboarding.fediverse.next": "Next",
-  "onboarding.fediverse.other_instances": "When browsing your timeline, pay attention to the full username after the second @ symbol to know which server a post is from.",
-  "onboarding.fediverse.title": "{siteTitle} is just one part of the Fediverse",
-  "onboarding.fediverse.trailer": "Because it is distributed and anyone can run their own server, the Fediverse is resilient and open. If you choose to join another server or set up your own, you can interact with the same people and continue on the same social graph.",
-  "onboarding.finished.message": "We are very excited to welcome you to our community! Tap the button below to get started.",
-  "onboarding.finished.title": "Onboarding complete",
-  "onboarding.header.subtitle": "This will be shown at the top of your profile.",
-  "onboarding.header.title": "Pick a cover image",
+  "onboarding.fediverse.other_instances": "Zaman tünelinizde gezinirken, bir gönderinin hangi sunucudan geldiğini öğrenmek için ikinci @ sembolünden sonra tam kullanıcı adına dikkat edin.",
+  "onboarding.fediverse.title": "{siteTitle}, Fediverse'in yalnızca bir parçasıdır",
+  "onboarding.fediverse.trailer": "Çünkü dağıtık olduğundan ve isteyen herkesin kendi sunucusunu kurabildeğinden Fediverse dirençli ve şeffaftır. Eğer bir gün başka bir sunucuya taşınmak ya da kendinizinkini kurmak istediğinizde aynı hesaplarla etkileşim kurmaya devam edebilirsiniz.",
+  "onboarding.finished.message": "Sizi topluluğumuza davet etmekten büyük heyecan duyuyoruz! Başlamak için aşağıdaki düğmeye dokunun.",
+  "onboarding.finished.title": "Oryantasyon tamamlandı",
+  "onboarding.header.subtitle": "Bu, profilinizin üst kısmında gösterilecektir.",
+  "onboarding.header.title": "Bir kapak resmi seçin",
   "onboarding.next": "Next",
-  "onboarding.note.subtitle": "You can always edit this later.",
-  "onboarding.note.title": "Write a short bio",
-  "onboarding.saving": "Saving…",
-  "onboarding.skip": "Skip for now",
-  "onboarding.suggestions.subtitle": "Here are a few of the most popular accounts you might like.",
-  "onboarding.suggestions.title": "Suggested accounts",
-  "onboarding.view_feed": "View Feed",
-  "password_reset.confirmation": "Check your email for confirmation.",
-  "password_reset.fields.username_placeholder": "Email or username",
+  "onboarding.note.subtitle": "Bunu daha sonra istediğiniz zaman düzenleyebilirsiniz.",
+  "onboarding.note.title": "Kısa bir biyografi yaz",
+  "onboarding.saving": "Kaydediliyor…",
+  "onboarding.skip": "Şimdilik geç",
+  "onboarding.suggestions.subtitle": "İşte beğenebileceğiniz en popüler hesaplardan birkaçı.",
+  "onboarding.suggestions.title": "Önerilen hesaplar",
+  "onboarding.view_feed": "Beslemeyi Görüntüle",
+  "password_reset.confirmation": "Onay için e-postanızı kontrol edin.",
+  "password_reset.fields.username_placeholder": "E-posta ya da kullanıcı adı",
   "password_reset.header": "Reset Password",
   "password_reset.reset": "Reset password",
-  "patron.donate": "Donate",
-  "patron.title": "Funding Goal",
-  "pinned_accounts.title": "{name}’s choices",
-  "pinned_statuses.none": "No pins to show.",
-  "poll.choose_multiple": "Choose as many as you'd like.",
+  "patron.donate": "Bağış",
+  "patron.title": "Fon Hedefi",
+  "pinned_accounts.title": "{name}'nin seçimleri",
+  "pinned_statuses.none": "Gösterilecek sabitlenmiş gönderi yok.",
+  "poll.choose_multiple": "İstediğiniz kadar seçin.",
   "poll.closed": "Kapandı",
-  "poll.non_anonymous": "Public poll",
-  "poll.non_anonymous.label": "Other instances may display the options you voted for",
+  "poll.non_anonymous": "Genel anket",
+  "poll.non_anonymous.label": "Diğer sunucular oy verdiğiniz seçenekleri görüntüleyebilir",
   "poll.refresh": "Yenile",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_people": "kişi",
   "poll.total_votes": "{count, plural, one {# oy} other {# oy}}",
   "poll.vote": "Oy ver",
-  "poll.voted": "You voted for this answer",
+  "poll.voted": "Bu cevaba oy verdiniz",
   "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anket kaldır",
-  "preferences.fields.auto_play_gif_label": "Auto-play animated GIFs",
-  "preferences.fields.auto_play_video_label": "Auto-play videos",
-  "preferences.fields.autoload_more_label": "Automatically load more items when scrolled to the bottom of the page",
-  "preferences.fields.autoload_timelines_label": "Automatically load new posts when scrolled to the top of the page",
-  "preferences.fields.boost_modal_label": "Show confirmation dialog before reposting",
+  "preferences.fields.auto_play_gif_label": "Animasyonlu GIF'leri otomatik oynat",
+  "preferences.fields.auto_play_video_label": "Videoları otomatik oynat",
+  "preferences.fields.autoload_more_label": "Sayfanın en altına kaydırıldığında otomatik olarak daha fazla öğe yükle",
+  "preferences.fields.autoload_timelines_label": "Sayfanın en üstüne kaydırıldığında yeni gönderileri otomatik olarak yükle",
+  "preferences.fields.boost_modal_label": "Yeniden göndermeden önce onay iletişim kutusunu göster",
   "preferences.fields.content_type_label": "Default post format",
-  "preferences.fields.delete_modal_label": "Show confirmation dialog before deleting a post",
-  "preferences.fields.demetricator_label": "Use Demetricator",
+  "preferences.fields.delete_modal_label": "Bir gönderiyi silmeden önce onay iletişim kutusunu göster",
+  "preferences.fields.demetricator_label": "Demetricator'ı Kullan",
   "preferences.fields.demo_hint": "Varsayılan Soapbox logosunu ve renk düzenini kullanın. Ekran görüntüsü almak için kullanışlıdır.",
   "preferences.fields.demo_label": "Demo modu",
   "preferences.fields.display_media.default": "Hide media marked as sensitive",
   "preferences.fields.display_media.hide_all": "Always hide media",
   "preferences.fields.display_media.show_all": "Always show media",
-  "preferences.fields.expand_spoilers_label": "Always expand posts marked with content warnings",
+  "preferences.fields.expand_spoilers_label": "İçerik uyarılarıyla işaretlenmiş yayınları her zaman genişletin",
   "preferences.fields.language_label": "Language",
   "preferences.fields.media_display_label": "Media display",
-  "preferences.fields.missing_description_modal_label": "Show confirmation dialog before sending a post without media descriptions",
+  "preferences.fields.missing_description_modal_label": "Medya açıklamaları olmayan bir gönderi göndermeden önce onay iletişim kutusunu göster",
   "preferences.fields.privacy_label": "Default post privacy",
-  "preferences.fields.reduce_motion_label": "Reduce motion in animations",
-  "preferences.fields.system_font_label": "Use system's default font",
+  "preferences.fields.reduce_motion_label": "Animasyonlarda hareketi azaltın",
+  "preferences.fields.system_font_label": "Sistemin varsayılan yazı tipini kullan",
   "preferences.fields.theme": "Theme",
-  "preferences.fields.underline_links_label": "Always underline links in posts",
-  "preferences.fields.unfollow_modal_label": "Show confirmation dialog before unfollowing someone",
-  "preferences.hints.demetricator": "Decrease social media anxiety by hiding all numbers from the site.",
-  "preferences.notifications.advanced": "Show all notification categories",
+  "preferences.fields.underline_links_label": "Gönderilerdeki bağlantıların altını daima çizin",
+  "preferences.fields.unfollow_modal_label": "Birini takip etmeyi bırakmadan önce onay iletişim kutusunu göster",
+  "preferences.hints.demetricator": "Tüm sayıları siteden gizleyerek sosyal medya kaygısını azaltın.",
+  "preferences.notifications.advanced": "Tüm bildirim kategorilerini göster",
   "preferences.options.content_type_markdown": "Markdown",
-  "preferences.options.content_type_plaintext": "Plain text",
-  "preferences.options.privacy_followers_only": "Followers-only",
+  "preferences.options.content_type_plaintext": "Düz metin",
+  "preferences.options.privacy_followers_only": "Sadece takipçiler",
   "preferences.options.privacy_public": "Public",
-  "preferences.options.privacy_unlisted": "Unlisted",
+  "preferences.options.privacy_unlisted": "Liste dışı",
   "privacy.change": "Gönderi gizliliğini ayarla",
   "privacy.direct.long": "Sadece bahsedilen kişilere gönder",
   "privacy.direct.short": "Direkt",
@@ -1168,68 +1168,68 @@
   "privacy.public.short": "Herkese açık",
   "privacy.unlisted.long": "Herkese açık zaman tüneline gönderme",
   "privacy.unlisted.short": "Listelenmemiş",
-  "profile_dropdown.add_account": "Add an existing account",
-  "profile_dropdown.logout": "Log out @{acct}",
-  "profile_dropdown.switch_account": "Switch accounts",
+  "profile_dropdown.add_account": "Mevcut bir hesabı ekle",
+  "profile_dropdown.logout": "@{acct} oturumunu kapat",
+  "profile_dropdown.switch_account": "Hesap değiştir",
   "profile_dropdown.theme": "Theme",
-  "profile_fields_panel.title": "Profile fields",
-  "reactions.all": "All",
+  "profile_fields_panel.title": "Profil alanları",
+  "reactions.all": "Tümü",
   "regeneration_indicator.label": "Yükleniyor…",
   "regeneration_indicator.sublabel": "Ev akışınız hazırlanıyor!",
-  "register_invite.lead": "Complete the form below to create an account.",
-  "register_invite.title": "You've been invited to join {siteTitle}!",
-  "registration.acceptance": "By registering, you agree to the {terms} and {privacy}.",
-  "registration.agreement": "I agree to the {tos}.",
-  "registration.captcha.hint": "Click the image to get a new captcha",
-  "registration.captcha.placeholder": "Enter the pictured text",
-  "registration.closed_message": "{instance} is not accepting new members",
-  "registration.closed_title": "Registrations Closed",
-  "registration.confirmation_modal.close": "Close",
-  "registration.fields.confirm_placeholder": "Password (again)",
+  "register_invite.lead": "Bir hesap oluşturmak için aşağıdaki formu doldurun.",
+  "register_invite.title": "{siteTitle}'a katılmaya davet edildiniz!",
+  "registration.acceptance": "Kaydolarak {terms} ve {privacy} koşullarını kabul etmiş olursunuz.",
+  "registration.agreement": "{tos} metnini kabul ediyorum.",
+  "registration.captcha.hint": "Yeni bir captcha almak için resme tıklayın",
+  "registration.captcha.placeholder": "Resimdeki metni girin",
+  "registration.closed_message": "{instance} yeni üye kabul etmiyor",
+  "registration.closed_title": "Kayıtlar Kapandı",
+  "registration.confirmation_modal.close": "Kapat",
+  "registration.fields.confirm_placeholder": "Şifre (tekrar)",
   "registration.fields.email_placeholder": "E-Mail address",
   "registration.fields.password_placeholder": "Password",
-  "registration.fields.username_hint": "Only letters, numbers, and underscores are allowed.",
-  "registration.fields.username_placeholder": "Username",
-  "registration.header": "Register your account",
-  "registration.newsletter": "Subscribe to newsletter.",
-  "registration.password_mismatch": "Passwords don't match.",
-  "registration.privacy": "Privacy Policy",
-  "registration.reason": "Why do you want to join?",
-  "registration.reason_hint": "This will help us review your application",
+  "registration.fields.username_hint": "Yalnızca harflere, sayılara ve alt çizgilere izin verilir.",
+  "registration.fields.username_placeholder": "Kullanıcı adı",
+  "registration.header": "Hesabınızı kaydedin",
+  "registration.newsletter": "Bültene abone olun.",
+  "registration.password_mismatch": "Parolalar eşleşmiyor.",
+  "registration.privacy": "Gizlilik Politikası",
+  "registration.reason": "Neden katılmak istiyorsunuz?",
+  "registration.reason_hint": "Bu, başvurunuzu incelememize yardımcı olacaktır",
   "registration.sign_up": "Sign up",
-  "registration.tos": "Terms of Service",
-  "registration.username_unavailable": "Username is already taken.",
-  "registration.validation.capital_letter": "1 capital letter",
-  "registration.validation.lowercase_letter": "1 lowercase letter",
-  "registration.validation.minimum_characters": "8 characters",
-  "registrations.create_account": "Create an account",
-  "registrations.error": "Failed to register your account.",
-  "registrations.get_started": "Let's get started!",
+  "registration.tos": "Kullanım Şartları",
+  "registration.username_unavailable": "Kullanıcı adı zaten alınmış.",
+  "registration.validation.capital_letter": "1 büyük harf",
+  "registration.validation.lowercase_letter": "1 küçük harf",
+  "registration.validation.minimum_characters": "8 karakter",
+  "registrations.create_account": "Hesap oluşturun",
+  "registrations.error": "Hesabınız kaydedilemedi.",
+  "registrations.get_started": "Başlayalım!",
   "registrations.password.label": "Password",
-  "registrations.success": "Welcome to {siteTitle}!",
-  "registrations.tagline": "Social Media Without Discrimination",
-  "registrations.unprocessable_entity": "This username has already been taken.",
-  "registrations.username.hint": "May only contain A-Z, 0-9, and underscores",
-  "registrations.username.label": "Your username",
+  "registrations.success": "{siteTitle}'a hoş geldiniz!",
+  "registrations.tagline": "Ayrımcılık Yapmayan Sosyal Medya",
+  "registrations.unprocessable_entity": "Bu kullanıcı adı zaten alındı.",
+  "registrations.username.hint": "Yalnızca A-Z, 0-9 ve alt çizgi içerebilir",
+  "registrations.username.label": "Kullanıcı adınız",
   "reject.success": "Reddedildi",
   "relative_time.days": "{number}g",
   "relative_time.hours": "{number}s",
   "relative_time.just_now": "şimdi",
   "relative_time.minutes": "{number}dk",
   "relative_time.seconds": "{number}sn",
-  "remote_instance.edit_federation": "Edit federation",
-  "remote_instance.federation_panel.heading": "Federation Restrictions",
-  "remote_instance.federation_panel.no_restrictions_message": "{siteTitle} has placed no restrictions on {host}.",
-  "remote_instance.federation_panel.restricted_message": "{siteTitle} blocks all activities from {host}.",
-  "remote_instance.federation_panel.some_restrictions_message": "{siteTitle} has placed some restrictions on {host}.",
+  "remote_instance.edit_federation": "Federasyonu düzenle",
+  "remote_instance.federation_panel.heading": "Federasyon Kısıtlamaları",
+  "remote_instance.federation_panel.no_restrictions_message": "{siteTitle}, {host} üzerinde herhangi bir kısıtlama getirmedi.",
+  "remote_instance.federation_panel.restricted_message": "{siteTitle}, {host} tarafından sağlanan tüm etkinlikleri engeller.",
+  "remote_instance.federation_panel.some_restrictions_message": "{siteTitle}, {host} üzerinde bazı kısıtlamalar getirdi.",
   "remote_instance.pin_host": "Pin {host}",
-  "remote_instance.unpin_host": "Unpin {host}",
-  "remote_interaction.account_placeholder": "Enter your username@domain you want to act from",
+  "remote_instance.unpin_host": "{host} sabitlemesini kaldırın",
+  "remote_interaction.account_placeholder": "İşlem yapmak istediğiniz tam kullanıcı adınızı (ör: @kullanici@example.com) yazınız.",
   "remote_interaction.dislike": "Beğenmemeyi onaylayın",
   "remote_interaction.dislike_title": "Gönderiyi uzaktan beğenmeme",
   "remote_interaction.divider": "or",
   "remote_interaction.event_join_title": "Etkinliğe uzaktan katılın",
-  "remote_interaction.favourite": "Proceed to like",
+  "remote_interaction.favourite": "Beğenmeye devam et",
   "remote_interaction.favourite_title": "Like a post remotely",
   "remote_interaction.follow": "Proceed to follow",
   "remote_interaction.follow_title": "Follow {user} remotely",
@@ -1456,7 +1456,7 @@
   "status.show_more_all": "Hepsi için daha fazla göster",
   "status.show_original": "Show original",
   "status.title": "Post",
-  "status.title_direct": "Direct message",
+  "status.title_direct": "Özel mesaj",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.unbookmark": "Remove bookmark",

From 51629861e738496bab06bb5fb7a5c25da2e3c579 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Fri, 7 Apr 2023 13:43:25 +0000
Subject: [PATCH 107/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1544 of 1544 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 361bde5c8..1b4a6ca7d 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -808,6 +808,8 @@
   "group.role.owner": "拥有者",
   "group.tabs.all": "全部",
   "group.tabs.members": "成员",
+  "group.tags.hint": "最多添加 3 个关键词，这些关键词将作为群组讨论的核心话题。",
+  "group.tags.label": "标签",
   "group.upload_banner": "已上传照片",
   "groups.discover.popular.empty": "目前无法获取热门群组。请稍后再试。",
   "groups.discover.popular.show_more": "显示更多",
@@ -950,6 +952,7 @@
   "manage_group.fields.cannot_change_hint": "创建群组后此设置将无法更改。",
   "manage_group.fields.description_label": "描述",
   "manage_group.fields.description_placeholder": "描述",
+  "manage_group.fields.hashtag_placeholder": "添加一个主题",
   "manage_group.fields.name_help": "创建群组后此设置将无法更改。",
   "manage_group.fields.name_label": "群组名称（必填）",
   "manage_group.fields.name_label_optional": "群组名称",
@@ -963,6 +966,7 @@
   "manage_group.privacy.private.label": "私有（需要群组所有者批准）",
   "manage_group.privacy.public.hint": "可发现。任何人都可以加入。",
   "manage_group.privacy.public.label": "公开",
+  "manage_group.success": "群组已保存！",
   "manage_group.tagline": "群组根据共同的兴趣将您与他人联系起来。",
   "media_panel.empty_message": "未找到媒体。",
   "media_panel.title": "媒体",

From 330002a4dc6ba2abaa57fad8f4cf123cd7a9678e Mon Sep 17 00:00:00 2001
From: Furkan Kalkan <furkan.kalkan3@gmail.com>
Date: Mon, 10 Apr 2023 14:44:22 +0000
Subject: [PATCH 108/298] Translated using Weblate (Turkish)

Currently translated at 99.1% (1533 of 1546 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 72 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 579d0d67c..8eea37601 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -6,35 +6,35 @@
   "account.badges.bot": "Bot",
   "account.birthday": "{date} tarihinde doğdu",
   "account.birthday_today": "Doğum günü bugün!",
-  "account.block": "@{name} adlı kişiyi engelle",
+  "account.block": "@{name} adlı hesabı engelle",
   "account.block_domain": "{domain} alan adından her şeyi gizle",
   "account.blocked": "Engellenmiş",
   "account.chat": "@{name} ile sohbet",
   "account.deactivated": "Devre dışı bırakıldı",
-  "account.direct": "Özel mesaj gönder : @{name}",
+  "account.direct": "@{name} adlı hesaba özel mesaj gönder",
   "account.domain_blocked": "Alan adı gizli",
   "account.edit_profile": "Profili düzenle",
-  "account.endorse": "Profildeki özellik",
-  "account.endorse.success": "Artık profilinizde @{acct}'a yer veriyorsunuz",
+  "account.endorse": "Profilde öne çıkartma",
+  "account.endorse.success": "Artık profilinizde @{acct} adlı hesabı öne çıkarıyorsunuz",
   "account.familiar_followers": "{accounts} tarafından takip edildi",
   "account.familiar_followers.empty": "{name} tanıdığınız kimse tarafından takip edilmiyor.",
   "account.familiar_followers.more": "{count} {count, plural, one {other} other {others}} you follow",
   "account.follow": "Takip et",
   "account.followers": "Takipçiler",
-  "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
+  "account.followers.empty": "Henüz kimse bu hesabı takip etmiyor.",
   "account.follows": "Takip edilenler",
   "account.follows.empty": "Bu kullanıcı henüz kimseyi takip etmiyor.",
   "account.follows_you": "Seni takip ediyor",
   "account.header.alt": "Profil başlığı",
-  "account.hide_reblogs": "@{name} kişisinin yeniden gönderilerini gizle",
+  "account.hide_reblogs": "@{name} adlı hesabın yeniden gönderilerini gizle",
   "account.last_status": "Son görülme",
   "account.link_verified_on": "Bu bağlantının sahipliği {date} tarihinde kontrol edildi",
   "account.locked_info": "Bu hesabın gizlilik durumu kilitli olarak ayarlanmış. Takip istekleri hesap sahibi tarafından onaylanır.",
   "account.login": "Giriş yap",
   "account.media": "Medya",
   "account.member_since": "{date} tarihinde katıldı",
-  "account.mention": "kullanıcısından bahset",
-  "account.mute": "@{name} adlı kişiyi sessize al",
+  "account.mention": "Bahset",
+  "account.mute": "@{name} adlı hesabı sessize al",
   "account.muted": "Sessize alındı",
   "account.never_active": "Asla",
   "account.posts": "Gönderi",
@@ -44,23 +44,23 @@
   "account.register": "Kayıt ol",
   "account.remote_follow": "Aracılığıyla takip et",
   "account.remove_from_followers": "Bu takipçiyi kaldır",
-  "account.report": "@{name} adlı kişiyi bildir",
+  "account.report": "@{name} adlı hesabı bildir",
   "account.requested": "Onay Bekleniyor. Takip isteğini iptal etmek için tıklayın",
   "account.requested_small": "Onay bekleniyor",
   "account.rss_feed": "RSS beslemesine abone olun",
   "account.search": "@{name} içerisinde ara",
-  "account.search_self": "Gönderilerinizi arayın",
+  "account.search_self": "Gönderileriniz içerisinde ara",
   "account.share": "@{name} kullanıcısının profilini paylaş",
-  "account.show_reblogs": "@{name} kullanıcısının yeniden gönderilerini göster",
+  "account.show_reblogs": "@{name} adlı hesabın yeniden gönderilerini göster",
   "account.subscribe": "@{name} tarafından gönderilen bildirimlere abone olun",
-  "account.subscribe.failure": "Bu hesaba abone olmaya çalışırken bir hata oluştu.",
+  "account.subscribe.failure": "Bu hesaba abone olmaya çalışılırken bir hata oluştu.",
   "account.subscribe.success": "Bu hesaba abone oldunuz.",
-  "account.unblock": "@{name} adlı kişinin engelini kaldır",
-  "account.unblock_domain": "{domain} göster",
-  "account.unendorse": "Profilde gösterme",
-  "account.unendorse.success": "You are no longer featuring @{acct}",
+  "account.unblock": "@{name} adlı hesabın engelini kaldır",
+  "account.unblock_domain": "{domain} alan adını gizleme",
+  "account.unendorse": "Profilde öne çıkartma",
+  "account.unendorse.success": "Artık @{acct} adlı hesabı profilinizde öne çıkartmıyorsunuz",
   "account.unfollow": "Takipi bırak",
-  "account.unmute": "@{name} adlı kişiyi sessizden çıkart",
+  "account.unmute": "@{name} adlı hesabı sessizden çıkart",
   "account.unsubscribe": "@{name} tarafından gönderilen bildirimlerin aboneliğinden çıkın",
   "account.unsubscribe.failure": "Bu hesabın aboneliğinden çıkılırken bir hata oluştu.",
   "account.unsubscribe.success": "Bu hesabın aboneliğinden çıktınız.",
@@ -71,13 +71,13 @@
   "account_moderation_modal.fields.badges": "Özel etiketler",
   "account_moderation_modal.fields.deactivate": "Hesabı devre dışı bırak",
   "account_moderation_modal.fields.delete": "Hesabı sil",
-  "account_moderation_modal.fields.suggested": "Suggested in people to follow",
+  "account_moderation_modal.fields.suggested": "Kişilerin takip etmesi önerilir",
   "account_moderation_modal.fields.verified": "Onaylanmış hesap",
   "account_moderation_modal.info.id": "Kimlik: {id}",
   "account_moderation_modal.roles.admin": "Yönetici",
   "account_moderation_modal.roles.moderator": "Moderatör",
   "account_moderation_modal.roles.user": "Kullanıcı",
-  "account_moderation_modal.title": "Moderasyon: @{acct}",
+  "account_moderation_modal.title": "@{acct} adlı hesabı denetle",
   "account_note.hint": "Bu kullanıcı hakkında kendiniz için notlar tutabilirsiniz (bu, onlarla paylaşılmayacaktır):",
   "account_note.placeholder": "Yorum sağlanmadı",
   "account_note.save": "Kaydet",
@@ -121,14 +121,14 @@
   "admin.edit_announcement.updated": "Duyuru düzenlendi",
   "admin.latest_accounts_panel.more": "Click to see {count} {count, plural, one {account} other {accounts}}",
   "admin.latest_accounts_panel.title": "Son Hesaplar",
-  "admin.moderation_log.empty_message": "Henüz herhangi bir moderasyon işlemi gerçekleştirmediniz. Bunu yaptığınızda, burada bir geçmiş gösterilecektir.",
+  "admin.moderation_log.empty_message": "Henüz herhangi bir moderasyon işlemi gerçekleştirmediniz. Burada yaptığınız moderasyon işlemlerinin geçmişi gösterilecektir.",
   "admin.reports.actions.close": "Kapat",
   "admin.reports.actions.view_status": "Gönderiyi gör",
-  "admin.reports.empty_message": "Açık bildirim yok. Bir kullanıcı şikayet edilirse burada görünür.",
+  "admin.reports.empty_message": "Açık bildirim yok. Bir hesap şikayet edilirse burada görünür.",
   "admin.reports.report_closed_message": "@{name} hakkındaki bildirim kapatıldı",
-  "admin.reports.report_title": "Report on {acct}",
-  "admin.software.backend": "Arka uç",
-  "admin.software.frontend": "Önyüz",
+  "admin.reports.report_title": "{acct} üzerindeki bildirim",
+  "admin.software.backend": "Backend",
+  "admin.software.frontend": "Frontend",
   "admin.statuses.actions.delete_status": "Gönderiyi sil",
   "admin.statuses.actions.mark_status_not_sensitive": "Gönderiyi hassas değil olarak işaretle",
   "admin.statuses.actions.mark_status_sensitive": "Gönderiyi hassas olarak işaretle",
@@ -138,21 +138,21 @@
   "admin.theme.title": "Tema",
   "admin.user_index.empty": "Kullanıcı bulunamadı.",
   "admin.user_index.search_input_placeholder": "Kimi arıyorsunuz?",
-  "admin.users.actions.deactivate_user": "@{name} kullanıcısını devre dışı bırak",
-  "admin.users.actions.delete_user": "@{name} kullanıcısını sil",
-  "admin.users.actions.demote_to_moderator_message": "@{acct}, moderatörlüğe düşürüldü",
-  "admin.users.actions.demote_to_user_message": "@{acct}, normal kullanıcıya düşürüldü",
-  "admin.users.actions.promote_to_admin_message": "@{acct}, yönetici konumuna yükseltildi",
-  "admin.users.actions.promote_to_moderator_message": "@{acct}, moderatör konumuna yükseltildi",
+  "admin.users.actions.deactivate_user": "@{name} adlı hesabı devre dışı bırak",
+  "admin.users.actions.delete_user": "@{name} adlı hesabı sil",
+  "admin.users.actions.demote_to_moderator_message": "@{acct} adlı hesap moderatörlük seviyesine düşürüldü",
+  "admin.users.actions.demote_to_user_message": "@{acct} adlı hesap normal kullanıcı seviyesine düşürüldü",
+  "admin.users.actions.promote_to_admin_message": "@{acct} adlı hesap yönetici seviyesine yükseltildi",
+  "admin.users.actions.promote_to_moderator_message": "@{acct} adlı hesap moderatörlük seviyesine yükseltildi",
   "admin.users.badges_saved_message": "Özel etiketler güncellendi.",
   "admin.users.remove_donor_message": "@{acct} was removed as a donor",
   "admin.users.set_donor_message": "@{acct} was set as a donor",
   "admin.users.user_deactivated_message": "@{acct} devre dışı bırakıldı",
-  "admin.users.user_deleted_message": "@{acct} silindi",
-  "admin.users.user_suggested_message": "@{acct} önerildi",
-  "admin.users.user_unsuggested_message": "@{acct} önerilerden çıkarıldı",
-  "admin.users.user_unverified_message": "@{acct} onaylanmadı",
-  "admin.users.user_verified_message": "@{acct} onaylandı",
+  "admin.users.user_deleted_message": "@{acct} adlı hesap silindi",
+  "admin.users.user_suggested_message": "@{acct} adlı hesap önerildi",
+  "admin.users.user_unsuggested_message": "@{acct} adlı hesap önerilerden çıkarıldı",
+  "admin.users.user_unverified_message": "@{acct} adlı hesap onaylanmadı",
+  "admin.users.user_verified_message": "@{acct} adlı hesap onaylandı",
   "admin_nav.awaiting_approval": "Onay Bekleniyor",
   "admin_nav.dashboard": "Yönetici Paneli",
   "admin_nav.reports": "Bildirimler",
@@ -187,7 +187,7 @@
   "app_create.submit": "Uygulama oluştur",
   "app_create.website_label": "Website",
   "auth.awaiting_approval": "Hesabınız onay bekliyor",
-  "auth.invalid_credentials": "Kullanıcı adı ya da parola yanlış",
+  "auth.invalid_credentials": "Kullanıcı adı ya da şifre yanlış",
   "auth.logged_out": "Çıkış yapıldı.",
   "auth_layout.register": "Hesap oluşturun",
   "authorize.success": "Onaylandı",

From 83db42cd9871cd613372855fd244af991352e4ab Mon Sep 17 00:00:00 2001
From: Furkan Kalkan <furkan.kalkan3@gmail.com>
Date: Mon, 10 Apr 2023 16:42:03 +0000
Subject: [PATCH 109/298] Translated using Weblate (Turkish)

Currently translated at 98.1% (1519 of 1547 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 540 ++++++++++++++++++------------------
 1 file changed, 270 insertions(+), 270 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 8eea37601..cfa9ba3a0 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -237,7 +237,7 @@
   "chat_message_list_intro.leave_chat.confirm": "Sohbetten Ayrıl",
   "chat_message_list_intro.leave_chat.heading": "Sohbetten Ayrıl",
   "chat_message_list_intro.leave_chat.message": "Bu sohbetten ayrılmaktan emin misiniz? Ayrıldığınızda sohbet ve mesajlar gelen kutunuzdan kaldırılacaktır.",
-  "chat_search.blankslate.body": "Sohbet edecek birini arayın.",
+  "chat_search.blankslate.body": "Sohbet etmek için birini arayın.",
   "chat_search.blankslate.title": "Sohbet başlat",
   "chat_search.empty_results_blankslate.action": "Birine mesaj gönder",
   "chat_search.empty_results_blankslate.body": "Başka bir isim aramayı deneyin.",
@@ -253,18 +253,18 @@
   "chat_settings.auto_delete.hint": "Gönderilen mesajlar seçilen zaman periyodundan sonra otomatik olarak silinecektir",
   "chat_settings.auto_delete.label": "Mesajları otomatik sil",
   "chat_settings.block.confirm": "Engelle",
-  "chat_settings.block.heading": "@{acct} Engelle",
+  "chat_settings.block.heading": "@{acct} adlı hesabı engelle",
   "chat_settings.block.message": "Engellemek bu profilden gelecek özel mesajları ve profil görüntülenmelerini engelleyecektir. Kararınızı değiştirirseniz daha sonra engeli kaldırabilirsiniz.",
   "chat_settings.leave.confirm": "Sohbetten ayrıl",
   "chat_settings.leave.heading": "Sohbetten Ayrıl",
   "chat_settings.leave.message": "Bu sohbetten ayrılmaktan emin misiniz? Ayrıldığınızda sohbet ve mesajlar gelen kutunuzdan kaldırılacaktır.",
-  "chat_settings.options.block_user": "@{acct} Engelle",
+  "chat_settings.options.block_user": "@{acct} adlı hesabı engelle",
   "chat_settings.options.leave_chat": "Sohbetten Ayrıl",
-  "chat_settings.options.report_user": "@{acct} Bildir",
-  "chat_settings.options.unblock_user": "Engeli Kaldır @{acct}",
+  "chat_settings.options.report_user": "@{acct} adlı hesabı bildir",
+  "chat_settings.options.unblock_user": "@{acct} adlı hesabın engelini kaldır",
   "chat_settings.title": "Sohbet Detayları",
   "chat_settings.unblock.confirm": "Engeli Kaldır",
-  "chat_settings.unblock.heading": "Engeli Kaldır @{acct}",
+  "chat_settings.unblock.heading": "@{acct} adlı hesabın engelini kaldır",
   "chat_settings.unblock.message": "Engeli kaldırmak bu profilin gönderilerinizi görmesine ve size özel mesaj göndermesine izin verir.",
   "chat_window.auto_delete_label": "{day} gün sonra otomatik sil",
   "chat_window.auto_delete_tooltip": "Sohbet mesajları, gönderildikten {day} gün sonra otomatik olarak silinecek şekilde ayarlandı.",
@@ -321,11 +321,11 @@
   "column.event_participants": "Etkinlik katılımcıları",
   "column.events": "Etkinlikler",
   "column.export_data": "Verileri dışa aktar",
-  "column.familiar_followers": "{name}'i takip eden tanıdığınız kişiler",
+  "column.familiar_followers": "{name} adlı hesabı takip eden tanıdığınız kişiler",
   "column.favourited_statuses": "Beğenilen gönderiler",
   "column.favourites": "Beğeniler",
   "column.federation_restrictions": "Federasyon Kısıtlamaları",
-  "column.filters": "Susturulmuş kelimeler",
+  "column.filters": "Sessize alınmış kelimeler",
   "column.filters.accounts": "Hesaplar",
   "column.filters.add_new": "Yeni Filtre Ekle",
   "column.filters.conversations": "Sohbetler",
@@ -364,7 +364,7 @@
   "column.mfa_disable_button": "Devre dışı bırak",
   "column.mfa_setup": "Kuruluma Devam Edin",
   "column.migration": "Hesap taşıma",
-  "column.mutes": "Susturulmuş kullanıcılar",
+  "column.mutes": "Sessize alınmış kullanıcılar",
   "column.notifications": "Bildirimler",
   "column.pins": "Sabitlenmiş gönderiler",
   "column.preferences": "Tercihler",
@@ -372,7 +372,7 @@
   "column.quotes": "Alıntıla",
   "column.reactions": "Tepkiler",
   "column.reblogs": "Yeniden gönderimler",
-  "column.scheduled_statuses": "Planlanmış Gönderiler",
+  "column.scheduled_statuses": "Zamanlanmış Gönderiler",
   "column.search": "Arama",
   "column.settings_store": "Ayar deposu",
   "column.soapbox_config": "Soapbox ayarları",
@@ -384,7 +384,7 @@
   "compare_history_modal.header": "Düzenleme geçmişi",
   "compose.character_counter.title": "{chars}/{maxChars} karakter kullanıldı",
   "compose.edit_success": "Gönderiniz düzenlendi",
-  "compose.invalid_schedule": "Bir gönderiyi en az 5 dakika sonrasına planlayabilirsiniz.",
+  "compose.invalid_schedule": "Bir gönderiyi en az 5 dakika sonrasına zamanlayabilirsiniz.",
   "compose.submit_success": "Gönderiniz gönderildi!",
   "compose_event.create": "Oluştur",
   "compose_event.edit_success": "Etkinliğiniz düzenlendi",
@@ -394,7 +394,7 @@
   "compose_event.fields.description_label": "Etkinlik açıklaması",
   "compose_event.fields.description_placeholder": "Açıklama",
   "compose_event.fields.end_time_label": "Etkinlik bitiş tarihi",
-  "compose_event.fields.end_time_placeholder": "Etkinlik şu tarihte sona eriyor:…",
+  "compose_event.fields.end_time_placeholder": "Etkinlik şu tarihte sona eriyor…",
   "compose_event.fields.has_end_time": "Etkinliğin bitiş tarihi var",
   "compose_event.fields.location_label": "Etkinlik konumu",
   "compose_event.fields.name_label": "Etkinlik adı",
@@ -410,8 +410,8 @@
   "compose_event.tabs.edit": "Detayları düzenle",
   "compose_event.tabs.pending": "İstekleri yönet",
   "compose_event.update": "Güncelle",
-  "compose_event.upload_banner": "Etkinlik başlık resmi yükleyiniz",
-  "compose_form.direct_message_warning": "Bu gönderi sadece belirtilen kullanıcılara gönderilecektir.",
+  "compose_event.upload_banner": "Etkinlik afişi yükleyiniz",
+  "compose_form.direct_message_warning": "Bu gönderi sadece bahsedilmiş kullanıcılara gönderilecektir.",
   "compose_form.event_placeholder": "Bu etkinliğe gönder",
   "compose_form.hashtag_warning": "Bu paylaşım liste dışı olduğu için hiç bir hashtag'de yer almayacak. Sadece herkese açık gönderiler hashtaglerde bulunabilir.",
   "compose_form.lock_disclaimer": "Hesabınız {locked} değil. Sadece takipçilerle paylaştığınız gönderileri görebilmek için sizi herhangi bir kullanıcı takip edebilir.",
@@ -435,17 +435,17 @@
   "compose_form.save_changes": "Değişiklikleri kaydet",
   "compose_form.schedule": "Zamanla",
   "compose_form.scheduled_statuses.click_here": "Buraya tıklayınız",
-  "compose_form.scheduled_statuses.message": "Planlanmış gönderileriniz var. Onları görmek için {click_here}.",
-  "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
+  "compose_form.scheduled_statuses.message": "Zamanlanmış gönderileriniz var. Onları görmek için {click_here}.",
+  "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenmiştir",
   "compose_form.spoiler.unmarked": "Metin gizli değil",
-  "compose_form.spoiler_placeholder": "İçerik uyarısı (opsiyonel)",
+  "compose_form.spoiler_placeholder": "İçerik ile ilgili uyarınızı buraya yazınız (zorunlu değil)",
   "compose_form.spoiler_remove": "Hassasiyeti kaldır",
   "compose_form.spoiler_title": "Hassas içerik",
   "compose_group.share_to_followers": "Takipçilerimle paylaş",
   "confirmation_modal.cancel": "İptal",
-  "confirmations.admin.deactivate_user.confirm": "@{name} kullanıcısını devre dışı bırak",
-  "confirmations.admin.deactivate_user.heading": "Devre dışı bırak: @{acct}",
-  "confirmations.admin.deactivate_user.message": "@{acct} kullanıcısını devre dışı bırakmak üzeresiniz. Bir kullanıcıyı devre dışı bırakmak geri alınabilir bir işlemdir.",
+  "confirmations.admin.deactivate_user.confirm": "@{name} adlı hesabı devre dışı bırak",
+  "confirmations.admin.deactivate_user.heading": "@{acct} adlı hesabı devre dışı bırak",
+  "confirmations.admin.deactivate_user.message": "@{acct} adlı hesabı devre dışı bırakmak üzeresiniz. Bu işlem geri alınabilir bir işlemdir.",
   "confirmations.admin.delete_announcement.confirm": "Sil",
   "confirmations.admin.delete_announcement.heading": "Duyuruyu sil",
   "confirmations.admin.delete_announcement.message": "Duyuruyu silmek istediğinizden emin misiniz?",
@@ -453,25 +453,25 @@
   "confirmations.admin.delete_status.confirm": "Gönderiyi sil",
   "confirmations.admin.delete_status.heading": "Gönderiyi sil",
   "confirmations.admin.delete_status.message": "@{acct} tarafından gönderilen bir gönderiyi silmek üzeresiniz. Bu işlem geri alınamaz.",
-  "confirmations.admin.delete_user.confirm": "Sil: @{name}",
-  "confirmations.admin.delete_user.heading": "Sil: @{acct}",
-  "confirmations.admin.delete_user.message": "@{acct} hesabını silmek üzeresiniz. BU, GERİ DÖNÜŞÜ OLMAYAN YIKICI BİR EYLEMDİR.",
+  "confirmations.admin.delete_user.confirm": "@{name} adlı hesabı sil",
+  "confirmations.admin.delete_user.heading": "@{acct} adlı hesabı sil",
+  "confirmations.admin.delete_user.message": "@{acct} adlı hesabı silmek üzeresiniz. BU, GERİ DÖNÜŞÜ OLMAYAN YIKICI BİR EYLEMDİR.",
   "confirmations.admin.mark_status_not_sensitive.confirm": "Gönderiyi hassas değil olarak işaretle",
   "confirmations.admin.mark_status_not_sensitive.heading": "Gönderiyi hassas değil olarak işaretle",
   "confirmations.admin.mark_status_not_sensitive.message": "@{acct} tarafından gönderilen bir gönderiyi hassas değil olarak işaretlemek üzeresiniz.",
   "confirmations.admin.mark_status_sensitive.confirm": "Gönderiyi hassas olarak işaretle",
   "confirmations.admin.mark_status_sensitive.heading": "Gönderiyi hassas olarak işaretle",
   "confirmations.admin.mark_status_sensitive.message": "@{acct} tarafından gönderilen bir gönderiyi hassas olarak işaretlemek üzeresiniz.",
-  "confirmations.admin.reject_user.confirm": "Reddet: @{name}",
-  "confirmations.admin.reject_user.heading": "Reddet: @{acct}",
+  "confirmations.admin.reject_user.confirm": "@{name} adlı hesabı reddet",
+  "confirmations.admin.reject_user.heading": "@{acct} adlı hesabı reddet",
   "confirmations.admin.reject_user.message": "@{acct} tarafından yapılan kayıt isteğini reddetmek üzeresiniz. Bu işlem geri alınamaz.",
   "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
-  "confirmations.block.heading": "@{name} adlı kişiyi engelle",
-  "confirmations.block.message": "{name} adlı kullanıcıyı engellemek istiyor musunuz?",
-  "confirmations.block_from_group.confirm": "Engelle",
+  "confirmations.block.heading": "@{name} adlı hesabı engelle",
+  "confirmations.block.message": "{name} adlı hesabı engellemek istiyor musunuz?",
+  "confirmations.block_from_group.confirm": "Hesabı Engelle",
   "confirmations.block_from_group.heading": "Gruptan Engelle",
-  "confirmations.block_from_group.message": "@{name} kullanıcısının bu grupla etkileşime girmesini engellemek istediğinizden emin misiniz?",
+  "confirmations.block_from_group.message": "@{name} adlı hesabın bu grupla etkileşime girmesini engellemek istediğinizden emin misiniz?",
   "confirmations.cancel.confirm": "İptal et",
   "confirmations.cancel.heading": "Gönderiyi iptal et",
   "confirmations.cancel.message": "Bu gönderiyi oluşturmayı iptal etmek istediğinizden emin misiniz?",
@@ -487,7 +487,7 @@
   "confirmations.delete_event.heading": "Etkinliği sil",
   "confirmations.delete_event.message": "Bu etkinliği silmek istediğinizden emin misiniz?",
   "confirmations.delete_from_group.heading": "Gruptan sil",
-  "confirmations.delete_from_group.message": "@{name} kullanıcısının gönderisini silmek istediğinizden emin misiniz?",
+  "confirmations.delete_from_group.message": "@{name} adlı hesabın gönderisini silmek istediğinizden emin misiniz?",
   "confirmations.delete_group.confirm": "Sil",
   "confirmations.delete_group.heading": "Grubu sil",
   "confirmations.delete_group.message": "Bu grubu silmek istediğinizden emin misiniz? Bu, geri alınamayan kalıcı bir eylemdir.",
@@ -495,44 +495,44 @@
   "confirmations.delete_list.heading": "Listeyi sil",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinize emin misiniz?",
   "confirmations.domain_block.confirm": "Alan adının tamamını gizle",
-  "confirmations.domain_block.heading": "Engelle: {domain}",
+  "confirmations.domain_block.heading": "{domain} alan adını engelle",
   "confirmations.domain_block.message": "Tüm {domain} alan adını engellemek istediğinizden emin misiniz? Genellikle birkaç hedefli engel ve susturma işi görür ve tercih edilir.",
   "confirmations.kick_from_group.confirm": "Gruptan At",
   "confirmations.kick_from_group.heading": "Grup üyesini gruptan at",
-  "confirmations.kick_from_group.message": "@{name} kullanıcısını gruptan atmak istediğinizden emin misiniz?",
+  "confirmations.kick_from_group.message": "@{name} adlı hesabı gruptan atmak istediğinizden emin misiniz?",
   "confirmations.leave_event.confirm": "Etkinlikten ayrıl",
   "confirmations.leave_event.message": "Etkinliğe yeniden katılmak isterseniz, istek tekrar incelenecektir. Devam etmek istediğinizden emin misiniz?",
   "confirmations.leave_group.confirm": "Ayrıl",
   "confirmations.leave_group.heading": "Gruptan ayrılın",
   "confirmations.leave_group.message": "Gruptan ayrılmak üzeresiniz. Devam etmek istiyor musunuz?",
   "confirmations.mute.confirm": "Sessize al",
-  "confirmations.mute.heading": "Sessize al: @{name}",
-  "confirmations.mute.message": "{name} kullanıcısını sessize almak istiyor musunuz?",
+  "confirmations.mute.heading": "@{name} adlı hesabı sessize al",
+  "confirmations.mute.message": "{name} adlı hesabı sessize almak istiyor musunuz?",
   "confirmations.redraft.confirm": "Sil ve yeniden tasarla",
-  "confirmations.redraft.heading": "Sil ve yeniden tasarla",
-  "confirmations.redraft.message": "Bu durumu silip tekrar taslaklaştırmak istediğinizden emin misiniz? Tüm cevapları, boostları ve favorileri kaybedeceksiniz.",
-  "confirmations.register.needs_approval": "Hesabınız bir yönetici tarafından onaylanacaktır. Ayrıntılarınızı incelerken lütfen sabırlı olun.",
+  "confirmations.redraft.heading": "Sil ve yeniden taslaklaştır",
+  "confirmations.redraft.message": "Bu gönderiyi silip tekrar taslaklaştırmak istediğinizden emin misiniz? Tüm yanıtlar, yeniden gönderiler ve beğenileri kaybedeceksiniz.",
+  "confirmations.register.needs_approval": "Hesabınız bir yönetici tarafından onaylanacaktır. Onay süreci boyunca lütfen sabırlı olun.",
   "confirmations.register.needs_approval.header": "Onay gerekli",
   "confirmations.register.needs_confirmation": "Onay talimatları için lütfen {email} adresinden gelen e-postayı kontrol ediniz. Devam etmek için e-posta adresinizi doğrulamanız gerekecek.",
   "confirmations.register.needs_confirmation.header": "Onay gerekli",
   "confirmations.remove_from_followers.confirm": "Kaldır",
-  "confirmations.remove_from_followers.message": "{name} kullanıcısını takipçilerinizden çıkarmak istediğinizden emin misiniz?",
+  "confirmations.remove_from_followers.message": "{name} adlı hesabı takipçilerinizden çıkarmak istediğinizden emin misiniz?",
   "confirmations.reply.confirm": "Yanıtla",
   "confirmations.reply.message": "Şimdi yanıtlarken o an oluşturduğunuz mesajın üzerine yazılır. Devam etmek istediğinize emin misiniz?",
   "confirmations.revoke_session.confirm": "İptal et",
   "confirmations.revoke_session.heading": "Geçerli oturumu iptal et",
   "confirmations.revoke_session.message": "Geçerli oturumunuzu iptal etmek üzeresiniz. Oturumunuz kapatılacak.",
   "confirmations.scheduled_status_delete.confirm": "İptal",
-  "confirmations.scheduled_status_delete.heading": "Planlanan gönderiyi iptal et",
-  "confirmations.scheduled_status_delete.message": "Bu planlanmış gönderiyi iptal etmek istediğinizden emin misiniz?",
+  "confirmations.scheduled_status_delete.heading": "Zamanlanan gönderiyi iptal et",
+  "confirmations.scheduled_status_delete.message": "Bu zamanlanmış gönderiyi iptal etmek istediğinizden emin misiniz?",
   "confirmations.unfollow.confirm": "Takibi kaldır",
   "crypto_donate.explanation_box.message": "{siteTitle}, kripto para bağışlarını kabul eder. Aşağıdaki adreslerden herhangi birine bağış gönderebilirsiniz. Desteğin için teşekkürler!",
-  "crypto_donate.explanation_box.title": "Kripto para birimi bağışları gönderme",
+  "crypto_donate.explanation_box.title": "Kripto para bağışları gönderme",
   "crypto_donate_panel.actions.view": "Click to see {count} {count, plural, one {wallet} other {wallets}}",
   "crypto_donate_panel.heading": "Kripto Para Bağışlayın",
   "crypto_donate_panel.intro.message": "{siteTitle}, hizmetlerini finanse etmek için kripto para bağışlarını kabul eder. Desteğin için teşekkürler!",
-  "datepicker.day": "Day",
-  "datepicker.hint": "Yayınlanmak üzere planlandı…",
+  "datepicker.day": "Gün",
+  "datepicker.hint": "Tarihinde yayınlanmak üzere zamanlandı…",
   "datepicker.month": "Ay",
   "datepicker.next_month": "Gelecek ay",
   "datepicker.next_year": "Gelecek sene",
@@ -549,14 +549,14 @@
   "developers.navigation.app_create_label": "Uygulama oluştur",
   "developers.navigation.intentional_error_label": "Trigger an error",
   "developers.navigation.leave_developers_label": "Geliştiricilikten ayrıl",
-  "developers.navigation.network_error_label": "Network error",
+  "developers.navigation.network_error_label": "Ağ hatası",
   "developers.navigation.service_worker_label": "Service Worker",
   "developers.navigation.settings_store_label": "Ayar deposu",
   "developers.navigation.show_toast": "Açılır bildirimi tetikle",
   "developers.navigation.test_timeline_label": "Test zaman çizelgesi",
   "developers.settings_store.advanced": "Gelişmiş Ayarlar",
   "developers.settings_store.hint": "Burada kullanıcı ayarlarınızı doğrudan düzenlemeniz mümkündür. DİKKATLİ OLUN! Bu bölümü düzenlemek hesabınızı bozabilir ve yalnızca API aracılığıyla kurtarabilirsiniz.",
-  "direct.search_placeholder": "Send a message to…",
+  "direct.search_placeholder": "Şuraya mesaj gönder…",
   "directory.federated": "Bilinen fediverse'den",
   "directory.local": "Yalnızca {domain} adresinden",
   "directory.new_arrivals": "Yeni gelenler",
@@ -573,38 +573,38 @@
   "edit_password.header": "Şifre Değiştir",
   "edit_profile.error": "Profil güncellemesi başarısız oldu",
   "edit_profile.fields.accepts_email_list_label": "Bültene abone ol",
-  "edit_profile.fields.avatar_label": "Avatar",
-  "edit_profile.fields.bio_label": "Bio",
+  "edit_profile.fields.avatar_label": "Profil Resmi Seçin",
+  "edit_profile.fields.bio_label": "Hakkında",
   "edit_profile.fields.bio_placeholder": "Bize kendinden bahset.",
   "edit_profile.fields.birthday_label": "Doğum günü",
   "edit_profile.fields.birthday_placeholder": "Doğum gününüz",
   "edit_profile.fields.bot_label": "Bu bir bot hesaptır",
   "edit_profile.fields.discoverable_label": "Hesap keşfine izin ver",
   "edit_profile.fields.display_name_label": "Görünen isim",
-  "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
+  "edit_profile.fields.display_name_placeholder": "İsim",
+  "edit_profile.fields.header_label": "Arka Plan Resmi Seçin",
   "edit_profile.fields.hide_network_label": "Ağı gizle",
   "edit_profile.fields.location_label": "Konum",
   "edit_profile.fields.location_placeholder": "Konum",
-  "edit_profile.fields.locked_label": "Lock account",
-  "edit_profile.fields.meta_fields.content_placeholder": "Content",
-  "edit_profile.fields.meta_fields.label_placeholder": "Label",
+  "edit_profile.fields.locked_label": "Hesabı kilitle",
+  "edit_profile.fields.meta_fields.content_placeholder": "İçerik",
+  "edit_profile.fields.meta_fields.label_placeholder": "Etiket",
   "edit_profile.fields.meta_fields_label": "Profil alanları",
   "edit_profile.fields.stranger_notifications_label": "Yabancılardan gelen bildirimleri engelle",
   "edit_profile.fields.website_label": "Website",
   "edit_profile.fields.website_placeholder": "Bağlantı Görüntüle",
   "edit_profile.header": "Profili Düzenle",
   "edit_profile.hints.accepts_email_list": "Haberlere ve pazarlama güncellemelerine kaydolun.",
-  "edit_profile.hints.avatar": "PNG, GIF veya JPG kabul edilmektedir. {size} boyutuna küçültülecek",
-  "edit_profile.hints.bot": "Bu hesap çoğunlukla otomatik işlemler gerçekleştirir ve izlenemeyebilir",
+  "edit_profile.hints.avatar": "PNG, GIF veya JPG formatları kabul edilmektedir. {size} boyutuna küçültülecek",
+  "edit_profile.hints.bot": "Bu hesap çoğunlukla otomatik işlemler gerçekleştirir ve izlenmiyor olabilir",
   "edit_profile.hints.discoverable": "Hesabı profil dizininde görüntüleyin ve harici hizmetler tarafından dizine eklenmesine izin verin",
-  "edit_profile.hints.header": "PNG, GIF veya JPG kabul edilmektedir. {size} boyutuna küçültülecek",
+  "edit_profile.hints.header": "PNG, GIF veya JPG formatları kabul edilmektedir. {size} boyutuna küçültülecek",
   "edit_profile.hints.hide_network": "Kimleri takip ettiğiniz ve kimlerin sizi takip ettiği profilinizde gösterilmeyecek",
-  "edit_profile.hints.locked": "Takipçileri manuel olarak onaylamanızı gerektirir",
+  "edit_profile.hints.locked": "Takipçileri elle onaylamanızı gerektirir",
   "edit_profile.hints.meta_fields": "Profilinize {count}'a kadar ek alan ekleyebilirsiniz.",
   "edit_profile.hints.stranger_notifications": "Yalnızca takip ettiğiniz kişilerden gelen bildirimleri gösterin",
   "edit_profile.save": "Kaydet",
-  "edit_profile.success": "Profile saved!",
+  "edit_profile.success": "Profiliniz başarıyla kaydedildi!",
   "email_confirmation.success": "E-posta adresiniz onaylandı!",
   "email_passthru.confirmed.body": "Bu sekmeyi kapatın ve bu onay e-postasını gönderdiğiniz {bold} üzerinde kayıt işlemine devam edin.",
   "email_passthru.confirmed.heading": "E-posta Onaylandı!",
@@ -619,27 +619,27 @@
   "email_passthru.token_expired.heading": "Bağlantının Süresi Doldu",
   "email_passthru.token_not_found.body": "E-posta bağlantınız bulunamadı. Lütfen bu e-posta onayını gönderdiğiniz {bold}'dan yeni bir e-posta onayı isteyin.",
   "email_passthru.token_not_found.heading": "Geçersiz Bağlantı",
-  "email_verification.email.label": "E-mail address",
-  "email_verification.fail": "E-posta doğrulama isteğinde bulunulamadı.",
+  "email_verification.email.label": "E-posta adresi",
+  "email_verification.fail": "E-posta doğrulama isteği başarısız oldu.",
   "email_verification.header": "E-posta adresinizi giriniz",
   "email_verification.success": "Doğrulama e-postası başarıyla gönderildi.",
   "email_verification.taken": "alınmış",
   "email_verifilcation.exists": "Bu email zaten alınmış.",
-  "embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
-  "emoji_button.activity": "Aktivite",
+  "embed.instructions": "Aşağıdaki kodu kopyalayarak bu gönderiyi sitenize ekleyebilirsiniz.",
+  "emoji_button.activity": "Etkinlik",
   "emoji_button.add_custom": "Özel emoji ekle",
   "emoji_button.custom": "Özel",
   "emoji_button.flags": "Bayraklar",
   "emoji_button.food": "Yiyecek ve İçecek",
   "emoji_button.label": "Emoji ekle",
   "emoji_button.nature": "Doğa",
-  "emoji_button.not_found": "İfade yok!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Emoji bulunamadı.",
   "emoji_button.objects": "Nesneler",
   "emoji_button.oh_no": "Olamaz!",
   "emoji_button.people": "İnsanlar",
   "emoji_button.pick": "Bir emoji seç…",
   "emoji_button.recent": "Sık kullanılan",
-  "emoji_button.search": "Ara...",
+  "emoji_button.search": "Ara…",
   "emoji_button.search_results": "Arama sonuçları",
   "emoji_button.skins_1": "Varsayılan",
   "emoji_button.skins_2": "Beyaz ten",
@@ -653,26 +653,26 @@
   "empty_column.account_blocked": "@{accountUsername} tarafından engellendiniz.",
   "empty_column.account_favourited_statuses": "Bu kullanıcının henüz beğendiği gönderi yok.",
   "empty_column.account_timeline": "Burada hiç gönderi yok!",
-  "empty_column.account_unavailable": "Profil kullanılamıyor",
+  "empty_column.account_unavailable": "Profile ulaşılamıyor",
   "empty_column.admin.announcements": "Henüz bir duyuru yok.",
   "empty_column.aliases": "Henüz bir hesap takma adı oluşturmadınız.",
   "empty_column.aliases.suggestions": "Verilen ifade için önerilen hesap yok.",
   "empty_column.blocks": "Henüz bir kullanıcıyı engellemediniz.",
   "empty_column.bookmarks": "Henüz yer işaretiniz yok. Eklediğinizde, burada görünecektir.",
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
-  "empty_column.direct": "Henüz doğrudan mesajınız yok. Bir tane gönderdiğinizde veya aldığınızda burada görünecektir.",
+  "empty_column.direct": "Henüz özel mesajınız yok. Bir tane gönderdiğinizde veya aldığınızda burada görünecektir.",
   "empty_column.dislikes": "Bu gönderiyi henüz beğenmeyen yok. Birisi yaptığında, burada görünecek.",
   "empty_column.domain_blocks": "Henüz hiçbir gizli alan adı yok.",
   "empty_column.event_participant_requests": "Bekleyen etkinlik katılım isteği yok.",
   "empty_column.event_participants": "Bu etkinliğe henüz kimse katılmadı. Birisi katıldığında, burada görünecektir.",
-  "empty_column.favourited_statuses": "Hiç favori gönderiminiz yok. Bir tane olursa burada görünecek.",
-  "empty_column.favourites": "Kimse bu gönderiyi favorilerine eklememiş. Biri eklerse burada görünecek.",
+  "empty_column.favourited_statuses": "Hiç beğendiğiniz gönderi yok. Bir tane olursa burada görünecek.",
+  "empty_column.favourites": "Kimse bu gönderiyi beğeni listesine eklememiş. Biri eklerse burada görünecek.",
   "empty_column.filters": "Henüz sessize alınan kelime oluşturmadınız.",
   "empty_column.follow_recommendations": "Görünüşe göre sizin için hiçbir öneri oluşturulamadı. Tanıyor olabileceğiniz kişileri aramak veya trend olan hashtag'leri keşfetmek için aramayı kullanmayı deneyebilirsiniz.",
   "empty_column.follow_requests": "Hiç takip isteğiniz yok. Bir tane aldığınızda burada görünecek.",
   "empty_column.group": "Bu grupta henüz bir gönderi yok.",
   "empty_column.group_blocks": "Grup henüz hiçbir kullanıcıyı engellemedi.",
-  "empty_column.group_membership_requests": "Bu grup için bekleyen üyelik talebi bulunmamaktadır.",
+  "empty_column.group_membership_requests": "Bu grup için bekleyen üyelik isteği bulunmamaktadır.",
   "empty_column.hashtag": "Henüz bu hashtag’e sahip hiçbir gönderi yok.",
   "empty_column.home": "Henüz kimseyi takip etmiyorsunuz. {public} ziyaret edebilir veya arama kısmını kullanarak diğer kullanıcılarla iletişime geçebilirsiniz.",
   "empty_column.home.local_tab": "the {site_title} tab",
@@ -681,13 +681,13 @@
   "empty_column.list": "Bu listede henüz hiçbir şey yok.",
   "empty_column.lists": "Henüz hiç listeniz yok. Bir tane oluşturduğunuzda burada görünecek.",
   "empty_column.mutes": "Henüz hiçbir kullanıcıyı sessize almadınız.",
-  "empty_column.notifications": "Henüz hiçbir bildiriminiz yok. Diğer insanlarla sobhet edebilmek için etkileşime geçebilirsiniz.",
+  "empty_column.notifications": "Henüz hiçbir bildiriminiz yok. Diğer insanlarla sohbet edebilmek için etkileşime geçebilirsiniz.",
   "empty_column.notifications_filtered": "Henüz bu tür için bir bildiriminiz yok.",
   "empty_column.public": "Burada hiçbir şey yok! Herkese açık bir şeyler yazın veya burayı doldurmak için diğer sunuculardaki kullanıcıları takip edin",
   "empty_column.quotes": "Bu gönderi henüz alıntılanmadı.",
-  "empty_column.remote": "There is nothing here! Manually follow users from {instance} to fill it up.",
-  "empty_column.scheduled_statuses": "Henüz planlanmış durumunuz yok. Bir tane eklediğinizde, burada görünecektir.",
-  "empty_column.search.accounts": "\"{term}\" için hiç kişi sonucu yok",
+  "empty_column.remote": "Burada hiçbir şey yok! Doldurmak için {instance} sunucusundan kullanıcıları takip edin.",
+  "empty_column.scheduled_statuses": "Henüz zamanlanmış gönderiniz yok. Bir tane eklediğinizde, burada görünecektir.",
+  "empty_column.search.accounts": "\"{term}\" için kişi sonucu yok",
   "empty_column.search.groups": "\"{term}\" için grup sonucu yok",
   "empty_column.search.hashtags": "\"{term}\" için hashtag sonucu yok",
   "empty_column.search.statuses": "\"{term}\" için gönderi sonucu yok",
@@ -696,7 +696,7 @@
   "event.copy": "Etkinliğin bağlantısını kopyala",
   "event.date": "Tarih",
   "event.description": "Açıklama",
-  "event.discussion.empty": "Henüz kimse bu etkinliğe yorum yapmadı. Birisi yotum yaptığında, burada görünecektir.",
+  "event.discussion.empty": "Henüz kimse bu etkinliğe yorum yapmadı. Birisi yorum yaptığında, burada görünecektir.",
   "event.export_ics": "Takviminize aktarın",
   "event.external": "{domain} üzerindeki etkinliği görün",
   "event.join_state.accept": "Gidiyorum",
@@ -708,7 +708,7 @@
   "event.organized_by": "{name} tarafından organize edildi",
   "event.participants": "{count} kişi gidiyor",
   "event.quote": "Etkinliği alıntıla",
-  "event.reblog": "Etkşnliği yeniden paylaş",
+  "event.reblog": "Etkinliği yeniden paylaş",
   "event.show_on_map": "Haritada göster",
   "event.unreblog": "Etkinliği yeniden yayınlamayı kaldır",
   "event.website": "Harici bağlantılar",
@@ -718,7 +718,7 @@
   "events.joined_events.empty": "Henüz herhangi bir etkinliğe katılmadınız.",
   "events.recent_events": "Yakındaki etkinlikler",
   "events.recent_events.empty": "Henüz halka açık bir etkinlik yok.",
-  "export_data.actions.export": "Export",
+  "export_data.actions.export": "Dışa aktar",
   "export_data.actions.export_blocks": "Engellemeleri dışa aktar",
   "export_data.actions.export_follows": "Takipleri dışa aktar",
   "export_data.actions.export_mutes": "Sessize almaları dışa aktar",
@@ -750,7 +750,7 @@
   "filters.context_hint": "Filtrenin uygulanması gereken bir veya daha fazla bağlam",
   "filters.create_filter": "Filtre oluştur",
   "filters.filters_list_context_label": "Bağlamları filtrele:",
-  "filters.filters_list_drop": "Drop",
+  "filters.filters_list_drop": "Bırak",
   "filters.filters_list_expired": "Süresi doldu",
   "filters.filters_list_hide": "Gizle",
   "filters.filters_list_hide_completely": "İçeriği gizle",
@@ -765,19 +765,19 @@
   "gdpr.message": "{siteTitle}, web sitesinin çalışması için gerekli olan oturum tanımlama bilgilerini kullanır.",
   "gdpr.title": "{siteTitle} çerezleri kullanır",
   "getting_started.open_source_notice": "{code_name} açık kaynaklı bir yazılımdır. Gitlab {code_link} (v{code_version}).",
-  "group.cancel_request": "Talebi iptal et",
+  "group.cancel_request": "İsteği iptal et",
   "group.delete.success": "Grup başarıyla silindi",
   "group.demote.user.success": "@{name} artık bir üye",
   "group.group_mod_authorize.fail": "@{name} onaylanamadı",
-  "group.group_mod_block": "@{name} kullanıcısını gruptan engelle",
-  "group.group_mod_block.success": "@{name} engellendi",
+  "group.group_mod_block": "@{name} adlı hesabı gruptan engelle",
+  "group.group_mod_block.success": "@{name} adlı hesap engellendi",
   "group.group_mod_demote": "{role} rolünü kaldır",
-  "group.group_mod_kick": "@{name} kullanıcısını gruptan at",
-  "group.group_mod_kick.success": "@{name} kullanıcısı gruptan atıldı",
+  "group.group_mod_kick": "@{name} adlı hesabı gruptan at",
+  "group.group_mod_kick.success": "@{name} adlı hesap gruptan atıldı",
   "group.group_mod_promote_mod": "{role} rolünü atayın",
   "group.group_mod_reject.fail": "@{name} reddedilemedi",
   "group.group_mod_unblock": "Engellemeyi Kaldır",
-  "group.group_mod_unblock.success": "@{name} kullanıcısının gruptaki engeli kaldırıldı",
+  "group.group_mod_unblock.success": "@{name} adlı hesabın gruptaki engeli kaldırıldı",
   "group.header.alt": "Grup başlığı",
   "group.join.private": "Erişim İsteği",
   "group.join.public": "Gruba Katıl",
@@ -793,14 +793,14 @@
   "group.popover.title": "Üyelik gerekli",
   "group.privacy.locked": "Özel",
   "group.privacy.locked.full": "Özel Grup",
-  "group.privacy.locked.info": "Keşfedilebilir. Kullanıcılar, talepleri onaylandıktan sonra katılabilirler.",
+  "group.privacy.locked.info": "Keşfedilebilir. Kullanıcılar, istekleri onaylandıktan sonra katılabilirler.",
   "group.privacy.public": "Herkese açık",
   "group.privacy.public.full": "Herkese Açık Grup",
   "group.privacy.public.info": "Keşfedilebilir. Herkes katılabilir.",
-  "group.promote.admin.confirmation.message": "Yönetici rolünü @{name}'e atamak istediğinizden emin misiniz?",
+  "group.promote.admin.confirmation.message": "Yönetici rolünü @{name} adlı hesaba atamak istediğinizden emin misiniz?",
   "group.promote.admin.confirmation.title": "Yönetici Rolü Atama",
   "group.promote.admin.success": "@{name} artık bir yönetici",
-  "group.report.label": "Raporla",
+  "group.report.label": "Bildir",
   "group.role.admin": "Yönetici",
   "group.role.owner": "Sahibi",
   "group.tabs.all": "Tümü",
@@ -836,18 +836,18 @@
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
-  "header.home.label": "Home",
-  "header.login.forgot_password": "Parolanızı mı unuttunuz?",
-  "header.login.label": "Log in",
-  "header.login.password.label": "Password",
+  "header.home.label": "Anasayfa",
+  "header.login.forgot_password": "Şifrenizi mi unuttunuz?",
+  "header.login.label": "Giriş Yap",
+  "header.login.password.label": "Şifre",
   "header.login.username.placeholder": "E-posta ya da kullanıcı adı",
-  "header.menu.title": "Open menu",
+  "header.menu.title": "Menüyü aç",
   "header.register.label": "Kayıt ol",
-  "home.column_settings.show_reblogs": "Boost edilenleri göster",
+  "home.column_settings.show_reblogs": "Yeniden gönderilen gönderileri göster",
   "home.column_settings.show_replies": "Cevapları göster",
-  "icon_button.icons": "Icons",
+  "icon_button.icons": "Simgeler",
   "icon_button.label": "Simge seç",
-  "import_data.actions.import": "Import",
+  "import_data.actions.import": "İçe aktar",
   "import_data.actions.import_blocks": "Engellemeleri içe aktar",
   "import_data.actions.import_follows": "Takipleri içe aktar",
   "import_data.actions.import_mutes": "Sessize almaları içe aktar",
@@ -863,9 +863,9 @@
   "input.copy": "Kopyala",
   "input.password.hide_password": "Şifreyi gizle",
   "input.password.show_password": "Şifreyi göster",
-  "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
-  "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
-  "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
+  "intervals.full.days": "gün",
+  "intervals.full.hours": "saat",
+  "intervals.full.minutes": "dakika",
   "join_event.hint": "Organizatöre neden bu etkinliğe katılmak istediğinizi söyleyebilirsiniz:",
   "join_event.join": "Katılma isteği",
   "join_event.placeholder": "Organizatöre mesaj",
@@ -874,24 +874,24 @@
   "join_event.title": "Etkinliğe katıl",
   "keyboard_shortcuts.back": "geriye gitmek için",
   "keyboard_shortcuts.blocked": "engelli kullanıcılar listesini açmak için",
-  "keyboard_shortcuts.boost": "boostlamak için",
+  "keyboard_shortcuts.boost": "yeniden paylaşmak için",
   "keyboard_shortcuts.compose": "yazma alanına odaklanmak için",
   "keyboard_shortcuts.down": "listede aşağıya inmek için",
-  "keyboard_shortcuts.enter": "durumu açmak için",
+  "keyboard_shortcuts.enter": "gönderiyi açmak için",
   "keyboard_shortcuts.favourite": "favorilere eklemek için",
-  "keyboard_shortcuts.favourites": "favoriler listesini açmak için",
+  "keyboard_shortcuts.favourites": "beğeni listesini açmak için",
   "keyboard_shortcuts.heading": "Klavye kısayolları",
-  "keyboard_shortcuts.home": "ana sayfa zaman çizelgesini açmak için",
-  "keyboard_shortcuts.hotkey": "Kısatuş",
-  "keyboard_shortcuts.legend": "bu efsaneyi görüntülemek için",
+  "keyboard_shortcuts.home": "ana zaman çizelgesini açmak için",
+  "keyboard_shortcuts.hotkey": "Kısayol tuşu",
+  "keyboard_shortcuts.legend": "bu göstergeyi görüntülemek için",
   "keyboard_shortcuts.mention": "yazardan bahsetmek için",
-  "keyboard_shortcuts.muted": "susturulmuş kullanıcı listesini açmak için",
+  "keyboard_shortcuts.muted": "sessize alınmış kullanıcı listesini açmak için",
   "keyboard_shortcuts.my_profile": "profilinizi açmak için",
   "keyboard_shortcuts.notifications": "bildirimler sütununu açmak için",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "medyayı açmak için",
   "keyboard_shortcuts.pinned": "sabitlenmiş gönderiler listesini açmak için",
   "keyboard_shortcuts.profile": "yazarın profilini açmak için",
-  "keyboard_shortcuts.react": "to react",
+  "keyboard_shortcuts.react": "tepki vermek için",
   "keyboard_shortcuts.reply": "cevaplamak için",
   "keyboard_shortcuts.requests": "takip istekleri listesini açmak için",
   "keyboard_shortcuts.search": "aramaya odaklanmak için",
@@ -900,42 +900,42 @@
   "keyboard_shortcuts.toot": "yeni bir gönderiye başlamak için",
   "keyboard_shortcuts.unfocus": "aramada bir gönderiye odaklanmamak için",
   "keyboard_shortcuts.up": "listede yukarıya çıkmak için",
-  "landing_page_modal.download": "Download",
+  "landing_page_modal.download": "İndir",
   "landing_page_modal.helpCenter": "Yardım Merkezi",
   "lightbox.close": "Kapat",
   "lightbox.next": "Sonraki",
-  "lightbox.previous": "Önceli",
+  "lightbox.previous": "Önceki",
   "lightbox.view_context": "İçeriği göster",
   "list.click_to_add": "Kişi eklemek için burayı tıklayın",
   "list_adder.header_title": "Listelere Ekle veya Listelerden Çıkar",
   "lists.account.add": "Listeye ekle",
   "lists.account.remove": "Listeden kaldır",
-  "lists.delete": "Delete list",
-  "lists.edit": "listeyi düzenle",
+  "lists.delete": "Listeyi sil",
+  "lists.edit": "Listeyi düzenle",
   "lists.edit.submit": "Başlığı değiştir",
   "lists.new.create": "Liste ekle",
-  "lists.new.create_title": "Add list",
+  "lists.new.create_title": "Liste ekle",
   "lists.new.save_title": "Başlığı Kaydet",
   "lists.new.title_placeholder": "Yeni liste başlığı",
   "lists.search": "Takip ettiğiniz kişiler arasından arayın",
   "lists.subheading": "Listeleriniz",
-  "loading_indicator.label": "Yükleniyor...",
+  "loading_indicator.label": "Yükleniyor…",
   "location_search.placeholder": "Adres ara",
   "login.fields.instance_label": "Sunucu",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.otp_code_hint": "Telefon uygulamanız tarafından oluşturulan iki faktörlü kodu girin veya kurtarma kodlarınızdan birini kullanın",
   "login.fields.otp_code_label": "İki faktörlü kod:",
-  "login.fields.password_placeholder": "Password",
+  "login.fields.password_placeholder": "Şifre",
   "login.fields.username_label": "E-posta ya da kullanıcı adı",
-  "login.log_in": "Log in",
+  "login.log_in": "Giriş yap",
   "login.otp_log_in": "OTP Girişi",
   "login.otp_log_in.fail": "Geçersiz kod, lütfen tekrar deneyiniz.",
   "login.reset_password_hint": "Giriş yaparken sorun mu yaşıyorsunuz?",
-  "login.sign_in": "Sign in",
-  "login_external.errors.instance_fail": "Sunucu bir hata döndürdü.",
+  "login.sign_in": "Oturum aç",
+  "login_external.errors.instance_fail": "Sunucu bir hata döndürdü..",
   "login_external.errors.network_fail": "Bağlantı başarısız oldu. Bir tarayıcı uzantısı bağlantıyı engelliyor olabilir.",
-  "login_form.header": "Sign In",
-  "manage_group.blocked_members": "Engellenen üyeler",
+  "login_form.header": "Oturum Aç",
+  "manage_group.blocked_members": "Engellenen Üyeler",
   "manage_group.confirmation.copy": "Bağlantıyı kopyala",
   "manage_group.confirmation.info_1": "Bu grubun sahibi olarak yetkili kullanıcı atayabilir, gönderileri silebilir ve çok daha fazlasını yapabilirsiniz.",
   "manage_group.confirmation.info_2": "Grubun ilk gönderisini yayınlayın ve sohbeti başlatın.",
@@ -966,19 +966,19 @@
   "manage_group.success": "Grup kaydedildi!",
   "manage_group.tagline": "Gruplar sizi ortak ilgi alanlarına göre başkalarıyla buluşturur.",
   "media_panel.empty_message": "Medya bulunamadı.",
-  "media_panel.title": "Media",
+  "media_panel.title": "Medya",
   "mfa.confirm.success_message": "Çok Faktörlü Kimlik Doğrulama onaylandı",
   "mfa.disable.success_message": "Çok Faktörlü Kimlik Doğrulama devre dışı",
   "mfa.disabled": "Devre dışı",
   "mfa.enabled": "Etkin",
-  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_disable_enter_password": "İki faktörlü kimlik doğrulamasını devre dışı bırakmak için geçerli şifrenizi girin.",
   "mfa.mfa_setup.code_hint": "İki faktörlü uygulamanızdaki kodu girin.",
-  "mfa.mfa_setup.code_placeholder": "Code",
+  "mfa.mfa_setup.code_placeholder": "Kod",
   "mfa.mfa_setup.password_hint": "Kimliğinizi doğrulamak için mevcut şifrenizi girin.",
-  "mfa.mfa_setup.password_placeholder": "Password",
-  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup.password_placeholder": "Şifre",
+  "mfa.mfa_setup_scan_description": "İki faktörlü uygulamanızı kullanarak bu QR kodunu tarayın veya metin anahtarını girin.",
   "mfa.mfa_setup_scan_title": "Tara",
-  "mfa.mfa_setup_verify_title": "Doğrulama",
+  "mfa.mfa_setup_verify_title": "Doğrula",
   "mfa.otp_enabled_description": "OTP aracılığıyla iki faktörlü kimlik doğrulamayı etkinleştirdiniz.",
   "mfa.otp_enabled_title": "OTP Etkin",
   "mfa.setup_recoverycodes": "Kurtarma kodları",
@@ -994,14 +994,14 @@
   "migration.move_account.success": "Hesap başarıyla taşındı.",
   "migration.submit": "Takipçileri taşı",
   "missing_description_modal.cancel": "İptal",
-  "missing_description_modal.continue": "Post",
+  "missing_description_modal.continue": "Gönderi",
   "missing_description_modal.description": "Yine de devam edilsin mi?",
   "missing_description_modal.text": "Tüm ekler için bir açıklama girmediniz. Yine de devam edilsin mi?",
   "missing_indicator.label": "Bulunamadı",
   "missing_indicator.sublabel": "Bu kaynak bulunamadı",
   "modals.policy.submit": "Kabul Et ve Devam Et",
   "modals.policy.updateTitle": "{siteTitle} en son sürümünü puanladınız! Üzerinde çalıştığımız heyecan verici yeni şeyleri gözden geçirmek için bir dakikanızı ayırın.",
-  "moderation_overlay.contact": "Contact",
+  "moderation_overlay.contact": "İletişim",
   "moderation_overlay.hide": "İçeriği gizle",
   "moderation_overlay.show": "İçeriği Göster",
   "moderation_overlay.subtitle": "Bu Gönderi incelenmek üzere denetime gönderildi ve yalnızca siz görebilirsiniz. Bunun bir hata olduğunu düşünüyorsanız, lütfen destek ile iletişime geçin.",
@@ -1009,22 +1009,22 @@
   "mute_modal.auto_expire": "Sessize alma işlemi otomatik olarak sona ersin mi?",
   "mute_modal.duration": "Süre",
   "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
-  "navbar.login.action": "Log in",
-  "navbar.login.forgot_password": "Parolanızı mı unuttunuz?",
-  "navbar.login.password.label": "Password",
+  "navbar.login.action": "Giriş yap",
+  "navbar.login.forgot_password": "Şifrenizi mi unuttunuz?",
+  "navbar.login.password.label": "Şifre",
   "navbar.login.username.placeholder": "E-posta ya da kullanıcı adı",
   "navigation.chats": "Sohbetler",
   "navigation.compose": "Gönderi oluştur",
   "navigation.dashboard": "Yönetici Paneli",
   "navigation.developers": "Geliştiriciler",
-  "navigation.direct_messages": "Messages",
-  "navigation.home": "Home",
-  "navigation.notifications": "Notifications",
+  "navigation.direct_messages": "Mesajlar",
+  "navigation.home": "Ana sayfa",
+  "navigation.notifications": "Bildirimler",
   "navigation.search": "Arama",
-  "navigation_bar.account_aliases": "Account aliases",
+  "navigation_bar.account_aliases": "Hesap takma adları",
   "navigation_bar.account_migration": "Hesabı taşı",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
-  "navigation_bar.compose": "Yeni bir gönderi yazın",
+  "navigation_bar.compose": "Bir gönderi oluşturun",
   "navigation_bar.compose_direct": "Özel mesaj",
   "navigation_bar.compose_edit": "Gönderiyi düzenle",
   "navigation_bar.compose_event": "Etkinliği yönet",
@@ -1032,10 +1032,10 @@
   "navigation_bar.compose_reply": "Gönderiyi yanıtla",
   "navigation_bar.create_event": "Yeni etkinlik oluştur",
   "navigation_bar.create_group": "Grup Oluştur",
-  "navigation_bar.domain_blocks": "Gizli alan adları",
+  "navigation_bar.domain_blocks": "Alan adı engelleri",
   "navigation_bar.edit_group": "Grubu Düzenle",
   "navigation_bar.favourites": "Beğeniler",
-  "navigation_bar.filters": "Susturulmuş kelimeler",
+  "navigation_bar.filters": "Sessize alınmış kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
   "navigation_bar.import_data": "Verileri içe aktar",
   "navigation_bar.in_reply_to": "Cevap olarak",
@@ -1051,7 +1051,7 @@
   "new_group_panel.action": "Grup oluştur",
   "new_group_panel.subtitle": "Aradığınızı bulamıyor musunuz? Kendi özel veya genel grubunuzu başlatın.",
   "new_group_panel.title": "Yeni Grup Oluştur",
-  "notification.favourite": "{name} senin durumunu favorilere ekledi",
+  "notification.favourite": "{name} senin gönderini beğenilere ekledi",
   "notification.follow": "{name} seni takip ediyor",
   "notification.follow_request": "{name} sizi takip etmek istiyor",
   "notification.mention": "{name} senden bahsetti",
@@ -1065,8 +1065,8 @@
   "notification.pleroma:participation_accepted": "Etkinliğe katılmak için kabul edildiniz",
   "notification.pleroma:participation_request": "{name} etkinliğinize katılmak istiyor",
   "notification.poll": "Oy verdiğiniz bir anket bitti",
-  "notification.reblog": "{name} senin durumunu boost etti",
-  "notification.status": "{isim} az önce yayınladı",
+  "notification.reblog": "{name} senin durumunu yeniden gönderdi",
+  "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name}, etkileşimde bulunduğunuz bir gönderiyi düzenledi",
   "notification.user_approved": "{instance}'a hoş geldiniz!",
   "notifications.filter.all": "Tümü",
@@ -1079,7 +1079,7 @@
   "notifications.filter.statuses": "Takip ettiğiniz kişilerden gelen güncellemeler",
   "notifications.group": "{count} bildirim",
   "notifications.queue_label": "{count} yeni {count, plural, one {bildirimi} other {bildirimleri}} görmek için tıklayınız",
-  "oauth_consumer.tooltip": "Sign in with {provider}",
+  "oauth_consumer.tooltip": "{provider} ile giriş yapın",
   "oauth_consumers.title": "Diğer oturum açma yöntemleri",
   "onboarding.avatar.subtitle": "Onunla iyi eğlenceler.",
   "onboarding.avatar.title": "Bir profil resmi seçin",
@@ -1093,15 +1093,15 @@
   "onboarding.error": "Beklenmedik bir hata oluştu. Lütfen tekrar deneyin veya bu adımı atlayın.",
   "onboarding.fediverse.its_you": "Bu sensin! Fediverse'teki diğer kişiler tam kullanıcı adınızı (@kullanici@example.com) kullanarak sizi diğer sunuculardan takip edebilir.",
   "onboarding.fediverse.message": "Fediverse, binlerce farklı ve bağımsız olarak yönetilen sosyal medya sitesinden (\"sunucular\" olarak da bilinir) oluşan bir sosyal ağdır. {siteTitle} ile iletişim kurabildikleri için diğer birçok Fediverse sunucusundaki kullanıcıları takip edebilir ve gönderileri beğenebilir, yeniden yayınlayabilir ve yanıtlayabilirsiniz.",
-  "onboarding.fediverse.next": "Next",
+  "onboarding.fediverse.next": "Sonraki",
   "onboarding.fediverse.other_instances": "Zaman tünelinizde gezinirken, bir gönderinin hangi sunucudan geldiğini öğrenmek için ikinci @ sembolünden sonra tam kullanıcı adına dikkat edin.",
   "onboarding.fediverse.title": "{siteTitle}, Fediverse'in yalnızca bir parçasıdır",
   "onboarding.fediverse.trailer": "Çünkü dağıtık olduğundan ve isteyen herkesin kendi sunucusunu kurabildeğinden Fediverse dirençli ve şeffaftır. Eğer bir gün başka bir sunucuya taşınmak ya da kendinizinkini kurmak istediğinizde aynı hesaplarla etkileşim kurmaya devam edebilirsiniz.",
-  "onboarding.finished.message": "Sizi topluluğumuza davet etmekten büyük heyecan duyuyoruz! Başlamak için aşağıdaki düğmeye dokunun.",
+  "onboarding.finished.message": "Sizi topluluğumuza davet etmekten büyük heyecan duyuyoruz! Başlamak için aşağıdaki butona tıklayın.",
   "onboarding.finished.title": "Oryantasyon tamamlandı",
   "onboarding.header.subtitle": "Bu, profilinizin üst kısmında gösterilecektir.",
   "onboarding.header.title": "Bir kapak resmi seçin",
-  "onboarding.next": "Next",
+  "onboarding.next": "Sonraki",
   "onboarding.note.subtitle": "Bunu daha sonra istediğiniz zaman düzenleyebilirsiniz.",
   "onboarding.note.title": "Kısa bir biyografi yaz",
   "onboarding.saving": "Kaydediliyor…",
@@ -1111,8 +1111,8 @@
   "onboarding.view_feed": "Beslemeyi Görüntüle",
   "password_reset.confirmation": "Onay için e-postanızı kontrol edin.",
   "password_reset.fields.username_placeholder": "E-posta ya da kullanıcı adı",
-  "password_reset.header": "Reset Password",
-  "password_reset.reset": "Reset password",
+  "password_reset.header": "Şifre Sıfırlama",
+  "password_reset.reset": "Şifreyi sıfırla",
   "patron.donate": "Bağış",
   "patron.title": "Fon Hedefi",
   "pinned_accounts.title": "{name}'nin seçimleri",
@@ -1123,10 +1123,10 @@
   "poll.non_anonymous.label": "Diğer sunucular oy verdiğiniz seçenekleri görüntüleyebilir",
   "poll.refresh": "Yenile",
   "poll.total_people": "kişi",
-  "poll.total_votes": "{count, plural, one {# oy} other {# oy}}",
+  "poll.total_votes": "oy",
   "poll.vote": "Oy ver",
   "poll.voted": "Bu cevaba oy verdiniz",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "oy",
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anket kaldır",
   "preferences.fields.auto_play_gif_label": "Animasyonlu GIF'leri otomatik oynat",
@@ -1134,69 +1134,69 @@
   "preferences.fields.autoload_more_label": "Sayfanın en altına kaydırıldığında otomatik olarak daha fazla öğe yükle",
   "preferences.fields.autoload_timelines_label": "Sayfanın en üstüne kaydırıldığında yeni gönderileri otomatik olarak yükle",
   "preferences.fields.boost_modal_label": "Yeniden göndermeden önce onay iletişim kutusunu göster",
-  "preferences.fields.content_type_label": "Default post format",
+  "preferences.fields.content_type_label": "Varsayılan gönderi biçimi",
   "preferences.fields.delete_modal_label": "Bir gönderiyi silmeden önce onay iletişim kutusunu göster",
   "preferences.fields.demetricator_label": "Demetricator'ı Kullan",
   "preferences.fields.demo_hint": "Varsayılan Soapbox logosunu ve renk düzenini kullanın. Ekran görüntüsü almak için kullanışlıdır.",
   "preferences.fields.demo_label": "Demo modu",
-  "preferences.fields.display_media.default": "Hide media marked as sensitive",
-  "preferences.fields.display_media.hide_all": "Always hide media",
-  "preferences.fields.display_media.show_all": "Always show media",
+  "preferences.fields.display_media.default": "Hassas olarak işaretlenmiş gönderileri gizle",
+  "preferences.fields.display_media.hide_all": "Gönderileri her zaman gizle",
+  "preferences.fields.display_media.show_all": "Gönderileri her zaman göster",
   "preferences.fields.expand_spoilers_label": "İçerik uyarılarıyla işaretlenmiş yayınları her zaman genişletin",
-  "preferences.fields.language_label": "Language",
-  "preferences.fields.media_display_label": "Media display",
+  "preferences.fields.language_label": "Dil",
+  "preferences.fields.media_display_label": "Hassas içerik",
   "preferences.fields.missing_description_modal_label": "Medya açıklamaları olmayan bir gönderi göndermeden önce onay iletişim kutusunu göster",
-  "preferences.fields.privacy_label": "Default post privacy",
+  "preferences.fields.privacy_label": "Varsayılan gönderi gizliliği",
   "preferences.fields.reduce_motion_label": "Animasyonlarda hareketi azaltın",
   "preferences.fields.system_font_label": "Sistemin varsayılan yazı tipini kullan",
-  "preferences.fields.theme": "Theme",
+  "preferences.fields.theme": "Tema",
   "preferences.fields.underline_links_label": "Gönderilerdeki bağlantıların altını daima çizin",
   "preferences.fields.unfollow_modal_label": "Birini takip etmeyi bırakmadan önce onay iletişim kutusunu göster",
-  "preferences.hints.demetricator": "Tüm sayıları siteden gizleyerek sosyal medya kaygısını azaltın.",
+  "preferences.hints.demetricator": "Sosyal medya kaygısını azaltmak için siteden tüm sayıları gizleyin.",
   "preferences.notifications.advanced": "Tüm bildirim kategorilerini göster",
   "preferences.options.content_type_markdown": "Markdown",
   "preferences.options.content_type_plaintext": "Düz metin",
   "preferences.options.privacy_followers_only": "Sadece takipçiler",
-  "preferences.options.privacy_public": "Public",
+  "preferences.options.privacy_public": "Herkese açık",
   "preferences.options.privacy_unlisted": "Liste dışı",
   "privacy.change": "Gönderi gizliliğini ayarla",
   "privacy.direct.long": "Sadece bahsedilen kişilere gönder",
-  "privacy.direct.short": "Direkt",
+  "privacy.direct.short": "Doğrudan",
   "privacy.private.long": "Sadece takipçilerime gönder",
   "privacy.private.short": "Sadece takipçiler",
   "privacy.public.long": "Herkese açık zaman tüneline gönder",
   "privacy.public.short": "Herkese açık",
   "privacy.unlisted.long": "Herkese açık zaman tüneline gönderme",
-  "privacy.unlisted.short": "Listelenmemiş",
+  "privacy.unlisted.short": "Liste dışı",
   "profile_dropdown.add_account": "Mevcut bir hesabı ekle",
   "profile_dropdown.logout": "@{acct} oturumunu kapat",
   "profile_dropdown.switch_account": "Hesap değiştir",
-  "profile_dropdown.theme": "Theme",
+  "profile_dropdown.theme": "Tema",
   "profile_fields_panel.title": "Profil alanları",
   "reactions.all": "Tümü",
   "regeneration_indicator.label": "Yükleniyor…",
-  "regeneration_indicator.sublabel": "Ev akışınız hazırlanıyor!",
-  "register_invite.lead": "Bir hesap oluşturmak için aşağıdaki formu doldurun.",
+  "regeneration_indicator.sublabel": "Anasayfa akışınız hazırlanıyor!",
+  "register_invite.lead": "Hesap oluşturmak için aşağıdaki formu doldurun.",
   "register_invite.title": "{siteTitle}'a katılmaya davet edildiniz!",
   "registration.acceptance": "Kaydolarak {terms} ve {privacy} koşullarını kabul etmiş olursunuz.",
   "registration.agreement": "{tos} metnini kabul ediyorum.",
-  "registration.captcha.hint": "Yeni bir captcha almak için resme tıklayın",
-  "registration.captcha.placeholder": "Resimdeki metni girin",
+  "registration.captcha.hint": "Yeni bir captcha oluşturmak için resme tıklayın",
+  "registration.captcha.placeholder": "Resimdeki metni giriniz",
   "registration.closed_message": "{instance} yeni üye kabul etmiyor",
   "registration.closed_title": "Kayıtlar Kapandı",
   "registration.confirmation_modal.close": "Kapat",
   "registration.fields.confirm_placeholder": "Şifre (tekrar)",
-  "registration.fields.email_placeholder": "E-Mail address",
-  "registration.fields.password_placeholder": "Password",
+  "registration.fields.email_placeholder": "E-posta adresi",
+  "registration.fields.password_placeholder": "Şifre",
   "registration.fields.username_hint": "Yalnızca harflere, sayılara ve alt çizgilere izin verilir.",
   "registration.fields.username_placeholder": "Kullanıcı adı",
   "registration.header": "Hesabınızı kaydedin",
   "registration.newsletter": "Bültene abone olun.",
-  "registration.password_mismatch": "Parolalar eşleşmiyor.",
+  "registration.password_mismatch": "Şifreler eşleşmiyor.",
   "registration.privacy": "Gizlilik Politikası",
   "registration.reason": "Neden katılmak istiyorsunuz?",
   "registration.reason_hint": "Bu, başvurunuzu incelememize yardımcı olacaktır",
-  "registration.sign_up": "Sign up",
+  "registration.sign_up": "Kayıt ol",
   "registration.tos": "Kullanım Şartları",
   "registration.username_unavailable": "Kullanıcı adı zaten alınmış.",
   "registration.validation.capital_letter": "1 büyük harf",
@@ -1205,10 +1205,10 @@
   "registrations.create_account": "Hesap oluşturun",
   "registrations.error": "Hesabınız kaydedilemedi.",
   "registrations.get_started": "Başlayalım!",
-  "registrations.password.label": "Password",
+  "registrations.password.label": "Şifre",
   "registrations.success": "{siteTitle}'a hoş geldiniz!",
   "registrations.tagline": "Ayrımcılık Yapmayan Sosyal Medya",
-  "registrations.unprocessable_entity": "Bu kullanıcı adı zaten alındı.",
+  "registrations.unprocessable_entity": "Bu kullanıcı adı zaten alınmış.",
   "registrations.username.hint": "Yalnızca A-Z, 0-9 ve alt çizgi içerebilir",
   "registrations.username.label": "Kullanıcı adınız",
   "reject.success": "Reddedildi",
@@ -1222,129 +1222,129 @@
   "remote_instance.federation_panel.no_restrictions_message": "{siteTitle}, {host} üzerinde herhangi bir kısıtlama getirmedi.",
   "remote_instance.federation_panel.restricted_message": "{siteTitle}, {host} tarafından sağlanan tüm etkinlikleri engeller.",
   "remote_instance.federation_panel.some_restrictions_message": "{siteTitle}, {host} üzerinde bazı kısıtlamalar getirdi.",
-  "remote_instance.pin_host": "Pin {host}",
-  "remote_instance.unpin_host": "{host} sabitlemesini kaldırın",
+  "remote_instance.pin_host": "{host}'u sabitle",
+  "remote_instance.unpin_host": "{host}'un sabitlemesini kaldırın",
   "remote_interaction.account_placeholder": "İşlem yapmak istediğiniz tam kullanıcı adınızı (ör: @kullanici@example.com) yazınız.",
   "remote_interaction.dislike": "Beğenmemeyi onaylayın",
   "remote_interaction.dislike_title": "Gönderiyi uzaktan beğenmeme",
-  "remote_interaction.divider": "or",
+  "remote_interaction.divider": "veya",
   "remote_interaction.event_join_title": "Etkinliğe uzaktan katılın",
   "remote_interaction.favourite": "Beğenmeye devam et",
-  "remote_interaction.favourite_title": "Like a post remotely",
-  "remote_interaction.follow": "Proceed to follow",
-  "remote_interaction.follow_title": "Follow {user} remotely",
-  "remote_interaction.poll_vote": "Proceed to vote",
-  "remote_interaction.poll_vote_title": "Vote in a poll remotely",
-  "remote_interaction.reblog": "Proceed to repost",
-  "remote_interaction.reblog_title": "Reblog a post remotely",
-  "remote_interaction.reply": "Proceed to reply",
-  "remote_interaction.reply_title": "Reply to a post remotely",
-  "remote_interaction.user_not_found_error": "Couldn't find given user",
-  "remote_timeline.filter_message": "You are viewing the timeline of {instance}.",
+  "remote_interaction.favourite_title": "Bir gönderiyi uzaktan beğen",
+  "remote_interaction.follow": "Takip etmeye devam edin",
+  "remote_interaction.follow_title": "{user} hesabını uzaktan takip edin",
+  "remote_interaction.poll_vote": "Oylamaya devam edin",
+  "remote_interaction.poll_vote_title": "Ankete uzaktan oy verin",
+  "remote_interaction.reblog": "Yeniden göndermeye devam et",
+  "remote_interaction.reblog_title": "Bir gönderiyi uzaktan reblogla",
+  "remote_interaction.reply": "Yanıtlamaya devam edin",
+  "remote_interaction.reply_title": "Bir gönderiyi uzaktan yanıtla",
+  "remote_interaction.user_not_found_error": "Belirtilen kullanıcı bulunamadı",
+  "remote_timeline.filter_message": "Şu anda {instance} zaman çizelgesini görüntülüyorsunuz.",
   "reply_indicator.cancel": "İptal",
-  "reply_mentions.account.add": "Add to mentions",
-  "reply_mentions.account.remove": "Remove from mentions",
-  "reply_mentions.more": "{count} more",
-  "reply_mentions.reply": "Replying to {accounts}",
-  "reply_mentions.reply.hoverable": "<hover>Replying to</hover> {accounts}",
-  "reply_mentions.reply_empty": "Replying to post",
-  "report.block": "Block {target}",
-  "report.block_hint": "Do you also want to block this account?",
+  "reply_mentions.account.add": "Bahsedilenlere ekle",
+  "reply_mentions.account.remove": "Bahsedilenlerden kaldır",
+  "reply_mentions.more": "{count} daha",
+  "reply_mentions.reply": "{accounts} yanıtlanıyor",
+  "reply_mentions.reply.hoverable": "<hover>Cevap veriliyor</hover> {accounts}",
+  "reply_mentions.reply_empty": "Gönderiye yanıtla",
+  "report.block": "{target} engelle",
+  "report.block_hint": "Ayrıca bu hesabı engellemek istiyor musunuz?",
   "report.chatMessage.context": "Bir kullanıcının mesajını bildirirken, seçilen mesajdan önceki ve sonraki beş mesaj bağlam için moderasyon ekibimize iletilecektir.",
   "report.chatMessage.title": "Mesajı bildir",
   "report.confirmation.content": "Bu hesabın {link}'i ihlal ettiğini tespit edersek, konuyla ilgili daha fazla işlem yapacağız.",
   "report.confirmation.entity.account": "hesap",
   "report.confirmation.entity.group": "grup",
-  "report.confirmation.title": "Thanks for submitting your report.",
-  "report.done": "Done",
+  "report.confirmation.title": "Bildirdiğiniz için teşekkürler.",
+  "report.done": "Bitti",
   "report.forward": "Şu kişiye ilet : {target}",
-  "report.forward_hint": "Bu hesap başka bir sunucudan. Anonimleştirilmiş bir rapor oraya da gönderilsin mi?",
+  "report.forward_hint": "Bu hesap başka bir sunucudan. Anonimleştirilmiş bir bildiri oraya da gönderilsin mi?",
   "report.group.title": "Grubu Bildir",
-  "report.next": "Next",
-  "report.otherActions.addAdditional": "Would you like to add additional statuses to this report?",
-  "report.otherActions.addMore": "Add more",
-  "report.otherActions.furtherActions": "Further actions:",
-  "report.otherActions.hideAdditional": "Hide additional statuses",
-  "report.otherActions.otherStatuses": "Include other statuses?",
+  "report.next": "Sonraki",
+  "report.otherActions.addAdditional": "Bu rapora ek durumlar eklemek ister misiniz?",
+  "report.otherActions.addMore": "Daha fazla ekle",
+  "report.otherActions.furtherActions": "Diğer işlemler:",
+  "report.otherActions.hideAdditional": "Ek durumları gizle",
+  "report.otherActions.otherStatuses": "Diğer durumlar dahil edilsin mi?",
   "report.placeholder": "Ek yorumlar",
-  "report.previous": "Previous",
-  "report.reason.blankslate": "You have removed all statuses from being selected.",
-  "report.reason.title": "Reason for reporting",
+  "report.previous": "Önceki",
+  "report.reason.blankslate": "Tüm durumların seçimini kaldırdınız.",
+  "report.reason.title": "Bildirme nedeni",
   "report.submit": "Gönder",
-  "report.target": "Raporlama",
-  "reset_password.fail": "Expired token, please try again.",
-  "reset_password.header": "Set New Password",
-  "reset_password.password.label": "Password",
+  "report.target": "{target} Bildiriliyor",
+  "reset_password.fail": "Süresi dolmuş bağlantı, lütfen tekrar deneyin.",
+  "reset_password.header": "Yeni Şifre Belirle",
+  "reset_password.password.label": "Şifre",
   "reset_password.password.placeholder": "Placeholder",
   "save": "Kaydet",
-  "schedule.post_time": "Post Date/Time",
-  "schedule.remove": "Remove schedule",
-  "schedule_button.add_schedule": "Schedule post for later",
-  "schedule_button.remove_schedule": "Post immediately",
-  "scheduled_status.cancel": "Cancel",
-  "search.action": "Search for “{query}”",
+  "schedule.post_time": "Gönderme Tarihi/Saati",
+  "schedule.remove": "Zamanlamayı kaldır",
+  "schedule_button.add_schedule": "Gönderiyi daha sonrası için zamanla",
+  "schedule_button.remove_schedule": "Hemen yayınla",
+  "scheduled_status.cancel": "İptal",
+  "search.action": "\"{query}\" için arama yapın",
   "search.placeholder": "Ara",
-  "search_results.accounts": "İnsanlar",
-  "search_results.filter_message": "You are searching for posts from @{acct}.",
+  "search_results.accounts": "Hesaplar",
+  "search_results.filter_message": "@{acct} adlı hesabın gönderilerini arıyorsunuz.",
   "search_results.groups": "Gruplar",
   "search_results.hashtags": "Hashtagler",
   "search_results.statuses": "Gönderiler",
-  "security.codes.fail": "Failed to fetch backup codes",
-  "security.confirm.fail": "Incorrect code or password. Try again.",
-  "security.delete_account.fail": "Account deletion failed.",
-  "security.delete_account.success": "Account successfully deleted.",
-  "security.disable.fail": "Incorrect password. Try again.",
-  "security.fields.email.label": "Email address",
-  "security.fields.new_password.label": "New password",
-  "security.fields.old_password.label": "Current password",
-  "security.fields.password.label": "Password",
-  "security.fields.password_confirmation.label": "New password (again)",
-  "security.headers.delete": "Delete Account",
-  "security.headers.tokens": "Sessions",
-  "security.qr.fail": "Failed to fetch setup key",
-  "security.submit": "Save changes",
-  "security.submit.delete": "Delete Account",
-  "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
-  "security.text.delete.local": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone.",
-  "security.tokens.revoke": "Revoke",
-  "security.update_email.fail": "Update email failed.",
-  "security.update_email.success": "Email successfully updated.",
-  "security.update_password.fail": "Update password failed.",
-  "security.update_password.success": "Password successfully updated.",
-  "settings.account_migration": "Move Account",
-  "settings.change_email": "Change Email",
-  "settings.change_password": "Change Password",
-  "settings.configure_mfa": "Configure MFA",
-  "settings.delete_account": "Delete Account",
-  "settings.edit_profile": "Edit Profile",
+  "security.codes.fail": "Yedek kodlar getirilemedi",
+  "security.confirm.fail": "Yanlış kod veya şifre. Tekrar deneyin.",
+  "security.delete_account.fail": "Hesap silme işlemi başarısız oldu.",
+  "security.delete_account.success": "Hesap başarıyla silindi.",
+  "security.disable.fail": "Geçersiz şifre. Tekrar deneyin.",
+  "security.fields.email.label": "E-posta adresi",
+  "security.fields.new_password.label": "Yeni Şifre",
+  "security.fields.old_password.label": "Mevcut Şifre",
+  "security.fields.password.label": "Şifre",
+  "security.fields.password_confirmation.label": "Yeni şifre (tekrar)",
+  "security.headers.delete": "Hesabı sil",
+  "security.headers.tokens": "Oturumlar",
+  "security.qr.fail": "Kurulum anahtarı getirilemedi",
+  "security.submit": "Değişiklikleri kaydet",
+  "security.submit.delete": "Hesabı sil",
+  "security.text.delete": "Hesabınızı silmek için şifrenizi girin ve ardından Hesabı Sil'e tıklayın. Bu, geri alınamayan kalıcı bir eylemdir. Hesabınız bu sunucudan yok edilecek ve diğer sunuculara bir silme isteği gönderilecektir. Tüm sunucuların hesabınızı temizleyeceği garanti edilmez.",
+  "security.text.delete.local": "Hesabınızı silmek için şifrenizi girin ve ardından Hesabı Sil'e tıklayın. Bu, geri alınamayan kalıcı bir eylemdir.",
+  "security.tokens.revoke": "İptal et",
+  "security.update_email.fail": "E-posta güncelleme başarısız oldu.",
+  "security.update_email.success": "E-posta başarıyla güncellendi.",
+  "security.update_password.fail": "Şifre güncelleme başarısız oldu.",
+  "security.update_password.success": "Şifre başarıyla güncellendi.",
+  "settings.account_migration": "Hesabı taşı",
+  "settings.change_email": "E-postayı Değiştir",
+  "settings.change_password": "Şifre Değiştir",
+  "settings.configure_mfa": "Çok Faktörlü Kimlik Doğrulamayı Yapılandır",
+  "settings.delete_account": "Hesabı sil",
+  "settings.edit_profile": "Profili Düzenle",
   "settings.messages.label": "Kullanıcıların sizinle yeni bir sohbet başlatmasına izin verin",
-  "settings.other": "Other options",
-  "settings.preferences": "Preferences",
-  "settings.profile": "Profile",
-  "settings.save.success": "Your preferences have been saved!",
-  "settings.security": "Security",
-  "settings.sessions": "Active sessions",
-  "settings.settings": "Settings",
-  "shared.tos": "Terms of Service",
-  "signup_panel.subtitle": "Sign up now to discuss what's happening.",
-  "signup_panel.title": "New to {site_title}?",
-  "site_preview.preview": "Preview",
-  "sms_verification.expired": "Your SMS token has expired.",
-  "sms_verification.fail": "Failed to send SMS message to your phone number.",
-  "sms_verification.header": "Enter your phone number",
-  "sms_verification.invalid": "Please enter a valid phone number.",
-  "sms_verification.modal.enter_code": "We sent you a 6-digit code via SMS. Enter it below.",
-  "sms_verification.modal.resend_code": "Resend verification code?",
-  "sms_verification.modal.verify_code": "Verify code",
-  "sms_verification.modal.verify_help_text": "Verify your phone number to start using {instance}.",
-  "sms_verification.modal.verify_number": "Verify phone number",
-  "sms_verification.modal.verify_sms": "Verify SMS",
-  "sms_verification.modal.verify_title": "Verify your phone number",
-  "sms_verification.phone.label": "Phone number",
-  "sms_verification.sent.actions.resend": "Resend verification code?",
-  "sms_verification.sent.body": "We sent you a 6-digit code via SMS. Enter it below.",
-  "sms_verification.sent.header": "Verification code",
-  "sms_verification.success": "A verification code has been sent to your phone number.",
+  "settings.other": "Diğer seçenekler",
+  "settings.preferences": "Tercihler",
+  "settings.profile": "Profil",
+  "settings.save.success": "Tercihleriniz kaydedildi!",
+  "settings.security": "Güvenlik",
+  "settings.sessions": "Aktif oturumlar",
+  "settings.settings": "Ayarlar",
+  "shared.tos": "Kullanım Şartları",
+  "signup_panel.subtitle": "Ne olduğunu tartışmak için şimdi kaydolun.",
+  "signup_panel.title": "{site_title} sitesinde yeni misiniz?",
+  "site_preview.preview": "Önizleme",
+  "sms_verification.expired": "SMS belirtecinizin süresi doldu.",
+  "sms_verification.fail": "Telefon numaranıza SMS mesajı gönderilemedi.",
+  "sms_verification.header": "Telefon numaranızı girin",
+  "sms_verification.invalid": "Lütfen geçerli bir telefon numarası girin.",
+  "sms_verification.modal.enter_code": "Size SMS yoluyla 6 haneli bir kod gönderdik. Aşağıya girin.",
+  "sms_verification.modal.resend_code": "Doğrulama kodu yeniden gönderilsin mi?",
+  "sms_verification.modal.verify_code": "Doğrulama kodu",
+  "sms_verification.modal.verify_help_text": "{instance} kullanmaya başlamak için telefon numaranızı doğrulayın.",
+  "sms_verification.modal.verify_number": "Telefon numarasını doğrulayın",
+  "sms_verification.modal.verify_sms": "SMS'i doğrula",
+  "sms_verification.modal.verify_title": "Telefon numaranızı doğrulayın",
+  "sms_verification.phone.label": "Telefon numarası",
+  "sms_verification.sent.actions.resend": "Doğrulama kodu yeniden gönderilsin mi?",
+  "sms_verification.sent.body": "Size SMS yoluyla 6 haneli bir kod gönderdik. Aşağıya girin.",
+  "sms_verification.sent.header": "Doğrulama kodu",
+  "sms_verification.success": "Telefon numaranıza bir doğrulama kodu gönderildi.",
   "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.",
   "soapbox_config.authenticated_profile_label": "Profiles require authentication",
   "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright footer",

From d8184f5d204b2b07df2b214f1f35cfd96345ae0a Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Mon, 10 Apr 2023 16:04:12 +0000
Subject: [PATCH 110/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1547 of 1547 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 1b4a6ca7d..617c8e727 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -1057,6 +1057,8 @@
   "notification.favourite": "{name} 点赞了您的帖文",
   "notification.follow": "{name} 开始关注您",
   "notification.follow_request": "{name} 请求关注您",
+  "notification.group_favourite": "{name} 点赞了您的群组帖文",
+  "notification.group_reblog": "{name} 转发了您的群组帖文",
   "notification.mention": "{name} 提及了您",
   "notification.mentioned": "{name} 提及了您",
   "notification.move": "{name} 移动到了 {targetName}",
@@ -1460,8 +1462,9 @@
   "status.show_less_all": "减少这类帖文的展示",
   "status.show_more_all": "增加这类帖文的展示",
   "status.show_original": "显示原文本",
-  "status.title": "@{username} 的帖文",
+  "status.title": "帖文详情",
   "status.title_direct": "私信",
+  "status.title_group": "群组帖文详情",
   "status.translate": "翻译",
   "status.translated_from_with": "使用 {provider} 从 {lang} 翻译而来",
   "status.unbookmark": "移除书签",

From 79b571e26c53734466bb38d369f29c0ef76d15e4 Mon Sep 17 00:00:00 2001
From: Temuri Doghonadze <temuri.doghonadze@gmail.com>
Date: Tue, 11 Apr 2023 04:17:40 +0000
Subject: [PATCH 111/298] Translated using Weblate (Georgian)

Currently translated at 24.9% (386 of 1547 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ka/
---
 app/soapbox/locales/ka.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index 8a280daa9..22c4c7a3b 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -7,7 +7,7 @@
   "account.direct": "პირდაპირი წერილი @{name}-ს",
   "account.edit_profile": "პროფილის ცვლილება",
   "account.endorse": "გამორჩევა პროფილზე",
-  "account.familiar_followers.more": "{count} {count, plural, one {other} other {others}} you follow",
+  "account.familiar_followers.more": "{რაოდენობა, მრავლობითი, ერთი {# სხვა} სხვა {# სხვა}}-ს მიყვებით",
   "account.follow": "გაყოლა",
   "account.followers": "მიმდევრები",
   "account.follows": "მიდევნებები",
@@ -88,7 +88,7 @@
   "column.notifications": "შეტყობინებები",
   "column.public": "ფედერალური თაიმლაინი",
   "compose.character_counter.title": "Used {chars} out of {maxChars} characters",
-  "compose.submit_success": "Your post was sent",
+  "compose.submit_success": "თქვენი პოსტი გაიგზავნა!",
   "compose_form.direct_message_warning": "ეს ტუტი გაეგზავნება მხოლოდ ნახსენებ მომხმარებლებს.",
   "compose_form.hashtag_warning": "ეს ტუტი არ მოექცევა ჰეშტეგების ქვეს, რამეთუ ის არაა მითითებული. მხოლოდ ღია ტუტები მოიძებნება ჰეშტეგით.",
   "compose_form.lock_disclaimer": "თქვენი ანგარიში არაა {locked}. ნებისმიერს შეიძლია გამოგყვეთ, რომ იხილოს თქვენი მიმდევრებზე გათვლილი პოსტები.",
@@ -150,11 +150,11 @@
   "emoji_button.food": "საჭმელი და სასლმელი",
   "emoji_button.label": "ემოჯის ჩასმა",
   "emoji_button.nature": "ბუმება",
-  "emoji_button.not_found": "არაა ემოჯი!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "ემოჯიების გარეშე.",
   "emoji_button.objects": "ობიექტები",
   "emoji_button.people": "ხალხი",
   "emoji_button.recent": "ხშირად გამოყენებული",
-  "emoji_button.search": "ძებნა...",
+  "emoji_button.search": "ძებნა…",
   "emoji_button.search_results": "ძებნის შედეგები",
   "emoji_button.symbols": "სიმბოლოები",
   "emoji_button.travel": "მოგზაურობა და ადგილები",
@@ -216,17 +216,17 @@
   "lists.new.title_placeholder": "ახალი სიის სათაური",
   "lists.search": "ძებნა ადამიანებს შორის რომელთაც მიჰყვებით",
   "lists.subheading": "თქვენი სიები",
-  "loading_indicator.label": "იტვირთება...",
+  "loading_indicator.label": "ჩატვირთვა…",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.password_placeholder": "Password",
   "login.log_in": "Log in",
   "login.sign_in": "Sign in",
   "login_form.header": "Sign In",
   "media_panel.title": "Media",
-  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_disable_enter_password": "2FA-ის გამოსართავად შეიყვანეთ თქვენი მიმდინარე პაროლი.",
   "mfa.mfa_setup.code_placeholder": "Code",
   "mfa.mfa_setup.password_placeholder": "Password",
-  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_description": "თქვენი 2FA აპით დაასკანირეთ ეს QR კოდი, ან ტექსტი ხელით შეიყვანეთ.",
   "missing_description_modal.continue": "Post",
   "missing_indicator.label": "არაა ნაპოვნი",
   "missing_indicator.sublabel": "ამ რესურსის პოვნა ვერ მოხერხდა",
@@ -382,7 +382,7 @@
   "upload_error.video_duration_limit": "Video exceeds the current duration limit ({limit} seconds)",
   "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
   "upload_form.undo": "გაუქმება",
-  "upload_progress.label": "იტვირთება...",
+  "upload_progress.label": "ატვირთვა…",
   "video.close": "ვიდეოს დახურვა",
   "video.download": "Download file",
   "video.exit_fullscreen": "სრულ ეკრანზე ჩვენების გათიშვა",

From 406513391bfe00adc85f9637995fc49e221126a1 Mon Sep 17 00:00:00 2001
From: Furkan Kalkan <furkan.kalkan3@gmail.com>
Date: Tue, 11 Apr 2023 10:30:37 +0000
Subject: [PATCH 112/298] Translated using Weblate (Turkish)

Currently translated at 98.1% (1519 of 1547 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 228 ++++++++++++++++++------------------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index cfa9ba3a0..35cc5120d 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -1345,149 +1345,149 @@
   "sms_verification.sent.body": "Size SMS yoluyla 6 haneli bir kod gönderdik. Aşağıya girin.",
   "sms_verification.sent.header": "Doğrulama kodu",
   "sms_verification.success": "Telefon numaranıza bir doğrulama kodu gönderildi.",
-  "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.",
-  "soapbox_config.authenticated_profile_label": "Profiles require authentication",
-  "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
-  "soapbox_config.crypto_address.meta_fields.address_placeholder": "Address",
-  "soapbox_config.crypto_address.meta_fields.note_placeholder": "Note (optional)",
+  "soapbox_config.authenticated_profile_hint": "Kullanıcı profillerindeki yanıtları ve medyayı görüntülemek için kullanıcıların oturum açması gerekir.",
+  "soapbox_config.authenticated_profile_label": "Profiller kimlik doğrulaması gerektirir",
+  "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Telif hakkı altbilgisi",
+  "soapbox_config.crypto_address.meta_fields.address_placeholder": "Adres",
+  "soapbox_config.crypto_address.meta_fields.note_placeholder": "Not (isteğe bağlı)",
   "soapbox_config.crypto_address.meta_fields.ticker_placeholder": "Ticker",
-  "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Number of items to display in the crypto homepage widget",
-  "soapbox_config.cta_label": "Display call to action panels if not authenticated",
+  "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Kripto ana sayfa widget'ında görüntülenecek öğe sayısı",
+  "soapbox_config.cta_label": "Kimliği doğrulanmamışsa harekete geçirici mesaj panellerini görüntüle",
   "soapbox_config.custom_css.meta_fields.url_placeholder": "URL",
-  "soapbox_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.",
-  "soapbox_config.feed_injection_hint": "Inject the feed with additional content, such as suggested profiles.",
-  "soapbox_config.feed_injection_label": "Feed injection",
-  "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses",
+  "soapbox_config.display_fqn_label": "Yerel hesaplar için site adresini de ekle (ör: @kullanici@example.com)",
+  "soapbox_config.feed_injection_hint": "Akışa önerilen profiller gibi ek içerikler ekleyin.",
+  "soapbox_config.feed_injection_label": "Akışa ekleme",
+  "soapbox_config.fields.crypto_addresses_label": "Kripto para adresleri",
   "soapbox_config.fields.edit_theme_label": "Temayı düzenle",
-  "soapbox_config.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_config.fields.home_footer_fields_label": "Ana sayfa altbilgisi öğeleri",
   "soapbox_config.fields.logo_label": "Logo",
-  "soapbox_config.fields.promo_panel_fields_label": "Promo panel items",
-  "soapbox_config.fields.theme_label": "Default theme",
-  "soapbox_config.greentext_label": "Enable greentext support",
-  "soapbox_config.headings.advanced": "Advanced",
-  "soapbox_config.headings.cryptocurrency": "Cryptocurrency",
+  "soapbox_config.fields.promo_panel_fields_label": "Tanıtım paneli öğeleri",
+  "soapbox_config.fields.theme_label": "Varsayılan tema",
+  "soapbox_config.greentext_label": "Yeşil metin desteğini etkinleştir",
+  "soapbox_config.headings.advanced": "Gelişmiş",
+  "soapbox_config.headings.cryptocurrency": "Kripto Para",
   "soapbox_config.headings.events": "Etkinlikler",
-  "soapbox_config.headings.navigation": "Navigation",
-  "soapbox_config.headings.options": "Options",
-  "soapbox_config.headings.theme": "Theme",
-  "soapbox_config.hints.crypto_addresses": "Add cryptocurrency addresses so users of your site can donate to you. Order matters, and you must use lowercase ticker values.",
-  "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
-  "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio",
-  "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the right panel of the timelines page.",
-  "soapbox_config.hints.promo_panel_icons.link": "Soapbox Icons List",
-  "soapbox_config.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_config.headings.navigation": "Menü",
+  "soapbox_config.headings.options": "Seçenekler",
+  "soapbox_config.headings.theme": "Tema",
+  "soapbox_config.hints.crypto_addresses": "Sitenizin kullanıcılarının size bağış yapabilmesi için kripto para adresleri ekleyin. Sıra önemlidir ve küçük harfli ticker değerleri kullanmalısınız.",
+  "soapbox_config.hints.home_footer_fields": "Statik sayfalarınızın altbilgisinde görüntülenen özel tanımlı bağlantılara sahip olabilirsiniz.",
+  "soapbox_config.hints.logo": "SVG. En fazla 2 MB. En boy oranı korunarak 50px yüksekliğe kadar görüntülenecektir",
+  "soapbox_config.hints.promo_panel_fields": "Zaman çizelgeleri sayfasının sağ panelinde görüntülenen özel tanımlı bağlantılara sahip olabilirsiniz.",
+  "soapbox_config.hints.promo_panel_icons.link": "Soapbox Simge Listesi",
+  "soapbox_config.home_footer.meta_fields.label_placeholder": "Etiket",
   "soapbox_config.home_footer.meta_fields.url_placeholder": "URL",
   "soapbox_config.media_preview_hint": "Bazı yazılımlar zaman çizelgelerinde görüntülenmek üzere resim ve videoların optimize edilmiş bir ön izleme sürümünü sağlar. Ancak, bu ön izleme görüntüleri ek yapılandırma olmadan çok küçük olabilir.",
-  "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon",
-  "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Simge",
+  "soapbox_config.promo_panel.meta_fields.label_placeholder": "Etiket",
   "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL",
-  "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.",
+  "soapbox_config.raw_json_hint": "Ayar verilerini doğrudan düzenleyin. Doğrudan JSON dosyasında yapılan değişiklikler yukarıdaki form alanlarını geçersiz kılacaktır. Değişikliklerinizi uygulamak için Kaydet'e tıklayın.",
   "soapbox_config.raw_json_invalid": "geçersiz",
-  "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data",
+  "soapbox_config.raw_json_label": "Gelişmiş: Ham JSON verilerini düzenleyin",
   "soapbox_config.redirect_root_no_login_hint": "Oturum açılmadığında anasayfanın yönlendirileceği sayfanın yolu.",
   "soapbox_config.redirect_root_no_login_label": "Ana sayfayı yönlendir",
   "soapbox_config.save": "Kaydet",
-  "soapbox_config.saved": "Soapbox config saved!",
+  "soapbox_config.saved": "Soapbox yapılandırması kaydedildi!",
   "soapbox_config.tile_server_attribution_label": "Harita atıf bilgisi",
   "soapbox_config.tile_server_label": "Harita sunucusu",
-  "soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.",
-  "sponsored.info.message": "{siteTitle} displays ads to help fund our service.",
-  "sponsored.info.title": "Why am I seeing this ad?",
-  "sponsored.subtitle": "Sponsored post",
+  "soapbox_config.verified_can_edit_name_label": "Doğrulanmış kullanıcıların kendi görünen adlarını düzenlemesine izin verin.",
+  "sponsored.info.message": "{siteTitle} hizmetimizi finanse etmeye yardımcı olmak için reklamlar görüntüler.",
+  "sponsored.info.title": "Bu reklamı neden görüyorum?",
+  "sponsored.subtitle": "Sponsorlu gönderi",
   "status.admin_account": "@{name} için denetim arayüzünü açın",
-  "status.admin_status": "Denetim arayüzünde bu durumu açın",
+  "status.admin_status": "Denetim arayüzünde bu gönderiyi açın",
   "status.approval.pending": "Onay bekliyor",
   "status.approval.rejected": "Reddedildi",
-  "status.bookmark": "Bookmark",
-  "status.bookmarked": "Bookmark added.",
-  "status.cancel_reblog_private": "Boost'u geri al",
-  "status.cannot_reblog": "Bu gönderi boost edilemez",
-  "status.chat": "Chat with @{name}",
-  "status.copy": "Bağlantı durumunu kopyala",
+  "status.bookmark": "Yer imi",
+  "status.bookmarked": "Yer imi eklendi.",
+  "status.cancel_reblog_private": "Yeniden paylaşımı kaldır",
+  "status.cannot_reblog": "Bu gönderi yeniden gönderilemez",
+  "status.chat": "@{name} ile sohbet edin",
+  "status.copy": "Gönderi bağlantısını kopyala",
   "status.delete": "Sil",
   "status.detailed_status": "Detaylı yazışma dökümü",
-  "status.direct": "@{name}'e gönder",
+  "status.direct": "@{name} adlı hesaba özel mesaj gönder",
   "status.disabled_replies.group_membership": "Yalnızca grup üyeleri yanıt verebilir",
   "status.disfavourite": "Beğenme",
-  "status.edit": "Edit",
-  "status.embed": "Gömülü",
-  "status.external": "View post on {domain}",
-  "status.favourite": "Favorilere ekle",
+  "status.edit": "Düzenle",
+  "status.embed": "Gönderiyi websitesine ekle",
+  "status.external": "{domain} üzerindeki gönderiyi görüntüle",
+  "status.favourite": "Beğen",
   "status.filtered": "Filtrelenmiş",
-  "status.group": "{grup} içerisinde yayınlandı",
-  "status.group_mod_block": "Gruptan @{name}'i engelle",
+  "status.group": "{group} içerisinde yayınlandı",
+  "status.group_mod_block": "@{name} adlı hesabı gruptan engelle",
   "status.group_mod_delete": "Gönderiyi gruptan sil",
-  "status.group_mod_kick": "@{name}'i gruptan at",
+  "status.group_mod_kick": "@{name} adlı hesabı gruptan at",
   "status.interactions.dislikes": "Beğenmeme",
-  "status.interactions.favourites": "{count, plural, one {Like} other {Likes}}",
+  "status.interactions.favourites": "Beğenme",
   "status.interactions.quotes": "Alıntı",
-  "status.interactions.reblogs": "{count, plural, one {Repost} other {Reposts}}",
+  "status.interactions.reblogs": "Yeniden Gönderi",
   "status.load_more": "Daha fazla",
-  "status.mention": "Bahset : @{name}",
+  "status.mention": "@{name} adlı hesaptan bahset",
   "status.more": "Daha fazla",
-  "status.mute_conversation": "Yazışmayı sustur",
+  "status.mute_conversation": "Yazışmayı sessize al",
   "status.open": "Bu gönderiyi genişlet",
   "status.pin": "Profile sabitle",
   "status.pinned": "Sabitlenmiş gönderi",
-  "status.quote": "Quote post",
-  "status.reactions.cry": "Sad",
-  "status.reactions.empty": "No one has reacted to this post yet. When someone does, they will show up here.",
-  "status.reactions.heart": "Love",
+  "status.quote": "Gönderiyi alıntıla",
+  "status.reactions.cry": "Üzgün",
+  "status.reactions.empty": "Henüz kimse bu gönderiye tepki göstermedi. Birisi yaptığında, burada görünecek.",
+  "status.reactions.heart": "Sevdim",
   "status.reactions.laughing": "Haha",
-  "status.reactions.like": "Like",
+  "status.reactions.like": "Beğendim",
   "status.reactions.open_mouth": "Wow",
-  "status.reactions.weary": "Weary",
+  "status.reactions.weary": "Bıkkın",
   "status.read_more": "Daha dazla oku",
-  "status.reblog": "Boostla",
-  "status.reblog_private": "Orjinal kitleye yinele",
-  "status.reblogged_by": "{name} boost etti",
-  "status.reblogs.empty": "Kimse bu gönderiyi boostlamadı. Biri yaptığında burada gözükecek.",
-  "status.redraft": "Sil & tekrar taslakla",
-  "status.remove_account_from_group": "Remove account from group",
-  "status.remove_post_from_group": "Remove post from group",
+  "status.reblog": "Yeniden Gönder",
+  "status.reblog_private": "Orjinal kitleye yeniden gönder",
+  "status.reblogged_by": "{name} adlı hesap gönderinizi yeniden yayınladı",
+  "status.reblogs.empty": "Kimse bu gönderiyi yeniden yayınlamadı. Biri yaptığında burada gözükecek.",
+  "status.redraft": "Sil ve tekrar taslağa çevir",
+  "status.remove_account_from_group": "Hesabı gruptan kaldır",
+  "status.remove_post_from_group": "Gönderiyi gruptan kaldır",
   "status.reply": "Cevapla",
   "status.replyAll": "Konuşmayı cevapla",
-  "status.report": "@{name} adlı kişiyi bildir",
+  "status.report": "@{name} adlı hesabı bildir",
   "status.sensitive_warning": "Hassas içerik",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
+  "status.sensitive_warning.subtitle": "Bu içerik bazı kimseler için uygun olmayabilir.",
   "status.share": "Paylaş",
   "status.show_filter_reason": "Yine de göster",
   "status.show_less_all": "Hepsi için daha az göster",
   "status.show_more_all": "Hepsi için daha fazla göster",
-  "status.show_original": "Show original",
+  "status.show_original": "Orijinali göster",
   "status.title": "Post",
   "status.title_direct": "Özel mesaj",
-  "status.translate": "Translate",
-  "status.translated_from_with": "Translated from {lang} using {provider}",
-  "status.unbookmark": "Remove bookmark",
-  "status.unbookmarked": "Bookmark removed.",
-  "status.unmute_conversation": "Sohbeti aç",
+  "status.translate": "Tercüme et",
+  "status.translated_from_with": "{provider} kullanılarak {lang} dilinden çevrildi",
+  "status.unbookmark": "Yer imini kaldır",
+  "status.unbookmarked": "Yer imi kaldırıldı.",
+  "status.unmute_conversation": "Yazışmayı sessizden kaldır",
   "status.unpin": "Profilden sabitlemeyi kaldır",
-  "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
-  "statuses.quote_tombstone": "Post is unavailable.",
-  "statuses.tombstone": "One or more posts are unavailable.",
-  "streamfield.add": "Add",
-  "streamfield.remove": "Remove",
+  "status_list.queue_label": "{count} yeni {count, plural, one {bildirimi} other {bildirimleri}} görmek için tıklayınız",
+  "statuses.quote_tombstone": "Gönderi bulunamadı.",
+  "statuses.tombstone": "Bir veya daha fazla mesaj bulunamadı.",
+  "streamfield.add": "Ekle",
+  "streamfield.remove": "Kaldır",
   "suggestions.dismiss": "Öneriyi görmezden gel",
-  "sw.restart": "Restart",
-  "sw.state.active": "Active",
-  "sw.state.loading": "Loading…",
-  "sw.state.unavailable": "Unavailable",
-  "sw.state.unknown": "Unknown",
-  "sw.state.waiting": "Waiting",
-  "sw.status": "Status",
+  "sw.restart": "Yeniden Başlat",
+  "sw.state.active": "Aktif",
+  "sw.state.loading": "Yükleniyor…",
+  "sw.state.unavailable": "Kullanılamıyor",
+  "sw.state.unknown": "Bilinmeyen",
+  "sw.state.waiting": "Bekliyor",
+  "sw.status": "Durum",
   "sw.url": "Script URL",
-  "tabs_bar.all": "All",
+  "tabs_bar.all": "Tümü",
   "tabs_bar.dashboard": "Yönetici Paneli",
   "tabs_bar.fediverse": "Fediverse",
   "tabs_bar.groups": "Gruplar",
   "tabs_bar.home": "Ana sayfa",
-  "tabs_bar.local": "Local",
-  "tabs_bar.more": "More",
+  "tabs_bar.local": "Yerel",
+  "tabs_bar.more": "Daha fazla",
   "tabs_bar.notifications": "Bildirimler",
-  "tabs_bar.profile": "Profile",
+  "tabs_bar.profile": "Profil",
   "tabs_bar.search": "Ara",
-  "tabs_bar.settings": "Settings",
+  "tabs_bar.settings": "Ayarlar",
   "textarea.counter.label": "{count} karakter kaldı",
   "theme_editor.Reset": "Sıfırla",
   "theme_editor.export": "Temayı dışa aktar",
@@ -1496,13 +1496,13 @@
   "theme_editor.restore": "Varsayılan temayı geri yükle",
   "theme_editor.save": "Temayı kaydet",
   "theme_editor.saved": "Tema güncellendi!",
-  "theme_toggle.dark": "Dark",
-  "theme_toggle.light": "Light",
-  "theme_toggle.system": "System",
-  "thread_login.login": "Log in",
-  "thread_login.message": "Join {siteTitle} to get the full story and details.",
-  "thread_login.signup": "Sign up",
-  "thread_login.title": "Continue the conversation",
+  "theme_toggle.dark": "Koyu",
+  "theme_toggle.light": "Açık",
+  "theme_toggle.system": "Sistem",
+  "thread_login.login": "Giriş Yap",
+  "thread_login.message": "Tüm hikayeyi ve ayrıntıları öğrenmek için {siteTitle}'a katılın.",
+  "thread_login.signup": "Kayıt ol",
+  "thread_login.title": "Sohbete devam edin",
   "time_remaining.days": "{number, plural, one {# gün} other {# gün}} kaldı",
   "time_remaining.hours": "{number, plural, one {# saat} other {# saat}} kaldı",
   "time_remaining.minutes": "{number, plural, one {# dakika} other {# dakika}} kaldı",
@@ -1510,32 +1510,32 @@
   "time_remaining.seconds": "{number, plural, one {# saniye} other {# saniye}} kaldı",
   "toast.view": "Gör",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {kişi} other {kişi}} konuşuyor",
-  "trends.title": "Trends",
-  "trendsPanel.viewAll": "View all",
-  "unauthorized_modal.text": "You need to be logged in to do that.",
-  "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Karşıya yükleme için sürükle bırak yapınız",
+  "trends.title": "Trendler",
+  "trendsPanel.viewAll": "Tümünü gör",
+  "unauthorized_modal.text": "Bunu yapabilmek için giriş yapmış olmalısınız.",
+  "unauthorized_modal.title": "{site_title} için kaydolun",
+  "upload_area.title": "Dosya yüklemek için sürükle bırak yapınız",
   "upload_button.label": "Görsel ekle",
-  "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
+  "upload_error.image_size_limit": "Resim geçerli dosya boyutu sınırını ({limit}) aşıyor",
   "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_error.video_duration_limit": "Video geçerli süre sınırını aşıyor ({limit} saniye)",
-  "upload_error.video_size_limit": "Video exceeds the current file size limit ({limit})",
+  "upload_error.video_size_limit": "Video, geçerli dosya boyutu sınırını ({limit}) aşıyor",
   "upload_form.description": "Görme engelliler için açıklama",
-  "upload_form.preview": "Preview",
-  "upload_form.undo": "Geri al",
-  "upload_progress.label": "Yükleniyor...",
+  "upload_form.preview": "Önizleme",
+  "upload_form.undo": "Sil",
+  "upload_progress.label": "Yükleniyor…",
   "video.close": "Videoyu kapat",
-  "video.download": "Download file",
+  "video.download": "Dosyayı indirin",
   "video.exit_fullscreen": "Tam ekrandan çık",
   "video.expand": "Videoyu genişlet",
   "video.fullscreen": "Tam ekran",
   "video.hide": "Videoyu gizle",
-  "video.mute": "Sesi kıs",
+  "video.mute": "Sesi kapat",
   "video.pause": "Duraklat",
   "video.play": "Oynat",
   "video.unmute": "Sesi aç",
-  "waitlist.actions.verify_number": "Verify phone number",
-  "waitlist.body": "Welcome back to {title}! You were previously placed on our waitlist. Please verify your phone number to receive immediate access to your account!",
-  "who_to_follow.title": "Who To Follow"
+  "waitlist.actions.verify_number": "Telefon numarasını doğrulayın",
+  "waitlist.body": "{title}'a tekrar hoş geldiniz! Daha önce bekleme listemize yerleştirilmiştiniz. Hesabınıza anında erişebilmek için lütfen telefon numaranızı doğrulayın!",
+  "who_to_follow.title": "Kimi takip etmeli"
 }

From b2b1f5ece37ced16ca320f98647d1cd92dffd8a6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 11 Apr 2023 09:01:59 -0500
Subject: [PATCH 113/298] yarn i18n

---
 app/soapbox/locales/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 080a6dfc5..265cb1bcc 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -807,6 +807,7 @@
   "group.role.admin": "Admin",
   "group.role.owner": "Owner",
   "group.tabs.all": "All",
+  "group.tabs.media": "Media",
   "group.tabs.members": "Members",
   "group.tags.hint": "Add up to 3 keywords that will serve as core topics of discussion in the group.",
   "group.tags.label": "Tags",

From 3d7cccd984b8d575e54b0dd5cc9db0775c47fec8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 11 Apr 2023 10:04:31 -0500
Subject: [PATCH 114/298] EntityStore: allow customizing import position

---
 app/soapbox/entity-store/__tests__/reducer.test.ts |  2 +-
 app/soapbox/entity-store/actions.ts                |  7 +++++--
 app/soapbox/entity-store/hooks/useCreateEntity.ts  |  2 +-
 app/soapbox/entity-store/hooks/useEntities.ts      | 10 +++++-----
 app/soapbox/entity-store/reducer.ts                |  9 +++++----
 app/soapbox/entity-store/types.ts                  |  4 ++++
 app/soapbox/entity-store/utils.ts                  |  7 ++++---
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/soapbox/entity-store/__tests__/reducer.test.ts b/app/soapbox/entity-store/__tests__/reducer.test.ts
index 1cfc19697..3e6aa3510 100644
--- a/app/soapbox/entity-store/__tests__/reducer.test.ts
+++ b/app/soapbox/entity-store/__tests__/reducer.test.ts
@@ -110,7 +110,7 @@ test('import entities with override', () => {
 
   const now = new Date();
 
-  const action = entitiesFetchSuccess(entities, 'TestEntity', 'thingies', {
+  const action = entitiesFetchSuccess(entities, 'TestEntity', 'thingies', 'end', {
     next: undefined,
     prev: undefined,
     totalCount: 2,
diff --git a/app/soapbox/entity-store/actions.ts b/app/soapbox/entity-store/actions.ts
index c3ba25559..bb96255c6 100644
--- a/app/soapbox/entity-store/actions.ts
+++ b/app/soapbox/entity-store/actions.ts
@@ -1,4 +1,4 @@
-import type { Entity, EntityListState } from './types';
+import type { Entity, EntityListState, ImportPosition } from './types';
 
 const ENTITIES_IMPORT = 'ENTITIES_IMPORT' as const;
 const ENTITIES_DELETE = 'ENTITIES_DELETE' as const;
@@ -10,12 +10,13 @@ const ENTITIES_FETCH_FAIL = 'ENTITIES_FETCH_FAIL' as const;
 const ENTITIES_INVALIDATE_LIST = 'ENTITIES_INVALIDATE_LIST' as const;
 
 /** Action to import entities into the cache. */
-function importEntities(entities: Entity[], entityType: string, listKey?: string) {
+function importEntities(entities: Entity[], entityType: string, listKey?: string, pos?: ImportPosition) {
   return {
     type: ENTITIES_IMPORT,
     entityType,
     entities,
     listKey,
+    pos,
   };
 }
 
@@ -62,6 +63,7 @@ function entitiesFetchSuccess(
   entities: Entity[],
   entityType: string,
   listKey?: string,
+  pos?: ImportPosition,
   newState?: EntityListState,
   overwrite = false,
 ) {
@@ -70,6 +72,7 @@ function entitiesFetchSuccess(
     entityType,
     entities,
     listKey,
+    pos,
     newState,
     overwrite,
   };
diff --git a/app/soapbox/entity-store/hooks/useCreateEntity.ts b/app/soapbox/entity-store/hooks/useCreateEntity.ts
index 31299344e..6b4aaff73 100644
--- a/app/soapbox/entity-store/hooks/useCreateEntity.ts
+++ b/app/soapbox/entity-store/hooks/useCreateEntity.ts
@@ -30,7 +30,7 @@ function useCreateEntity<TEntity extends Entity = Entity, Data = unknown>(
       const entity = schema.parse(result.data);
 
       // TODO: optimistic updating
-      dispatch(importEntities([entity], entityType, listKey));
+      dispatch(importEntities([entity], entityType, listKey, 'start'));
 
       if (callbacks.onSuccess) {
         callbacks.onSuccess(entity);
diff --git a/app/soapbox/entity-store/hooks/useEntities.ts b/app/soapbox/entity-store/hooks/useEntities.ts
index a99ce8631..cd413f487 100644
--- a/app/soapbox/entity-store/hooks/useEntities.ts
+++ b/app/soapbox/entity-store/hooks/useEntities.ts
@@ -54,7 +54,7 @@ function useEntities<TEntity extends Entity>(
   const next = useListState(path, 'next');
   const prev = useListState(path, 'prev');
 
-  const fetchPage = async(req: EntityFn<void>, overwrite = false): Promise<void> => {
+  const fetchPage = async(req: EntityFn<void>, pos: 'start' | 'end', overwrite = false): Promise<void> => {
     // Get `isFetching` state from the store again to prevent race conditions.
     const isFetching = selectListState(getState(), path, 'fetching');
     if (isFetching) return;
@@ -67,7 +67,7 @@ function useEntities<TEntity extends Entity>(
       const parsedCount = realNumberSchema.safeParse(response.headers['x-total-count']);
       const totalCount = parsedCount.success ? parsedCount.data : undefined;
 
-      dispatch(entitiesFetchSuccess(entities, entityType, listKey, {
+      dispatch(entitiesFetchSuccess(entities, entityType, listKey, pos, {
         next: getNextLink(response),
         prev: getPrevLink(response),
         totalCount: Number(totalCount) >= entities.length ? totalCount : undefined,
@@ -83,18 +83,18 @@ function useEntities<TEntity extends Entity>(
   };
 
   const fetchEntities = async(): Promise<void> => {
-    await fetchPage(entityFn, true);
+    await fetchPage(entityFn, 'end', true);
   };
 
   const fetchNextPage = async(): Promise<void> => {
     if (next) {
-      await fetchPage(() => api.get(next));
+      await fetchPage(() => api.get(next), 'end');
     }
   };
 
   const fetchPreviousPage = async(): Promise<void> => {
     if (prev) {
-      await fetchPage(() => api.get(prev));
+      await fetchPage(() => api.get(prev), 'start');
     }
   };
 
diff --git a/app/soapbox/entity-store/reducer.ts b/app/soapbox/entity-store/reducer.ts
index b71fb812f..ef7b604d9 100644
--- a/app/soapbox/entity-store/reducer.ts
+++ b/app/soapbox/entity-store/reducer.ts
@@ -14,7 +14,7 @@ import {
 import { createCache, createList, updateStore, updateList } from './utils';
 
 import type { DeleteEntitiesOpts } from './actions';
-import type { Entity, EntityCache, EntityListState } from './types';
+import type { Entity, EntityCache, EntityListState, ImportPosition } from './types';
 
 enableMapSet();
 
@@ -29,6 +29,7 @@ const importEntities = (
   entityType: string,
   entities: Entity[],
   listKey?: string,
+  pos?: ImportPosition,
   newState?: EntityListState,
   overwrite = false,
 ): State => {
@@ -43,7 +44,7 @@ const importEntities = (
         list.ids = new Set();
       }
 
-      list = updateList(list, entities);
+      list = updateList(list, entities, pos);
 
       if (newState) {
         list.state = newState;
@@ -159,7 +160,7 @@ const invalidateEntityList = (state: State, entityType: string, listKey: string)
 function reducer(state: Readonly<State> = {}, action: EntityAction): State {
   switch (action.type) {
     case ENTITIES_IMPORT:
-      return importEntities(state, action.entityType, action.entities, action.listKey);
+      return importEntities(state, action.entityType, action.entities, action.listKey, action.pos);
     case ENTITIES_DELETE:
       return deleteEntities(state, action.entityType, action.ids, action.opts);
     case ENTITIES_DISMISS:
@@ -167,7 +168,7 @@ function reducer(state: Readonly<State> = {}, action: EntityAction): State {
     case ENTITIES_INCREMENT:
       return incrementEntities(state, action.entityType, action.listKey, action.diff);
     case ENTITIES_FETCH_SUCCESS:
-      return importEntities(state, action.entityType, action.entities, action.listKey, action.newState, action.overwrite);
+      return importEntities(state, action.entityType, action.entities, action.listKey, action.pos, action.newState, action.overwrite);
     case ENTITIES_FETCH_REQUEST:
       return setFetching(state, action.entityType, action.listKey, true);
     case ENTITIES_FETCH_FAIL:
diff --git a/app/soapbox/entity-store/types.ts b/app/soapbox/entity-store/types.ts
index 006b13ba2..5fff2f474 100644
--- a/app/soapbox/entity-store/types.ts
+++ b/app/soapbox/entity-store/types.ts
@@ -47,10 +47,14 @@ interface EntityCache<TEntity extends Entity = Entity> {
   }
 }
 
+/** Whether to import items at the start or end of the list. */
+type ImportPosition = 'start' | 'end'
+
 export {
   Entity,
   EntityStore,
   EntityList,
   EntityListState,
   EntityCache,
+  ImportPosition,
 };
\ No newline at end of file
diff --git a/app/soapbox/entity-store/utils.ts b/app/soapbox/entity-store/utils.ts
index 3f65f1ee0..58d54465a 100644
--- a/app/soapbox/entity-store/utils.ts
+++ b/app/soapbox/entity-store/utils.ts
@@ -1,4 +1,4 @@
-import type { Entity, EntityStore, EntityList, EntityCache, EntityListState } from './types';
+import type { Entity, EntityStore, EntityList, EntityCache, EntityListState, ImportPosition } from './types';
 
 /** Insert the entities into the store. */
 const updateStore = (store: EntityStore, entities: Entity[]): EntityStore => {
@@ -9,9 +9,10 @@ const updateStore = (store: EntityStore, entities: Entity[]): EntityStore => {
 };
 
 /** Update the list with new entity IDs. */
-const updateList = (list: EntityList, entities: Entity[]): EntityList => {
+const updateList = (list: EntityList, entities: Entity[], pos: ImportPosition = 'end'): EntityList => {
   const newIds = entities.map(entity => entity.id);
-  const ids = new Set([...newIds, ...Array.from(list.ids)]);
+  const oldIds = Array.from(list.ids);
+  const ids = new Set(pos === 'start' ? [...newIds, ...oldIds] : [...oldIds, ...newIds]);
 
   if (typeof list.state.totalCount === 'number') {
     const sizeDiff = ids.size - list.ids.size;

From c8d9197065648afdcae9727afcdf79c5ee19c47f Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 12 Apr 2023 09:17:26 -0400
Subject: [PATCH 115/298] Support autoFocus in Streamfield

---
 app/soapbox/components/ui/streamfield/streamfield.tsx  |  8 +++++++-
 .../features/group/components/group-tags-field.tsx     | 10 ++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/soapbox/components/ui/streamfield/streamfield.tsx b/app/soapbox/components/ui/streamfield/streamfield.tsx
index bb2ca0ba5..9ca795ada 100644
--- a/app/soapbox/components/ui/streamfield/streamfield.tsx
+++ b/app/soapbox/components/ui/streamfield/streamfield.tsx
@@ -16,6 +16,7 @@ const messages = defineMessages({
 export type StreamfieldComponent<T> = React.ComponentType<{
   value: T
   onChange: (value: T) => void
+  autoFocus: boolean
 }>;
 
 interface IStreamfield {
@@ -72,7 +73,12 @@ const Streamfield: React.FC<IStreamfield> = ({
         <Stack space={1}>
           {values.map((value, i) => value?._destroy ? null : (
             <HStack space={2} alignItems='center'>
-              <Component key={i} onChange={handleChange(i)} value={value} />
+              <Component
+                key={i}
+                onChange={handleChange(i)}
+                value={value}
+                autoFocus={i > 0}
+              />
               {values.length > minItems && onRemoveItem && (
                 <IconButton
                   iconClassName='h-4 w-4'
diff --git a/app/soapbox/features/group/components/group-tags-field.tsx b/app/soapbox/features/group/components/group-tags-field.tsx
index e4592a6e4..8502c3a1b 100644
--- a/app/soapbox/features/group/components/group-tags-field.tsx
+++ b/app/soapbox/features/group/components/group-tags-field.tsx
@@ -3,6 +3,8 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { Input, Streamfield } from 'soapbox/components/ui';
 
+import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield';
+
 const messages = defineMessages({
   hashtagPlaceholder: { id: 'manage_group.fields.hashtag_placeholder', defaultMessage: 'Add a topic' },
 });
@@ -30,12 +32,7 @@ const GroupTagsField: React.FC<IGroupTagsField> = ({ tags, onChange, onAddItem,
   );
 };
 
-interface IHashtagField {
-  value: string
-  onChange: (value: string) => void
-}
-
-const HashtagField: React.FC<IHashtagField> = ({ value, onChange }) => {
+const HashtagField: StreamfieldComponent<string> = ({ value, onChange, autoFocus = false }) => {
   const intl = useIntl();
 
   const handleChange: React.ChangeEventHandler<HTMLInputElement> = ({ target }) => {
@@ -49,6 +46,7 @@ const HashtagField: React.FC<IHashtagField> = ({ value, onChange }) => {
       value={value}
       onChange={handleChange}
       placeholder={intl.formatMessage(messages.hashtagPlaceholder)}
+      autoFocus={autoFocus}
     />
   );
 };

From 21419f23d4c514e59e74f6a533e8473dfa19dc52 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 12 Apr 2023 09:44:29 -0400
Subject: [PATCH 116/298] Add group context to details screen

---
 .../status/components/detailed-status.tsx     | 41 ++++++++++++++++---
 app/soapbox/features/status/index.tsx         |  3 +-
 app/soapbox/locales/en.json                   |  1 -
 app/soapbox/locales/zh-CN.json                |  1 -
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx
index 4fc0f0eaf..05e435d4e 100644
--- a/app/soapbox/features/status/components/detailed-status.tsx
+++ b/app/soapbox/features/status/components/detailed-status.tsx
@@ -2,20 +2,20 @@ import React, { useEffect, useRef, useState } from 'react';
 import { FormattedDate, FormattedMessage, useIntl } from 'react-intl';
 
 import Account from 'soapbox/components/account';
-import Icon from 'soapbox/components/icon';
 import StatusContent from 'soapbox/components/status-content';
 import StatusMedia from 'soapbox/components/status-media';
 import StatusReplyMentions from 'soapbox/components/status-reply-mentions';
 import SensitiveContentOverlay from 'soapbox/components/statuses/sensitive-content-overlay';
+import StatusInfo from 'soapbox/components/statuses/status-info';
 import TranslateButton from 'soapbox/components/translate-button';
-import { HStack, Stack, Text } from 'soapbox/components/ui';
+import { HStack, Icon, Stack, Text } from 'soapbox/components/ui';
 import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container';
 import { getActualStatus } from 'soapbox/utils/status';
 
 import StatusInteractionBar from './status-interaction-bar';
 
 import type { List as ImmutableList } from 'immutable';
-import type { Attachment as AttachmentEntity, Status as StatusEntity } from 'soapbox/types/entities';
+import type { Attachment as AttachmentEntity, Group, Status as StatusEntity } from 'soapbox/types/entities';
 
 interface IDetailedStatus {
   status: StatusEntity
@@ -50,6 +50,35 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
     onOpenCompareHistoryModal(status);
   };
 
+  const renderStatusInfo = () => {
+    if (status.group) {
+      return (
+        <div className='mb-4'>
+          <StatusInfo
+            avatarSize={42}
+            to={`/groups/${(status.group as Group).id}`}
+            icon={
+              <Icon
+                src={require('@tabler/icons/circles.svg')}
+                className='h-4 w-4 text-primary-600 dark:text-accent-blue'
+              />}
+            text={
+              <Text size='xs' theme='muted' weight='medium'>
+                <FormattedMessage
+                  id='status.group'
+                  defaultMessage='Posted in {group}'
+                  values={{ group: (
+                    <span dangerouslySetInnerHTML={{ __html: (status.group as Group).display_name_html }} />
+                  ) }}
+                />
+              </Text>
+            }
+          />
+        </div>
+      );
+    }
+  };
+
   const actualStatus = getActualStatus(status);
   if (!actualStatus) return null;
   const { account } = actualStatus;
@@ -75,14 +104,16 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
   }
 
   if (actualStatus.visibility === 'direct') {
-    statusTypeIcon = <Icon className='text-gray-700 dark:text-gray-600' src={require('@tabler/icons/mail.svg')} />;
+    statusTypeIcon = <Icon className='h-4 w-4 text-gray-700 dark:text-gray-600' src={require('@tabler/icons/mail.svg')} />;
   } else if (actualStatus.visibility === 'private') {
-    statusTypeIcon = <Icon className='text-gray-700 dark:text-gray-600' src={require('@tabler/icons/lock.svg')} />;
+    statusTypeIcon = <Icon className='h-4 w-4 text-gray-700 dark:text-gray-600' src={require('@tabler/icons/lock.svg')} />;
   }
 
   return (
     <div className='border-box'>
       <div ref={node} className='detailed-actualStatus' tabIndex={-1}>
+        {renderStatusInfo()}
+
         <div className='mb-4'>
           <Account
             key={account.id}
diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 818d83720..28bde468b 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -52,7 +52,6 @@ import type {
 const messages = defineMessages({
   title: { id: 'status.title', defaultMessage: 'Post Details' },
   titleDirect: { id: 'status.title_direct', defaultMessage: 'Direct message' },
-  titleGroup: { id: 'status.title_group', defaultMessage: 'Group Post Details' },
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
   deleteHeading: { id: 'confirmations.delete.heading', defaultMessage: 'Delete post' },
   deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this post?' },
@@ -523,7 +522,7 @@ const Thread: React.FC<IThread> = (props) => {
 
   const titleMessage = () => {
     if (status.visibility === 'direct') return messages.titleDirect;
-    return status.group ? messages.titleGroup : messages.title;
+    return messages.title;
   };
 
   return (
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 265cb1bcc..002cbe6c8 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1465,7 +1465,6 @@
   "status.show_original": "Show original",
   "status.title": "Post Details",
   "status.title_direct": "Direct message",
-  "status.title_group": "Group Post Details",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.unbookmark": "Remove bookmark",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 617c8e727..889752971 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -1464,7 +1464,6 @@
   "status.show_original": "显示原文本",
   "status.title": "帖文详情",
   "status.title_direct": "私信",
-  "status.title_group": "群组帖文详情",
   "status.translate": "翻译",
   "status.translated_from_with": "使用 {provider} 从 {lang} 翻译而来",
   "status.unbookmark": "移除书签",

From 3a9e4de5cc92f9eb7409e63d7c6c0535b4b56177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 12 Apr 2023 19:45:48 +0200
Subject: [PATCH 117/298] Fix: scheduled poast box datepicker cut off again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/pages/home-page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/pages/home-page.tsx b/app/soapbox/pages/home-page.tsx
index 1a91a0320..2ba7cac0a 100644
--- a/app/soapbox/pages/home-page.tsx
+++ b/app/soapbox/pages/home-page.tsx
@@ -43,7 +43,7 @@ const HomePage: React.FC<IHomePage> = ({ children }) => {
     <>
       <Layout.Main className='space-y-3 pt-3 dark:divide-gray-800 sm:pt-0'>
         {me && (
-          <Card variant='rounded' ref={composeBlock}>
+          <Card className='relative z-[1]' variant='rounded' ref={composeBlock}>
             <CardBody>
               <HStack alignItems='start' space={4}>
                 <Link to={`/@${acct}`}>

From d4c9d086d53bc14363e672a69cc5ee84d41fbb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 12 Apr 2023 19:53:24 +0200
Subject: [PATCH 118/298] Fix renderLocation in ComposeEventModal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../modals/compose-event-modal/compose-event-modal.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx b/app/soapbox/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx
index 2ecbbda4f..6a23268d5 100644
--- a/app/soapbox/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx
@@ -184,7 +184,7 @@ const ComposeEventModal: React.FC<IComposeEventModal> = ({ onClose }) => {
       <Icon src={ADDRESS_ICONS[location.type] || require('@tabler/icons/map-pin.svg')} />
       <Stack className='grow'>
         <Text>{location.description}</Text>
-        <Text theme='muted' size='xs'>{[location.street, location.locality, location.country].filter(val => val.trim()).join(' · ')}</Text>
+        <Text theme='muted' size='xs'>{[location.street, location.locality, location.country].filter(val => val?.trim()).join(' · ')}</Text>
       </Stack>
       <IconButton title={intl.formatMessage(messages.resetLocation)} src={require('@tabler/icons/x.svg')} onClick={() => onChangeLocation(null)} />
     </HStack>

From 5f3250b1757db2c1495b298fd7512e1716f67da6 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 12 Apr 2023 15:04:42 -0400
Subject: [PATCH 119/298] Resolve bug with toast during modal

---
 app/soapbox/components/modal-root.tsx | 4 +++-
 app/soapbox/containers/soapbox.tsx    | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/components/modal-root.tsx b/app/soapbox/components/modal-root.tsx
index 84c1252c9..2358a951f 100644
--- a/app/soapbox/components/modal-root.tsx
+++ b/app/soapbox/components/modal-root.tsx
@@ -181,7 +181,9 @@ const ModalRoot: React.FC<IModalRoot> = ({ children, onCancel, onClose, type })
   };
 
   const getSiblings = () => {
-    return Array(...(ref.current!.parentElement!.childNodes as any as ChildNode[])).filter(node => node !== ref.current);
+    return Array(...(ref.current!.parentElement!.childNodes as any as ChildNode[]))
+      .filter(node => (node as HTMLDivElement).id !== 'toaster')
+      .filter(node => node !== ref.current);
   };
 
   useEffect(() => {
diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx
index fb6ce9481..75134b00d 100644
--- a/app/soapbox/containers/soapbox.tsx
+++ b/app/soapbox/containers/soapbox.tsx
@@ -191,7 +191,14 @@ const SoapboxMount = () => {
                 </BundleContainer>
 
                 <GdprBanner />
-                <Toaster position='top-right' containerClassName='top-10' containerStyle={{ top: 75 }} />
+
+                <div id='toaster'>
+                  <Toaster
+                    position='top-right'
+                    containerClassName='top-10'
+                    containerStyle={{ top: 75 }}
+                  />
+                </div>
               </Route>
             </Switch>
           </ScrollContext>

From 575382b22600f16058609bc082f652ac9507eda0 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 3 Apr 2023 15:46:58 -0400
Subject: [PATCH 120/298] Add ability to share Group statuses

---
 app/soapbox/components/status-action-bar.tsx | 2 +-
 app/soapbox/normalizers/status.ts            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx
index 2938e91e7..5fa3e6c3b 100644
--- a/app/soapbox/components/status-action-bar.tsx
+++ b/app/soapbox/components/status-action-bar.tsx
@@ -609,7 +609,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
     replyTitle = intl.formatMessage(messages.replyAll);
   }
 
-  const canShare = ('share' in navigator) && status.visibility === 'public';
+  const canShare = ('share' in navigator) && (status.visibility === 'public' || status.visibility === 'group');
 
   return (
     <HStack data-testid='status-action-bar'>
diff --git a/app/soapbox/normalizers/status.ts b/app/soapbox/normalizers/status.ts
index 031c99c29..7a71f24a8 100644
--- a/app/soapbox/normalizers/status.ts
+++ b/app/soapbox/normalizers/status.ts
@@ -20,7 +20,7 @@ import type { ReducerAccount } from 'soapbox/reducers/accounts';
 import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity } from 'soapbox/types/entities';
 
 export type StatusApprovalStatus = 'pending' | 'approval' | 'rejected';
-export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct' | 'self';
+export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct' | 'self' | 'group';
 
 export type EventJoinMode = 'free' | 'restricted' | 'invite';
 export type EventJoinState = 'pending' | 'reject' | 'accept';

From dd94dbad8e88cd48442cee8ba78392ee45b08fbe Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 5 Apr 2023 10:11:11 -0400
Subject: [PATCH 121/298] Update toast after saving Groups

---
 app/soapbox/features/group/edit-group.tsx          | 4 +++-
 app/soapbox/locales/en.json                        | 1 +
 app/soapbox/normalizers/__tests__/instance.test.ts | 2 +-
 app/soapbox/normalizers/instance.ts                | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index 1e8024f6f..57f0adfef 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -5,6 +5,7 @@ import { Button, Column, Form, FormActions, FormGroup, Icon, Input, Spinner, Tex
 import { useAppSelector, useInstance } from 'soapbox/hooks';
 import { useGroup, useUpdateGroup } from 'soapbox/hooks/api';
 import { useImageField, useTextField } from 'soapbox/hooks/forms';
+import toast from 'soapbox/toast';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
 
 import AvatarPicker from './components/group-avatar-picker';
@@ -20,7 +21,7 @@ const messages = defineMessages({
   heading: { id: 'navigation_bar.edit_group', defaultMessage: 'Edit Group' },
   groupNamePlaceholder: { id: 'manage_group.fields.name_placeholder', defaultMessage: 'Group Name' },
   groupDescriptionPlaceholder: { id: 'manage_group.fields.description_placeholder', defaultMessage: 'Description' },
-  success: { id: 'manage_group.success', defaultMessage: 'Group saved!' },
+  groupSaved: { id: 'group.update.success', defaultMessage: 'Group successfully saved' },
 });
 
 interface IEditGroup {
@@ -64,6 +65,7 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
     });
 
     setIsSubmitting(false);
+    toast.success(intl.formatMessage(messages.groupSaved));
   }
 
   const handleAddTag = () => {
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 265cb1bcc..b7a7a5f6d 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -811,6 +811,7 @@
   "group.tabs.members": "Members",
   "group.tags.hint": "Add up to 3 keywords that will serve as core topics of discussion in the group.",
   "group.tags.label": "Tags",
+  "group.update.success": "Group successfully saved",
   "group.upload_banner": "Upload photo",
   "groups.discover.popular.empty": "Unable to fetch popular groups at this time. Please check back later.",
   "groups.discover.popular.show_more": "Show More",
diff --git a/app/soapbox/normalizers/__tests__/instance.test.ts b/app/soapbox/normalizers/__tests__/instance.test.ts
index 90472e7f8..f2bac4867 100644
--- a/app/soapbox/normalizers/__tests__/instance.test.ts
+++ b/app/soapbox/normalizers/__tests__/instance.test.ts
@@ -25,7 +25,7 @@ describe('normalizeInstance()', () => {
         },
         groups: {
           max_characters_name: 50,
-          max_characters_description: 100,
+          max_characters_description: 160,
         },
       },
       description: '',
diff --git a/app/soapbox/normalizers/instance.ts b/app/soapbox/normalizers/instance.ts
index 3632b9058..77233c143 100644
--- a/app/soapbox/normalizers/instance.ts
+++ b/app/soapbox/normalizers/instance.ts
@@ -37,7 +37,7 @@ export const InstanceRecord = ImmutableRecord({
     }),
     groups: ImmutableMap<string, number>({
       max_characters_name: 50,
-      max_characters_description: 100,
+      max_characters_description: 160,
     }),
   }),
   description: '',

From dc761f94167f0dbe9b601494072c422f0bed8354 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 12 Apr 2023 15:37:20 -0400
Subject: [PATCH 122/298] Update i18n

---
 app/soapbox/locales/en.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index b7a7a5f6d..89608c4d5 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -968,7 +968,6 @@
   "manage_group.privacy.private.label": "Private (Owner approval required)",
   "manage_group.privacy.public.hint": "Discoverable. Anyone can join.",
   "manage_group.privacy.public.label": "Public",
-  "manage_group.success": "Group saved!",
   "manage_group.tagline": "Groups connect you with others based on shared interests.",
   "media_panel.empty_message": "No media found.",
   "media_panel.title": "Media",

From f55943a79b3666b9f00becc603b9514feacf9238 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 12 Apr 2023 16:09:18 -0400
Subject: [PATCH 123/298] Fix outline of StatusActionButton

---
 app/soapbox/components/status-action-button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/components/status-action-button.tsx b/app/soapbox/components/status-action-button.tsx
index 39795fc7e..47b3c11b8 100644
--- a/app/soapbox/components/status-action-button.tsx
+++ b/app/soapbox/components/status-action-button.tsx
@@ -53,7 +53,7 @@ const StatusActionButton = React.forwardRef<HTMLButtonElement, IStatusActionButt
           src={icon}
           className={clsx(
             {
-              'fill-accent-300 hover:fill-accent-300': active && filled && color === COLORS.accent,
+              'fill-accent-300 text-accent-300 hover:fill-accent-300': active && filled && color === COLORS.accent,
             },
             iconClassName,
           )}

From 17757ea326649e710bff04d5ec95f8d0047f6a39 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 12 Apr 2023 15:39:41 -0500
Subject: [PATCH 124/298] Add useEntityLookup hook

---
 app/soapbox/entity-store/hooks/useEntity.ts   |  1 +
 .../entity-store/hooks/useEntityLookup.ts     | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 app/soapbox/entity-store/hooks/useEntityLookup.ts

diff --git a/app/soapbox/entity-store/hooks/useEntity.ts b/app/soapbox/entity-store/hooks/useEntity.ts
index 37027f73f..63447ae67 100644
--- a/app/soapbox/entity-store/hooks/useEntity.ts
+++ b/app/soapbox/entity-store/hooks/useEntity.ts
@@ -59,4 +59,5 @@ function useEntity<TEntity extends Entity>(
 
 export {
   useEntity,
+  type UseEntityOpts,
 };
\ No newline at end of file
diff --git a/app/soapbox/entity-store/hooks/useEntityLookup.ts b/app/soapbox/entity-store/hooks/useEntityLookup.ts
new file mode 100644
index 000000000..ab0ea0b41
--- /dev/null
+++ b/app/soapbox/entity-store/hooks/useEntityLookup.ts
@@ -0,0 +1,66 @@
+import { useEffect } from 'react';
+import { z } from 'zod';
+
+import { useAppDispatch, useAppSelector, useLoading } from 'soapbox/hooks';
+import { type RootState } from 'soapbox/store';
+
+import { importEntities } from '../actions';
+import { Entity } from '../types';
+
+import { EntityFn } from './types';
+import { type UseEntityOpts } from './useEntity';
+
+/** Entities will be filtered through this function until it returns true. */
+type LookupFn<TEntity extends Entity> = (entity: TEntity) => boolean
+
+function useEntityLookup<TEntity extends Entity>(
+  entityType: string,
+  lookupFn: LookupFn<TEntity>,
+  entityFn: EntityFn<void>,
+  opts: UseEntityOpts<TEntity> = {},
+) {
+  const { schema = z.custom<TEntity>() } = opts;
+
+  const dispatch = useAppDispatch();
+  const [isFetching, setPromise] = useLoading(true);
+
+  const entity = useAppSelector(state => findEntity(state, entityType, lookupFn));
+  const isLoading = isFetching && !entity;
+
+  const fetchEntity = async () => {
+    try {
+      const response = await setPromise(entityFn());
+      const entity = schema.parse(response.data);
+      dispatch(importEntities([entity], entityType));
+    } catch (e) {
+      // do nothing
+    }
+  };
+
+  useEffect(() => {
+    if (!entity || opts.refetch) {
+      fetchEntity();
+    }
+  }, []);
+
+  return {
+    entity,
+    fetchEntity,
+    isFetching,
+    isLoading,
+  };
+}
+
+function findEntity<TEntity extends Entity>(
+  state: RootState,
+  entityType: string,
+  lookupFn: LookupFn<TEntity>,
+) {
+  const cache = state.entities[entityType];
+
+  if (cache) {
+    return (Object.values(cache.store) as TEntity[]).find(lookupFn);
+  }
+}
+
+export default useEntityLookup;
\ No newline at end of file

From 4e822a80dd66fb4b616ce3d3a36d1cc32c5ca59f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 12 Apr 2023 15:51:30 -0500
Subject: [PATCH 125/298] Add useGroupLookup hook

---
 app/soapbox/entity-store/hooks/index.ts         |  1 +
 .../entity-store/hooks/useEntityLookup.ts       |  2 +-
 app/soapbox/hooks/api/groups/useGroupLookup.ts  | 17 +++++++++++++++++
 app/soapbox/schemas/group.ts                    |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/soapbox/hooks/api/groups/useGroupLookup.ts

diff --git a/app/soapbox/entity-store/hooks/index.ts b/app/soapbox/entity-store/hooks/index.ts
index d113c505a..b95d2d1af 100644
--- a/app/soapbox/entity-store/hooks/index.ts
+++ b/app/soapbox/entity-store/hooks/index.ts
@@ -1,6 +1,7 @@
 export { useEntities } from './useEntities';
 export { useEntity } from './useEntity';
 export { useEntityActions } from './useEntityActions';
+export { useEntityLookup } from './useEntityLookup';
 export { useCreateEntity } from './useCreateEntity';
 export { useDeleteEntity } from './useDeleteEntity';
 export { useDismissEntity } from './useDismissEntity';
diff --git a/app/soapbox/entity-store/hooks/useEntityLookup.ts b/app/soapbox/entity-store/hooks/useEntityLookup.ts
index ab0ea0b41..a49a659a4 100644
--- a/app/soapbox/entity-store/hooks/useEntityLookup.ts
+++ b/app/soapbox/entity-store/hooks/useEntityLookup.ts
@@ -63,4 +63,4 @@ function findEntity<TEntity extends Entity>(
   }
 }
 
-export default useEntityLookup;
\ No newline at end of file
+export { useEntityLookup };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/groups/useGroupLookup.ts b/app/soapbox/hooks/api/groups/useGroupLookup.ts
new file mode 100644
index 000000000..89c778a15
--- /dev/null
+++ b/app/soapbox/hooks/api/groups/useGroupLookup.ts
@@ -0,0 +1,17 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityLookup } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { groupSchema } from 'soapbox/schemas';
+
+function useGroupLookup(slug: string) {
+  const api = useApi();
+
+  return useEntityLookup(
+    Entities.GROUPS,
+    (group) => group.slug === slug,
+    () => api.get(`/api/v1/groups/lookup?name=${slug}`),
+    { schema: groupSchema },
+  );
+}
+
+export { useGroupLookup };
\ No newline at end of file
diff --git a/app/soapbox/schemas/group.ts b/app/soapbox/schemas/group.ts
index cd62f5860..827531ee7 100644
--- a/app/soapbox/schemas/group.ts
+++ b/app/soapbox/schemas/group.ts
@@ -28,6 +28,7 @@ const groupSchema = z.object({
   members_count: z.number().catch(0),
   note: z.string().transform(note => note === '<p></p>' ? '' : note).catch(''),
   relationship: groupRelationshipSchema.nullable().catch(null), // Dummy field to be overwritten later
+  slug: z.string().catch(''), // TruthSocial
   statuses_visibility: z.string().catch('public'),
   tags: z.array(groupTagSchema).catch([]),
   uri: z.string().catch(''),

From cd890c8641c3531d87f264e1089d6dacf71c8a02 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 12 Apr 2023 16:56:56 -0400
Subject: [PATCH 126/298] Handle error from API on Group Save

---
 app/soapbox/entity-store/hooks/useCreateEntity.ts | 11 ++++++++---
 app/soapbox/features/group/edit-group.tsx         | 12 +++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/entity-store/hooks/useCreateEntity.ts b/app/soapbox/entity-store/hooks/useCreateEntity.ts
index 6b4aaff73..24ce3af7d 100644
--- a/app/soapbox/entity-store/hooks/useCreateEntity.ts
+++ b/app/soapbox/entity-store/hooks/useCreateEntity.ts
@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import { z } from 'zod';
 
 import { useAppDispatch, useLoading } from 'soapbox/hooks';
@@ -23,7 +24,7 @@ function useCreateEntity<TEntity extends Entity = Entity, Data = unknown>(
   const [isSubmitting, setPromise] = useLoading();
   const { entityType, listKey } = parseEntitiesPath(expandedPath);
 
-  async function createEntity(data: Data, callbacks: EntityCallbacks<TEntity> = {}): Promise<void> {
+  async function createEntity(data: Data, callbacks: EntityCallbacks<TEntity, AxiosError> = {}): Promise<void> {
     try {
       const result = await setPromise(entityFn(data));
       const schema = opts.schema || z.custom<TEntity>();
@@ -36,8 +37,12 @@ function useCreateEntity<TEntity extends Entity = Entity, Data = unknown>(
         callbacks.onSuccess(entity);
       }
     } catch (error) {
-      if (callbacks.onError) {
-        callbacks.onError(error);
+      if (error instanceof AxiosError) {
+        if (callbacks.onError) {
+          callbacks.onError(error);
+        }
+      } else {
+        throw error;
       }
     }
   }
diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index 57f0adfef..7527a1802 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -62,10 +62,20 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
       avatar: avatar.file,
       header: header.file,
       tags,
+    }, {
+      onSuccess() {
+        toast.success(intl.formatMessage(messages.groupSaved));
+      },
+      onError(error) {
+        const message = (error.response?.data as any)?.error;
+
+        if (error.response?.status === 422 && typeof message !== 'undefined') {
+          toast.error(message);
+        }
+      },
     });
 
     setIsSubmitting(false);
-    toast.success(intl.formatMessage(messages.groupSaved));
   }
 
   const handleAddTag = () => {

From 5d29666b41707658f853f09945023773dce006a4 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 29 Mar 2023 13:21:28 -0400
Subject: [PATCH 127/298] Add support for trending tags

---
 app/soapbox/entity-store/entities.ts          |   5 +-
 .../components/discover/popular-tags.tsx      |  52 ++++++++
 .../components/discover/tag-list-item.tsx     |  39 ++++++
 app/soapbox/features/groups/discover.tsx      |   2 +
 app/soapbox/features/groups/tags.tsx          | 112 ++++++++++++++++++
 app/soapbox/features/ui/index.tsx             |   2 +
 .../features/ui/util/async-components.ts      |   4 +
 .../hooks/api/groups/useGroupsFromTag.ts      |  29 +++++
 .../hooks/api/groups/usePopularTags.ts        |  27 +++++
 app/soapbox/hooks/api/index.ts                |   2 +
 app/soapbox/schemas/group-tag.ts              |   7 +-
 app/soapbox/schemas/index.ts                  |   2 +
 12 files changed, 280 insertions(+), 3 deletions(-)
 create mode 100644 app/soapbox/features/groups/components/discover/popular-tags.tsx
 create mode 100644 app/soapbox/features/groups/components/discover/tag-list-item.tsx
 create mode 100644 app/soapbox/features/groups/tags.tsx
 create mode 100644 app/soapbox/hooks/api/groups/useGroupsFromTag.ts
 create mode 100644 app/soapbox/hooks/api/groups/usePopularTags.ts

diff --git a/app/soapbox/entity-store/entities.ts b/app/soapbox/entity-store/entities.ts
index 719cc7f1c..9878cbbf2 100644
--- a/app/soapbox/entity-store/entities.ts
+++ b/app/soapbox/entity-store/entities.ts
@@ -1,8 +1,9 @@
 export enum Entities {
   ACCOUNTS = 'Accounts',
   GROUPS = 'Groups',
-  GROUP_RELATIONSHIPS = 'GroupRelationships',
   GROUP_MEMBERSHIPS = 'GroupMemberships',
+  GROUP_RELATIONSHIPS = 'GroupRelationships',
+  GROUP_TAGS = 'GroupTags',
   RELATIONSHIPS = 'Relationships',
-  STATUSES = 'Statuses',
+  STATUSES = 'Statuses'
 }
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/popular-tags.tsx b/app/soapbox/features/groups/components/discover/popular-tags.tsx
new file mode 100644
index 000000000..3b0296191
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/popular-tags.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+import Link from 'soapbox/components/link';
+import { HStack, Stack, Text } from 'soapbox/components/ui';
+import { usePopularTags } from 'soapbox/hooks/api';
+
+import TagListItem from './tag-list-item';
+
+const PopularTags = () => {
+  const { tags, isFetched, isError } = usePopularTags();
+  const isEmpty = (isFetched && tags.length === 0) || isError;
+
+  return (
+    <Stack space={4}>
+      <HStack alignItems='center' justifyContent='between'>
+        <Text size='xl' weight='bold'>
+          <FormattedMessage
+            id='groups.discover.tags.title'
+            defaultMessage='Browse Topics'
+          />
+        </Text>
+
+        <Link to='/groups/tags'>
+          <Text tag='span' weight='medium' size='sm' theme='inherit'>
+            <FormattedMessage
+              id='groups.discover.tags.show_more'
+              defaultMessage='Show More'
+            />
+          </Text>
+        </Link>
+      </HStack>
+
+      {isEmpty ? (
+        <Text theme='muted'>
+          <FormattedMessage
+            id='groups.discover.tags.empty'
+            defaultMessage='Unable to fetch popular topics at this time. Please check back later.'
+          />
+        </Text>
+      ) : (
+        <Stack space={4}>
+          {tags.slice(0, 10).map((tag) => (
+            <TagListItem key={tag.id} tag={tag} />
+          ))}
+        </Stack>
+      )}
+    </Stack>
+  );
+};
+
+export default PopularTags;
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/tag-list-item.tsx b/app/soapbox/features/groups/components/discover/tag-list-item.tsx
new file mode 100644
index 000000000..c899e1085
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/tag-list-item.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
+
+import { Stack, Text } from 'soapbox/components/ui';
+
+import type { GroupTag } from 'soapbox/schemas';
+
+interface ITagListItem {
+  tag: GroupTag
+}
+
+const TagListItem = (props: ITagListItem) => {
+  const { tag } = props;
+
+  return (
+    <Link to={`/groups/discover/tags/${tag.id}`} className='group'>
+      <Stack>
+        <Text
+          weight='bold'
+          className='group-hover:text-primary-600 group-hover:underline dark:group-hover:text-accent-blue'
+        >
+          #{tag.name}
+        </Text>
+
+        <Text size='sm' theme='muted' weight='medium'>
+          <FormattedMessage
+            id='groups.discovery.tags.no_of_groups'
+            defaultMessage='Number of groups'
+          />
+          :{' '}
+          {tag.uses}
+        </Text>
+      </Stack>
+    </Link>
+  );
+};
+
+export default TagListItem;
\ No newline at end of file
diff --git a/app/soapbox/features/groups/discover.tsx b/app/soapbox/features/groups/discover.tsx
index 4e0c0c70a..6e26c0671 100644
--- a/app/soapbox/features/groups/discover.tsx
+++ b/app/soapbox/features/groups/discover.tsx
@@ -4,6 +4,7 @@ import { defineMessages, useIntl } from 'react-intl';
 import { HStack, Icon, IconButton, Input, Stack } from 'soapbox/components/ui';
 
 import PopularGroups from './components/discover/popular-groups';
+import PopularTags from './components/discover/popular-tags';
 import Search from './components/discover/search/search';
 import SuggestedGroups from './components/discover/suggested-groups';
 import TabBar, { TabItems } from './components/tab-bar';
@@ -71,6 +72,7 @@ const Discover: React.FC = () => {
           <>
             <PopularGroups />
             <SuggestedGroups />
+            <PopularTags />
           </>
         )}
       </Stack>
diff --git a/app/soapbox/features/groups/tags.tsx b/app/soapbox/features/groups/tags.tsx
new file mode 100644
index 000000000..052f5a6e3
--- /dev/null
+++ b/app/soapbox/features/groups/tags.tsx
@@ -0,0 +1,112 @@
+import clsx from 'clsx';
+import React, { useCallback, useState } from 'react';
+import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
+
+import { Column, HStack, Icon } from 'soapbox/components/ui';
+import { useGroupsFromTag } from 'soapbox/hooks/api';
+
+import GroupGridItem from './components/discover/group-grid-item';
+import GroupListItem from './components/discover/group-list-item';
+
+import type { Group } from 'soapbox/schemas';
+
+enum Layout {
+  LIST = 'LIST',
+  GRID = 'GRID'
+}
+
+const GridList: Components['List'] = React.forwardRef((props, ref) => {
+  const { context, ...rest } = props;
+  return <div ref={ref} {...rest} className='flex flex-wrap' />;
+});
+
+interface ITags {
+  params: { id: string }
+}
+
+const Tags: React.FC<ITags> = (props) => {
+  const tagId = props.params.id;
+
+  const [layout, setLayout] = useState<Layout>(Layout.LIST);
+
+  const { groups, hasNextPage, fetchNextPage } = useGroupsFromTag(tagId);
+
+  const handleLoadMore = () => {
+    if (hasNextPage) {
+      fetchNextPage();
+    }
+  };
+
+  const renderGroupList = useCallback((group: Group, index: number) => (
+    <div
+      className={
+        clsx({
+          'pt-4': index !== 0,
+        })
+      }
+    >
+      <GroupListItem group={group} withJoinAction />
+    </div>
+  ), []);
+
+  const renderGroupGrid = useCallback((group: Group, index: number) => (
+    <div className='pb-4'>
+      <GroupGridItem group={group} />
+    </div>
+  ), []);
+
+  return (
+    <Column
+      label={`#${tagId}`}
+      action={
+        <HStack alignItems='center'>
+          <button onClick={() => setLayout(Layout.LIST)}>
+            <Icon
+              src={require('@tabler/icons/layout-list.svg')}
+              className={
+                clsx('h-5 w-5 text-gray-600', {
+                  'text-primary-600': layout === Layout.LIST,
+                })
+              }
+            />
+          </button>
+
+          <button onClick={() => setLayout(Layout.GRID)}>
+            <Icon
+              src={require('@tabler/icons/layout-grid.svg')}
+              className={
+                clsx('h-5 w-5 text-gray-600', {
+                  'text-primary-600': layout === Layout.GRID,
+                })
+              }
+            />
+          </button>
+        </HStack>
+      }
+    >
+      {layout === Layout.LIST ? (
+        <Virtuoso
+          useWindowScroll
+          data={groups}
+          itemContent={(index, group) => renderGroupList(group, index)}
+          endReached={handleLoadMore}
+        />
+      ) : (
+        <VirtuosoGrid
+          useWindowScroll
+          data={groups}
+          itemContent={(index, group) => renderGroupGrid(group, index)}
+          components={{
+            Item: (props) => (
+              <div {...props} className='w-1/2 flex-none' />
+            ),
+            List: GridList,
+          }}
+          endReached={handleLoadMore}
+        />
+      )}
+    </Column>
+  );
+};
+
+export default Tags;
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index b58f266ec..15cdc8033 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -122,6 +122,7 @@ import {
   GroupsDiscover,
   GroupsPopular,
   GroupsSuggested,
+  GroupsTags,
   PendingGroupRequests,
   GroupMembers,
   GroupTimeline,
@@ -296,6 +297,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groupsDiscovery && <WrappedRoute path='/groups/discover' exact page={GroupsPage} component={GroupsDiscover} content={children} />}
       {features.groupsDiscovery && <WrappedRoute path='/groups/popular' exact page={GroupsPendingPage} component={GroupsPopular} content={children} />}
       {features.groupsDiscovery && <WrappedRoute path='/groups/suggested' exact page={GroupsPendingPage} component={GroupsSuggested} content={children} />}
+      {features.groupsDiscovery && <WrappedRoute path='/groups/discover/tags/:id' exact page={GroupsPendingPage} component={GroupsTags} content={children} />}
       {features.groupsPending && <WrappedRoute path='/groups/pending-requests' exact page={GroupsPendingPage} component={PendingGroupRequests} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id' exact page={GroupPage} component={GroupTimeline} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/members' exact page={GroupPage} component={GroupMembers} content={children} />}
diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts
index f915571d2..01e44ca0a 100644
--- a/app/soapbox/features/ui/util/async-components.ts
+++ b/app/soapbox/features/ui/util/async-components.ts
@@ -562,6 +562,10 @@ export function GroupsSuggested() {
   return import(/* webpackChunkName: "features/groups" */'../../groups/suggested');
 }
 
+export function GroupsTags() {
+  return import(/* webpackChunkName: "features/groups" */'../../groups/tags');
+}
+
 export function PendingGroupRequests() {
   return import(/* webpackChunkName: "features/groups" */'../../groups/pending-requests');
 }
diff --git a/app/soapbox/hooks/api/groups/useGroupsFromTag.ts b/app/soapbox/hooks/api/groups/useGroupsFromTag.ts
new file mode 100644
index 000000000..7ebf871f4
--- /dev/null
+++ b/app/soapbox/hooks/api/groups/useGroupsFromTag.ts
@@ -0,0 +1,29 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { groupSchema } from 'soapbox/schemas';
+
+import { useApi } from '../../useApi';
+import { useFeatures } from '../../useFeatures';
+
+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/mock/tags/${tagId}/groups`),
+    {
+      schema: groupSchema,
+      enabled: features.groupsDiscovery,
+    },
+  );
+
+  return {
+    ...result,
+    groups: entities,
+  };
+}
+
+export { useGroupsFromTag };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/groups/usePopularTags.ts b/app/soapbox/hooks/api/groups/usePopularTags.ts
new file mode 100644
index 000000000..d6fe5e0af
--- /dev/null
+++ b/app/soapbox/hooks/api/groups/usePopularTags.ts
@@ -0,0 +1,27 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { GroupTag, groupTagSchema } from 'soapbox/schemas';
+
+import { useApi } from '../../useApi';
+import { useFeatures } from '../../useFeatures';
+
+function usePopularTags() {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<GroupTag>(
+    [Entities.GROUP_TAGS],
+    () => api.get('/api/mock/groups/tags'),
+    {
+      schema: groupTagSchema,
+      enabled: features.groupsDiscovery,
+    },
+  );
+
+  return {
+    ...result,
+    tags: entities,
+  };
+}
+
+export { usePopularTags };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index b5927bf6b..f28c6a5a5 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -16,8 +16,10 @@ export { useGroup, useGroups } from './groups/useGroups';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
 export { useGroupSearch } from './groups/useGroupSearch';
 export { useGroupValidation } from './groups/useGroupValidation';
+export { useGroupsFromTag } from './groups/useGroupsFromTag';
 export { useJoinGroup } from './groups/useJoinGroup';
 export { useLeaveGroup } from './groups/useLeaveGroup';
+export { usePopularTags } from './groups/usePopularTags';
 export { usePromoteGroupMember } from './groups/usePromoteGroupMember';
 export { useUpdateGroup } from './groups/useUpdateGroup';
 
diff --git a/app/soapbox/schemas/group-tag.ts b/app/soapbox/schemas/group-tag.ts
index cc64deec6..4bd1ee66c 100644
--- a/app/soapbox/schemas/group-tag.ts
+++ b/app/soapbox/schemas/group-tag.ts
@@ -1,7 +1,12 @@
-import { z } from 'zod';
+import z from 'zod';
 
 const groupTagSchema = z.object({
+  id: z.string(),
+  uses: z.number(),
   name: z.string(),
+  url: z.string(),
+  pinned: z.boolean().catch(false),
+  visible: z.boolean().default(true),
 });
 
 type GroupTag = z.infer<typeof groupTagSchema>;
diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index 1eed8905b..a675b52d2 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -6,6 +6,7 @@ export { customEmojiSchema  } from './custom-emoji';
 export { groupSchema } from './group';
 export { groupMemberSchema } from './group-member';
 export { groupRelationshipSchema } from './group-relationship';
+export { groupTagSchema } from './group-tag';
 export { relationshipSchema } from './relationship';
 
 /**
@@ -16,4 +17,5 @@ export type { CustomEmoji } from './custom-emoji';
 export type { Group } from './group';
 export type { GroupMember } from './group-member';
 export type { GroupRelationship } from './group-relationship';
+export type { GroupTag } from './group-tag';
 export type { Relationship } from './relationship';

From 8702c169988461a62a3673845fa14e2f902c2729 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 13 Apr 2023 07:34:37 -0400
Subject: [PATCH 128/298] Update GroupTag schema

---
 app/soapbox/schemas/group-tag.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/schemas/group-tag.ts b/app/soapbox/schemas/group-tag.ts
index 4bd1ee66c..9fa885569 100644
--- a/app/soapbox/schemas/group-tag.ts
+++ b/app/soapbox/schemas/group-tag.ts
@@ -2,11 +2,11 @@ import z from 'zod';
 
 const groupTagSchema = z.object({
   id: z.string(),
-  uses: z.number(),
   name: z.string(),
-  url: z.string(),
-  pinned: z.boolean().catch(false),
-  visible: z.boolean().default(true),
+  uses: z.number().optional(),
+  url: z.string().optional(),
+  pinned: z.boolean().optional().catch(false),
+  visible: z.boolean().optional().default(true),
 });
 
 type GroupTag = z.infer<typeof groupTagSchema>;

From bb70c1ea3c6b36d100e442149a2853fc35112a64 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 13 Apr 2023 09:28:40 -0400
Subject: [PATCH 129/298] Add topic pages

---
 app/soapbox/features/groups/tag.tsx           | 117 ++++++++++++++++++
 app/soapbox/features/groups/tags.tsx          | 104 ++++------------
 app/soapbox/features/ui/index.tsx             |   4 +-
 .../features/ui/util/async-components.ts      |   4 +
 app/soapbox/hooks/api/groups/useGroupTag.ts   |  21 ++++
 .../hooks/api/groups/useGroupsFromTag.ts      |  12 +-
 .../hooks/api/groups/usePopularTags.ts        |   2 +-
 app/soapbox/hooks/api/index.ts                |   1 +
 app/soapbox/locales/en.json                   |   5 +
 9 files changed, 189 insertions(+), 81 deletions(-)
 create mode 100644 app/soapbox/features/groups/tag.tsx
 create mode 100644 app/soapbox/hooks/api/groups/useGroupTag.ts

diff --git a/app/soapbox/features/groups/tag.tsx b/app/soapbox/features/groups/tag.tsx
new file mode 100644
index 000000000..4774a4700
--- /dev/null
+++ b/app/soapbox/features/groups/tag.tsx
@@ -0,0 +1,117 @@
+import clsx from 'clsx';
+import React, { useCallback, useState } from 'react';
+import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
+
+import { Column, HStack, Icon } from 'soapbox/components/ui';
+import { useGroupTag, useGroupsFromTag } from 'soapbox/hooks/api';
+
+import GroupGridItem from './components/discover/group-grid-item';
+import GroupListItem from './components/discover/group-list-item';
+
+import type { Group } from 'soapbox/schemas';
+
+enum Layout {
+  LIST = 'LIST',
+  GRID = 'GRID'
+}
+
+const GridList: Components['List'] = React.forwardRef((props, ref) => {
+  const { context, ...rest } = props;
+  return <div ref={ref} {...rest} className='flex flex-wrap' />;
+});
+
+interface ITag {
+  params: { id: string }
+}
+
+const Tag: React.FC<ITag> = (props) => {
+  const tagId = props.params.id;
+
+  const [layout, setLayout] = useState<Layout>(Layout.LIST);
+
+  const { tag, isLoading } = useGroupTag(tagId);
+  const { groups, hasNextPage, fetchNextPage } = useGroupsFromTag(tagId);
+
+  const handleLoadMore = () => {
+    if (hasNextPage) {
+      fetchNextPage();
+    }
+  };
+
+  const renderGroupList = useCallback((group: Group, index: number) => (
+    <div
+      className={
+        clsx({
+          'pt-4': index !== 0,
+        })
+      }
+    >
+      <GroupListItem group={group} withJoinAction />
+    </div>
+  ), []);
+
+  const renderGroupGrid = useCallback((group: Group, index: number) => (
+    <div className='pb-4'>
+      <GroupGridItem group={group} />
+    </div>
+  ), []);
+
+  if (isLoading || !tag) {
+    return null;
+  }
+
+  return (
+    <Column
+      label={`#${tag.name}`}
+      action={
+        <HStack alignItems='center'>
+          <button onClick={() => setLayout(Layout.LIST)}>
+            <Icon
+              src={require('@tabler/icons/layout-list.svg')}
+              className={
+                clsx('h-5 w-5 text-gray-600', {
+                  'text-primary-600': layout === Layout.LIST,
+                })
+              }
+            />
+          </button>
+
+          <button onClick={() => setLayout(Layout.GRID)}>
+            <Icon
+              src={require('@tabler/icons/layout-grid.svg')}
+              className={
+                clsx('h-5 w-5 text-gray-600', {
+                  'text-primary-600': layout === Layout.GRID,
+                })
+              }
+            />
+          </button>
+        </HStack>
+      }
+    >
+      {layout === Layout.LIST ? (
+        <Virtuoso
+          useWindowScroll
+          data={groups}
+          itemContent={(index, group) => renderGroupList(group, index)}
+          endReached={handleLoadMore}
+        />
+      ) : (
+        <VirtuosoGrid
+          useWindowScroll
+          data={groups}
+          itemContent={(index, group) => renderGroupGrid(group, index)}
+          components={{
+            Item: (props) => (
+              <div {...props} className='w-1/2 flex-none' />
+            ),
+            List: GridList,
+          }}
+          endReached={handleLoadMore}
+        />
+      )}
+    </Column>
+  );
+};
+
+export default Tag;
diff --git a/app/soapbox/features/groups/tags.tsx b/app/soapbox/features/groups/tags.tsx
index 052f5a6e3..1484665e4 100644
--- a/app/soapbox/features/groups/tags.tsx
+++ b/app/soapbox/features/groups/tags.tsx
@@ -1,35 +1,24 @@
 import clsx from 'clsx';
-import React, { useCallback, useState } from 'react';
-import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
+import React from 'react';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+import { Virtuoso } from 'react-virtuoso';
 
-import { Column, HStack, Icon } from 'soapbox/components/ui';
-import { useGroupsFromTag } from 'soapbox/hooks/api';
+import { Column, Text } from 'soapbox/components/ui';
+import { usePopularTags } from 'soapbox/hooks/api';
 
-import GroupGridItem from './components/discover/group-grid-item';
-import GroupListItem from './components/discover/group-list-item';
+import TagListItem from './components/discover/tag-list-item';
 
-import type { Group } from 'soapbox/schemas';
+import type { GroupTag } from 'soapbox/schemas';
 
-enum Layout {
-  LIST = 'LIST',
-  GRID = 'GRID'
-}
-
-const GridList: Components['List'] = React.forwardRef((props, ref) => {
-  const { context, ...rest } = props;
-  return <div ref={ref} {...rest} className='flex flex-wrap' />;
+const messages = defineMessages({
+  title: { id: 'groups.tags.title', defaultMessage: 'Browse Topics' },
 });
 
-interface ITags {
-  params: { id: string }
-}
+const Tags: React.FC = () => {
+  const intl = useIntl();
 
-const Tags: React.FC<ITags> = (props) => {
-  const tagId = props.params.id;
-
-  const [layout, setLayout] = useState<Layout>(Layout.LIST);
-
-  const { groups, hasNextPage, fetchNextPage } = useGroupsFromTag(tagId);
+  const { tags, isFetched, isError, hasNextPage, fetchNextPage } = usePopularTags();
+  const isEmpty = (isFetched && tags.length === 0) || isError;
 
   const handleLoadMore = () => {
     if (hasNextPage) {
@@ -37,7 +26,7 @@ const Tags: React.FC<ITags> = (props) => {
     }
   };
 
-  const renderGroupList = useCallback((group: Group, index: number) => (
+  const renderItem = (index: number, tag: GroupTag) => (
     <div
       className={
         clsx({
@@ -45,63 +34,24 @@ const Tags: React.FC<ITags> = (props) => {
         })
       }
     >
-      <GroupListItem group={group} withJoinAction />
+      <TagListItem key={tag.id} tag={tag} />
     </div>
-  ), []);
-
-  const renderGroupGrid = useCallback((group: Group, index: number) => (
-    <div className='pb-4'>
-      <GroupGridItem group={group} />
-    </div>
-  ), []);
+  );
 
   return (
-    <Column
-      label={`#${tagId}`}
-      action={
-        <HStack alignItems='center'>
-          <button onClick={() => setLayout(Layout.LIST)}>
-            <Icon
-              src={require('@tabler/icons/layout-list.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.LIST,
-                })
-              }
-            />
-          </button>
-
-          <button onClick={() => setLayout(Layout.GRID)}>
-            <Icon
-              src={require('@tabler/icons/layout-grid.svg')}
-              className={
-                clsx('h-5 w-5 text-gray-600', {
-                  'text-primary-600': layout === Layout.GRID,
-                })
-              }
-            />
-          </button>
-        </HStack>
-      }
-    >
-      {layout === Layout.LIST ? (
+    <Column label={intl.formatMessage(messages.title)}>
+      {isEmpty ? (
+        <Text theme='muted'>
+          <FormattedMessage
+            id='groups.discover.tags.empty'
+            defaultMessage='Unable to fetch popular topics at this time. Please check back later.'
+          />
+        </Text>
+      ) : (
         <Virtuoso
           useWindowScroll
-          data={groups}
-          itemContent={(index, group) => renderGroupList(group, index)}
-          endReached={handleLoadMore}
-        />
-      ) : (
-        <VirtuosoGrid
-          useWindowScroll
-          data={groups}
-          itemContent={(index, group) => renderGroupGrid(group, index)}
-          components={{
-            Item: (props) => (
-              <div {...props} className='w-1/2 flex-none' />
-            ),
-            List: GridList,
-          }}
+          data={tags}
+          itemContent={renderItem}
           endReached={handleLoadMore}
         />
       )}
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 15cdc8033..b967f27de 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -122,6 +122,7 @@ import {
   GroupsDiscover,
   GroupsPopular,
   GroupsSuggested,
+  GroupsTag,
   GroupsTags,
   PendingGroupRequests,
   GroupMembers,
@@ -297,7 +298,8 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groupsDiscovery && <WrappedRoute path='/groups/discover' exact page={GroupsPage} component={GroupsDiscover} content={children} />}
       {features.groupsDiscovery && <WrappedRoute path='/groups/popular' exact page={GroupsPendingPage} component={GroupsPopular} content={children} />}
       {features.groupsDiscovery && <WrappedRoute path='/groups/suggested' exact page={GroupsPendingPage} component={GroupsSuggested} content={children} />}
-      {features.groupsDiscovery && <WrappedRoute path='/groups/discover/tags/:id' exact page={GroupsPendingPage} component={GroupsTags} content={children} />}
+      {features.groupsDiscovery && <WrappedRoute path='/groups/tags' exact page={GroupsPendingPage} component={GroupsTags} content={children} />}
+      {features.groupsDiscovery && <WrappedRoute path='/groups/discover/tags/:id' exact page={GroupsPendingPage} component={GroupsTag} content={children} />}
       {features.groupsPending && <WrappedRoute path='/groups/pending-requests' exact page={GroupsPendingPage} component={PendingGroupRequests} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id' exact page={GroupPage} component={GroupTimeline} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/members' exact page={GroupPage} component={GroupMembers} content={children} />}
diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts
index 01e44ca0a..654cab76d 100644
--- a/app/soapbox/features/ui/util/async-components.ts
+++ b/app/soapbox/features/ui/util/async-components.ts
@@ -562,6 +562,10 @@ export function GroupsSuggested() {
   return import(/* webpackChunkName: "features/groups" */'../../groups/suggested');
 }
 
+export function GroupsTag() {
+  return import(/* webpackChunkName: "features/groups" */'../../groups/tag');
+}
+
 export function GroupsTags() {
   return import(/* webpackChunkName: "features/groups" */'../../groups/tags');
 }
diff --git a/app/soapbox/hooks/api/groups/useGroupTag.ts b/app/soapbox/hooks/api/groups/useGroupTag.ts
new file mode 100644
index 000000000..d0e63d74d
--- /dev/null
+++ b/app/soapbox/hooks/api/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 };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/groups/useGroupsFromTag.ts b/app/soapbox/hooks/api/groups/useGroupsFromTag.ts
index 7ebf871f4..a6b8540dc 100644
--- a/app/soapbox/hooks/api/groups/useGroupsFromTag.ts
+++ b/app/soapbox/hooks/api/groups/useGroupsFromTag.ts
@@ -5,6 +5,8 @@ import { groupSchema } from 'soapbox/schemas';
 import { useApi } from '../../useApi';
 import { useFeatures } from '../../useFeatures';
 
+import { useGroupRelationships } from './useGroups';
+
 import type { Group } from 'soapbox/schemas';
 
 function useGroupsFromTag(tagId: string) {
@@ -13,16 +15,22 @@ function useGroupsFromTag(tagId: string) {
 
   const { entities, ...result } = useEntities<Group>(
     [Entities.GROUPS, 'tags', tagId],
-    () => api.get(`/api/mock/tags/${tagId}/groups`),
+    () => api.get(`/api/v1/tags/${tagId}/groups`),
     {
       schema: groupSchema,
       enabled: features.groupsDiscovery,
     },
   );
+  const { relationships } = useGroupRelationships(entities.map(entity => entity.id));
+
+  const groups = entities.map((group) => ({
+    ...group,
+    relationship: relationships[group.id] || null,
+  }));
 
   return {
     ...result,
-    groups: entities,
+    groups,
   };
 }
 
diff --git a/app/soapbox/hooks/api/groups/usePopularTags.ts b/app/soapbox/hooks/api/groups/usePopularTags.ts
index d6fe5e0af..0bd272a2d 100644
--- a/app/soapbox/hooks/api/groups/usePopularTags.ts
+++ b/app/soapbox/hooks/api/groups/usePopularTags.ts
@@ -11,7 +11,7 @@ function usePopularTags() {
 
   const { entities, ...result } = useEntities<GroupTag>(
     [Entities.GROUP_TAGS],
-    () => api.get('/api/mock/groups/tags'),
+    () => api.get('/api/v1/groups/tags'),
     {
       schema: groupTagSchema,
       enabled: features.groupsDiscovery,
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index f28c6a5a5..800ea5857 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -15,6 +15,7 @@ export { useGroupMedia } from './groups/useGroupMedia';
 export { useGroup, useGroups } from './groups/useGroups';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
 export { useGroupSearch } from './groups/useGroupSearch';
+export { useGroupTag } from './groups/useGroupTag';
 export { useGroupValidation } from './groups/useGroupValidation';
 export { useGroupsFromTag } from './groups/useGroupsFromTag';
 export { useJoinGroup } from './groups/useJoinGroup';
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 89608c4d5..2d0c10823 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -830,6 +830,10 @@
   "groups.discover.suggested.empty": "Unable to fetch suggested groups at this time. Please check back later.",
   "groups.discover.suggested.show_more": "Show More",
   "groups.discover.suggested.title": "Suggested For You",
+  "groups.discover.tags.empty": "Unable to fetch popular topics at this time. Please check back later.",
+  "groups.discover.tags.show_more": "Show More",
+  "groups.discover.tags.title": "Browse Topics",
+  "groups.discovery.tags.no_of_groups": "Number of groups",
   "groups.empty.subtitle": "Start discovering groups to join or create your own.",
   "groups.empty.title": "No Groups yet",
   "groups.pending.count": "{number, plural, one {# pending request} other {# pending requests}}",
@@ -838,6 +842,7 @@
   "groups.pending.label": "Pending Requests",
   "groups.popular.label": "Suggested Groups",
   "groups.search.placeholder": "Search My Groups",
+  "groups.tags.title": "Browse Topics",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",

From 4cd43c340b62882f931815196a62585cf735c988 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 13 Apr 2023 10:43:24 -0500
Subject: [PATCH 130/298] Fix group types :(

---
 app/soapbox/normalizers/group.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/normalizers/group.ts b/app/soapbox/normalizers/group.ts
index 44b2a48d2..127bca29f 100644
--- a/app/soapbox/normalizers/group.ts
+++ b/app/soapbox/normalizers/group.ts
@@ -33,6 +33,7 @@ export const GroupRecord = ImmutableRecord({
   members_count: 0,
   note: '',
   statuses_visibility: 'public',
+  slug: '',
   tags: [],
   uri: '',
   url: '',

From 4cb628d5a491d113afa44d7c1fc948fe9a9db480 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 14 Apr 2023 08:06:53 -0400
Subject: [PATCH 131/298] Allow reposting Group posts

---
 app/soapbox/components/status-action-bar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx
index 5fa3e6c3b..585cc32d9 100644
--- a/app/soapbox/components/status-action-bar.tsx
+++ b/app/soapbox/components/status-action-bar.tsx
@@ -536,7 +536,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
     return menu;
   };
 
-  const publicStatus = ['public', 'unlisted'].includes(status.visibility);
+  const publicStatus = ['public', 'unlisted', 'group'].includes(status.visibility);
 
   const replyCount = status.replies_count;
   const reblogCount = status.reblogs_count;

From 8d832856b159ea0b2d31198069080b98110fb33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 16 Apr 2023 00:03:06 +0200
Subject: [PATCH 132/298] Only use 'username or e-mail' if can log in with
 username
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../auth-login/components/login-form.tsx      | 23 +++++++++++++------
 .../auth-login/components/password-reset.tsx  |  8 ++++---
 .../public-layout/components/header.tsx       |  8 ++++---
 app/soapbox/features/ui/components/navbar.tsx |  8 ++++---
 app/soapbox/utils/features.ts                 |  5 ++++
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/soapbox/features/auth-login/components/login-form.tsx b/app/soapbox/features/auth-login/components/login-form.tsx
index a91998671..f526548d8 100644
--- a/app/soapbox/features/auth-login/components/login-form.tsx
+++ b/app/soapbox/features/auth-login/components/login-form.tsx
@@ -5,11 +5,16 @@ import { Link } from 'react-router-dom';
 import { Button, Form, FormActions, FormGroup, Input, Stack } from 'soapbox/components/ui';
 
 import ConsumersList from './consumers-list';
+import { useFeatures } from 'soapbox/hooks';
 
 const messages = defineMessages({
   username: {
     id: 'login.fields.username_label',
-    defaultMessage: 'Email or username',
+    defaultMessage: 'E-mail or username',
+  },
+  email: {
+    id: 'login.fields.email_label',
+    defaultMessage: 'E-mail address',
   },
   password: {
     id: 'login.fields.password_placeholder',
@@ -24,6 +29,10 @@ interface ILoginForm {
 
 const LoginForm: React.FC<ILoginForm> = ({ isLoading, handleSubmit }) => {
   const intl = useIntl();
+  const features = useFeatures();
+
+  const usernameLabel = intl.formatMessage(features.logInWithUsername ? messages.username : messages.email);
+  const passwordLabel = intl.formatMessage(messages.password);
 
   return (
     <div>
@@ -33,10 +42,10 @@ const LoginForm: React.FC<ILoginForm> = ({ isLoading, handleSubmit }) => {
 
       <Stack className='mx-auto sm:w-2/3 sm:pt-10 md:w-1/2' space={5}>
         <Form onSubmit={handleSubmit}>
-          <FormGroup labelText={intl.formatMessage(messages.username)}>
+          <FormGroup labelText={usernameLabel}>
             <Input
-              aria-label={intl.formatMessage(messages.username)}
-              placeholder={intl.formatMessage(messages.username)}
+              aria-label={usernameLabel}
+              placeholder={usernameLabel}
               type='text'
               name='username'
               autoCorrect='off'
@@ -46,7 +55,7 @@ const LoginForm: React.FC<ILoginForm> = ({ isLoading, handleSubmit }) => {
           </FormGroup>
 
           <FormGroup
-            labelText={intl.formatMessage(messages.password)}
+            labelText={passwordLabel}
             hintText={
               <Link to='/reset-password' className='hover:underline'>
                 <FormattedMessage
@@ -57,8 +66,8 @@ const LoginForm: React.FC<ILoginForm> = ({ isLoading, handleSubmit }) => {
             }
           >
             <Input
-              aria-label={intl.formatMessage(messages.password)}
-              placeholder={intl.formatMessage(messages.password)}
+              aria-label={passwordLabel}
+              placeholder={passwordLabel}
               type='password'
               name='password'
               autoComplete='off'
diff --git a/app/soapbox/features/auth-login/components/password-reset.tsx b/app/soapbox/features/auth-login/components/password-reset.tsx
index 85cedb03d..6cc9109d3 100644
--- a/app/soapbox/features/auth-login/components/password-reset.tsx
+++ b/app/soapbox/features/auth-login/components/password-reset.tsx
@@ -4,17 +4,19 @@ import { Redirect } from 'react-router-dom';
 
 import { resetPassword } from 'soapbox/actions/security';
 import { Button, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui';
-import { useAppDispatch } from 'soapbox/hooks';
+import { useAppDispatch, useFeatures } from 'soapbox/hooks';
 import toast from 'soapbox/toast';
 
 const messages = defineMessages({
-  nicknameOrEmail: { id: 'password_reset.fields.username_placeholder', defaultMessage: 'Email or username' },
+  nicknameOrEmail: { id: 'password_reset.fields.username_placeholder', defaultMessage: 'E-mail or username' },
+  email: { id: 'password_reset.fields.email_placeholder', defaultMessage: 'E-mail address' },
   confirmation: { id: 'password_reset.confirmation', defaultMessage: 'Check your email for confirmation.' },
 });
 
 const PasswordReset = () => {
   const dispatch = useAppDispatch();
   const intl = useIntl();
+  const features = useFeatures();
 
   const [isLoading, setIsLoading] = useState(false);
   const [success, setSuccess] = useState(false);
@@ -43,7 +45,7 @@ const PasswordReset = () => {
 
       <div className='mx-auto sm:w-2/3 sm:pt-10 md:w-1/2'>
         <Form onSubmit={handleSubmit}>
-          <FormGroup labelText={intl.formatMessage(messages.nicknameOrEmail)}>
+          <FormGroup labelText={intl.formatMessage(features.logInWithUsername ? messages.nicknameOrEmail : messages.email)}>
             <Input
               type='text'
               name='nickname_or_email'
diff --git a/app/soapbox/features/public-layout/components/header.tsx b/app/soapbox/features/public-layout/components/header.tsx
index caa5a3fa3..11853871a 100644
--- a/app/soapbox/features/public-layout/components/header.tsx
+++ b/app/soapbox/features/public-layout/components/header.tsx
@@ -7,7 +7,7 @@ import { fetchInstance } from 'soapbox/actions/instance';
 import { openModal } from 'soapbox/actions/modals';
 import SiteLogo from 'soapbox/components/site-logo';
 import { Button, Form, HStack, IconButton, Input, Tooltip } from 'soapbox/components/ui';
-import { useSoapboxConfig, useOwnAccount, useAppDispatch, useRegistrationStatus } from 'soapbox/hooks';
+import { useSoapboxConfig, useOwnAccount, useAppDispatch, useRegistrationStatus, useFeatures } from 'soapbox/hooks';
 
 import Sonar from './sonar';
 
@@ -18,7 +18,8 @@ const messages = defineMessages({
   home: { id: 'header.home.label', defaultMessage: 'Home' },
   login: { id: 'header.login.label', defaultMessage: 'Log in' },
   register: { id: 'header.register.label', defaultMessage: 'Register' },
-  username: { id: 'header.login.username.placeholder', defaultMessage: 'Email or username' },
+  username: { id: 'header.login.username.placeholder', defaultMessage: 'E-mail or username' },
+  email: { id: 'header.login.email.placeholder', defaultMessage: 'E-mail address' },
   password: { id: 'header.login.password.label', defaultMessage: 'Password' },
   forgotPassword: { id: 'header.login.forgot_password', defaultMessage: 'Forgot password?' },
 });
@@ -26,6 +27,7 @@ const messages = defineMessages({
 const Header = () => {
   const dispatch = useAppDispatch();
   const intl = useIntl();
+  const features = useFeatures();
 
   const account = useOwnAccount();
   const soapboxConfig = useSoapboxConfig();
@@ -123,7 +125,7 @@ const Header = () => {
                 value={username}
                 onChange={(event) => setUsername(event.target.value.trim())}
                 type='text'
-                placeholder={intl.formatMessage(messages.username)}
+                placeholder={intl.formatMessage(features.logInWithUsername ? messages.username : messages.email)}
                 className='max-w-[200px]'
                 autoCorrect='off'
                 autoCapitalize='off'
diff --git a/app/soapbox/features/ui/components/navbar.tsx b/app/soapbox/features/ui/components/navbar.tsx
index 6cfb28728..422d22561 100644
--- a/app/soapbox/features/ui/components/navbar.tsx
+++ b/app/soapbox/features/ui/components/navbar.tsx
@@ -9,7 +9,7 @@ import { openSidebar } from 'soapbox/actions/sidebar';
 import SiteLogo from 'soapbox/components/site-logo';
 import { Avatar, Button, Form, HStack, IconButton, Input, Tooltip } from 'soapbox/components/ui';
 import Search from 'soapbox/features/compose/components/search';
-import { useAppDispatch, useOwnAccount, useRegistrationStatus } from 'soapbox/hooks';
+import { useAppDispatch, useFeatures, useOwnAccount, useRegistrationStatus } from 'soapbox/hooks';
 
 import ProfileDropdown from './profile-dropdown';
 
@@ -17,7 +17,8 @@ import type { AxiosError } from 'axios';
 
 const messages = defineMessages({
   login: { id: 'navbar.login.action', defaultMessage: 'Log in' },
-  username: { id: 'navbar.login.username.placeholder', defaultMessage: 'Email or username' },
+  username: { id: 'navbar.login.username.placeholder', defaultMessage: 'E-mail or username' },
+  email: { id: 'navbar.login.email.placeholder', defaultMessage: 'E-mail address' },
   password: { id: 'navbar.login.password.label', defaultMessage: 'Password' },
   forgotPassword: { id: 'navbar.login.forgot_password', defaultMessage: 'Forgot password?' },
 });
@@ -25,6 +26,7 @@ const messages = defineMessages({
 const Navbar = () => {
   const dispatch = useAppDispatch();
   const intl = useIntl();
+  const features = useFeatures();
   const { isOpen } = useRegistrationStatus();
   const account = useOwnAccount();
   const node = useRef(null);
@@ -111,7 +113,7 @@ const Navbar = () => {
                     value={username}
                     onChange={(event) => setUsername(event.target.value)}
                     type='text'
-                    placeholder={intl.formatMessage(messages.username)}
+                    placeholder={intl.formatMessage(features.logInWithUsername ? messages.username : messages.email)}
                     className='max-w-[200px]'
                   />
 
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index afbece3b4..9aff34a90 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -597,6 +597,11 @@ const getInstanceFeatures = (instance: Instance) => {
       v.software === PLEROMA && gte(v.version, '0.9.9'),
     ]),
 
+    /**
+     * Can sign in using username instead of e-mail address.
+     */
+    logInWithUsername: v.software === PLEROMA,
+
     /**
      * Can perform moderation actions with account and reports.
      * @see {@link https://docs.joinmastodon.org/methods/admin/}

From ba69f5ba624873c85ba2e63de211626885b5134e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 16 Apr 2023 00:06:47 +0200
Subject: [PATCH 133/298] update en.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/locales/en.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 89608c4d5..a4d547d8e 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -842,6 +842,7 @@
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.home.label": "Home",
+  "header.login.email.placeholder": "E-mail address",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
   "header.login.password.label": "Password",
@@ -926,6 +927,7 @@
   "lists.subheading": "Your lists",
   "loading_indicator.label": "Loading…",
   "location_search.placeholder": "Find an address",
+  "login.fields.email_label": "E-mail address",
   "login.fields.instance_label": "Instance",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
@@ -1014,6 +1016,7 @@
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navbar.login.action": "Log in",
+  "navbar.login.email.placeholder": "E-mail address",
   "navbar.login.forgot_password": "Forgot password?",
   "navbar.login.password.label": "Password",
   "navbar.login.username.placeholder": "Email or username",
@@ -1116,6 +1119,7 @@
   "onboarding.suggestions.title": "Suggested accounts",
   "onboarding.view_feed": "View Feed",
   "password_reset.confirmation": "Check your email for confirmation.",
+  "password_reset.fields.email_placeholder": "E-mail address",
   "password_reset.fields.username_placeholder": "Email or username",
   "password_reset.header": "Reset Password",
   "password_reset.reset": "Reset password",

From 324c427a725c504ab7120784985c49b5f691b9cb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 16 Apr 2023 06:12:01 +0000
Subject: [PATCH 134/298] Add truthsocial to loginWithUsername feature

---
 app/soapbox/utils/features.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 9aff34a90..36e2811ab 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -600,7 +600,7 @@ const getInstanceFeatures = (instance: Instance) => {
     /**
      * Can sign in using username instead of e-mail address.
      */
-    logInWithUsername: v.software === PLEROMA,
+    logInWithUsername: v.software === PLEROMA || v.software === TRUTHSOCIAL,
 
     /**
      * Can perform moderation actions with account and reports.

From 6b4076ce10786b7c2650f7cc3cf2a971a37d4f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 16 Apr 2023 15:10:41 +0200
Subject: [PATCH 135/298] lint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/features/auth-login/components/login-form.tsx | 2 +-
 app/soapbox/utils/features.ts                             | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/auth-login/components/login-form.tsx b/app/soapbox/features/auth-login/components/login-form.tsx
index f526548d8..9a4768903 100644
--- a/app/soapbox/features/auth-login/components/login-form.tsx
+++ b/app/soapbox/features/auth-login/components/login-form.tsx
@@ -3,9 +3,9 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
 import { Button, Form, FormActions, FormGroup, Input, Stack } from 'soapbox/components/ui';
+import { useFeatures } from 'soapbox/hooks';
 
 import ConsumersList from './consumers-list';
-import { useFeatures } from 'soapbox/hooks';
 
 const messages = defineMessages({
   username: {
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 36e2811ab..b24e75525 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -600,7 +600,10 @@ const getInstanceFeatures = (instance: Instance) => {
     /**
      * Can sign in using username instead of e-mail address.
      */
-    logInWithUsername: v.software === PLEROMA || v.software === TRUTHSOCIAL,
+    logInWithUsername: any([
+      v.software === PLEROMA,
+      v.software === TRUTHSOCIAL,
+    ]),
 
     /**
      * Can perform moderation actions with account and reports.

From 6da45c3ef7bef11c93e091ba45891f0783cc03e0 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 23 Mar 2023 08:43:41 -0400
Subject: [PATCH 136/298] Add ability to search my Groups

---
 app/soapbox/features/group/manage-group.tsx       | 3 +--
 app/soapbox/hooks/__tests__/useGroupsPath.test.ts | 2 +-
 app/soapbox/hooks/api/index.ts                    | 2 +-
 app/soapbox/hooks/index.ts                        | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 12dc0b11b..e8bed3f30 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -5,9 +5,8 @@ import { useHistory } from 'react-router-dom';
 import { openModal } from 'soapbox/actions/modals';
 import List, { ListItem } from 'soapbox/components/list';
 import { CardBody, CardHeader, CardTitle, Column, Spinner, Text } from 'soapbox/components/ui';
-import { useAppDispatch, useGroupsPath } from 'soapbox/hooks';
+import { useAppDispatch, useBackend, useGroupsPath } from 'soapbox/hooks';
 import { useDeleteGroup, useGroup } from 'soapbox/hooks/api';
-import { useBackend } from 'soapbox/hooks/useBackend';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 import { TRUTHSOCIAL } from 'soapbox/utils/features';
diff --git a/app/soapbox/hooks/__tests__/useGroupsPath.test.ts b/app/soapbox/hooks/__tests__/useGroupsPath.test.ts
index 7596acd9a..d102fe412 100644
--- a/app/soapbox/hooks/__tests__/useGroupsPath.test.ts
+++ b/app/soapbox/hooks/__tests__/useGroupsPath.test.ts
@@ -53,7 +53,7 @@ describe('useGroupsPath()', () => {
     describe('when the user has groups', () => {
       beforeEach(() => {
         __stub((mock) => {
-          mock.onGet('/api/v1/groups').reply(200, [
+          mock.onGet('/api/v1/groups?q=').reply(200, [
             buildGroup({
               display_name: 'Group',
               id: '1',
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index 800ea5857..3ab7be9a5 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -11,8 +11,8 @@ export { useCancelMembershipRequest } from './groups/useCancelMembershipRequest'
 export { useCreateGroup, type CreateGroupParams } from './groups/useCreateGroup';
 export { useDeleteGroup } from './groups/useDeleteGroup';
 export { useDemoteGroupMember } from './groups/useDemoteGroupMember';
-export { useGroupMedia } from './groups/useGroupMedia';
 export { useGroup, useGroups } from './groups/useGroups';
+export { useGroupMedia } from './groups/useGroupMedia';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
 export { useGroupSearch } from './groups/useGroupSearch';
 export { useGroupTag } from './groups/useGroupTag';
diff --git a/app/soapbox/hooks/index.ts b/app/soapbox/hooks/index.ts
index ef8b6462f..6f52e0c8f 100644
--- a/app/soapbox/hooks/index.ts
+++ b/app/soapbox/hooks/index.ts
@@ -2,6 +2,7 @@ export { useAccount } from './useAccount';
 export { useApi } from './useApi';
 export { useAppDispatch } from './useAppDispatch';
 export { useAppSelector } from './useAppSelector';
+export { useBackend } from './useBackend';
 export { useClickOutside } from './useClickOutside';
 export { useCompose } from './useCompose';
 export { useDebounce } from './useDebounce';

From 8ec8d4a2cae1b175650632daab013190aa65c2a9 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 23 Mar 2023 15:19:18 -0400
Subject: [PATCH 137/298] Use FloatingUI with Tooltip

---
 app/soapbox/components/ui/tooltip/tooltip.css |  12 --
 app/soapbox/components/ui/tooltip/tooltip.tsx | 119 ++++++++++--------
 package.json                                  |   1 -
 yarn.lock                                     |  19 ---
 4 files changed, 70 insertions(+), 81 deletions(-)
 delete mode 100644 app/soapbox/components/ui/tooltip/tooltip.css

diff --git a/app/soapbox/components/ui/tooltip/tooltip.css b/app/soapbox/components/ui/tooltip/tooltip.css
deleted file mode 100644
index 670571c8b..000000000
--- a/app/soapbox/components/ui/tooltip/tooltip.css
+++ /dev/null
@@ -1,12 +0,0 @@
-:root {
-  --reach-tooltip: 1;
-}
-
-[data-reach-tooltip] {
-  @apply pointer-events-none absolute px-2.5 py-1.5 rounded shadow whitespace-nowrap text-xs font-medium bg-gray-800 text-gray-100 dark:bg-gray-100 dark:text-gray-900;
-  z-index: 100;
-}
-
-[data-reach-tooltip-arrow] {
-  @apply absolute z-50 w-0 h-0 border-l-8 border-solid border-l-transparent border-r-8 border-r-transparent border-b-8 border-b-gray-800 dark:border-b-gray-100;
-}
diff --git a/app/soapbox/components/ui/tooltip/tooltip.tsx b/app/soapbox/components/ui/tooltip/tooltip.tsx
index f2b6ffedc..0d492bcb6 100644
--- a/app/soapbox/components/ui/tooltip/tooltip.tsx
+++ b/app/soapbox/components/ui/tooltip/tooltip.tsx
@@ -1,67 +1,88 @@
-import { TooltipPopup, useTooltip } from '@reach/tooltip';
-import React from 'react';
-
-import Portal from '../portal/portal';
-
-import './tooltip.css';
+import {
+  arrow,
+  FloatingArrow,
+  FloatingPortal,
+  offset,
+  useFloating,
+  useHover,
+  useInteractions,
+  useTransitionStyles,
+} from '@floating-ui/react';
+import React, { useRef, useState } from 'react';
 
 interface ITooltip {
+  /** Element to display the tooltip around. */
+  children: React.ReactElement<any, string | React.JSXElementConstructor<any>>
   /** Text to display in the tooltip. */
   text: string
-  /** Element to display the tooltip around. */
-  children: React.ReactNode
 }
 
-const centered = (triggerRect: any, tooltipRect: any) => {
-  const triggerCenter = triggerRect.left + triggerRect.width / 2;
-  const left = triggerCenter - tooltipRect.width / 2;
-  const maxLeft = window.innerWidth - tooltipRect.width - 2;
-  return {
-    left: Math.min(Math.max(2, left), maxLeft) + window.scrollX,
-    top: triggerRect.bottom + 8 + window.scrollY,
-  };
-};
+/**
+ * Tooltip
+ */
+const Tooltip: React.FC<ITooltip> = (props) => {
+  const { children, text } = props;
 
-/** Hoverable tooltip element. */
-const Tooltip: React.FC<ITooltip> = ({
-  children,
-  text,
-}) => {
-  // get the props from useTooltip
-  const [trigger, tooltip] = useTooltip();
+  const [isOpen, setIsOpen] = useState<boolean>(false);
 
-  // destructure off what we need to position the triangle
-  const { isVisible, triggerRect } = tooltip;
+  const arrowRef = useRef<SVGSVGElement>(null);
+
+  const { x, y, strategy, refs, context } = useFloating({
+    open: isOpen,
+    onOpenChange: setIsOpen,
+    placement: 'top',
+    middleware: [
+      offset(6),
+      arrow({
+        element: arrowRef,
+      }),
+    ],
+  });
+
+  const hover = useHover(context);
+  const { isMounted, styles } = useTransitionStyles(context, {
+    initial: {
+      opacity: 0,
+      transform: 'scale(0.8)',
+    },
+    duration: {
+      open: 200,
+      close: 200,
+    },
+  });
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([
+    hover,
+  ]);
 
   return (
-    <React.Fragment>
-      {React.cloneElement(children as any, trigger)}
+    <>
+      {React.cloneElement(children, {
+        ref: refs.setReference,
+        ...getReferenceProps(),
+      })}
 
-      {isVisible && (
-        // The Triangle. We position it relative to the trigger, not the popup
-        // so that collisions don't have a triangle pointing off to nowhere.
-        // Using a Portal may seem a little extreme, but we can keep the
-        // positioning logic simpler here instead of needing to consider
-        // the popup's position relative to the trigger and collisions
-        <Portal>
+      {(isMounted) && (
+        <FloatingPortal>
           <div
-            data-reach-tooltip-arrow='true'
+            ref={refs.setFloating}
             style={{
-              left:
-                triggerRect && triggerRect.left - 10 + triggerRect.width / 2 as any,
-              top: triggerRect && triggerRect.bottom + window.scrollY as any,
+              position: strategy,
+              top: y ?? 0,
+              left: x ?? 0,
+              ...styles,
             }}
-          />
-        </Portal>
+            className='pointer-events-none z-[100] whitespace-nowrap rounded bg-gray-800 px-2.5 py-1.5 text-xs font-medium text-gray-100 shadow dark:bg-gray-100 dark:text-gray-900'
+            {...getFloatingProps()}
+          >
+            {text}
+
+            <FloatingArrow ref={arrowRef} context={context} className='fill-gray-800 dark:fill-gray-100' />
+          </div>
+        </FloatingPortal>
       )}
-      <TooltipPopup
-        {...tooltip}
-        label={text}
-        aria-label={text}
-        position={centered}
-      />
-    </React.Fragment>
+    </>
   );
 };
 
-export default Tooltip;
+export default Tooltip;
\ No newline at end of file
diff --git a/package.json b/package.json
index 57831cd0e..ddd13f24a 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,6 @@
     "@reach/popover": "^0.18.0",
     "@reach/rect": "^0.18.0",
     "@reach/tabs": "^0.18.0",
-    "@reach/tooltip": "^0.18.0",
     "@reduxjs/toolkit": "^1.8.1",
     "@sentry/browser": "^7.37.2",
     "@sentry/react": "^7.37.2",
diff --git a/yarn.lock b/yarn.lock
index 4d6585981..5220b11d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2749,30 +2749,11 @@
     "@reach/polymorphic" "0.18.0"
     "@reach/utils" "0.18.0"
 
-"@reach/tooltip@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@reach/tooltip/-/tooltip-0.18.0.tgz#6d416e77a82543af9a57d122962f9c0294fc2a5f"
-  integrity sha512-yugoTmTjB3qoMk/nUvcnw99MqpyE2TQMOXE29qnQhSqHriRwQhfftjXlTAGTSzsUJmbyms3A/1gQW0X61kjFZw==
-  dependencies:
-    "@reach/auto-id" "0.18.0"
-    "@reach/polymorphic" "0.18.0"
-    "@reach/portal" "0.18.0"
-    "@reach/rect" "0.18.0"
-    "@reach/utils" "0.18.0"
-    "@reach/visually-hidden" "0.18.0"
-
 "@reach/utils@0.18.0":
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.18.0.tgz#4f3cebe093dd436eeaff633809bf0f68f4f9d2ee"
   integrity sha512-KdVMdpTgDyK8FzdKO9SCpiibuy/kbv3pwgfXshTI6tEcQT1OOwj7BAksnzGC0rPz0UholwC+AgkqEl3EJX3M1A==
 
-"@reach/visually-hidden@0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@reach/visually-hidden/-/visually-hidden-0.18.0.tgz#17923c08acc5946624c2836b2b09d359b3aa8c27"
-  integrity sha512-NsJ3oeHJtPc6UOeV6MHMuzQ5sl1ouKhW85i3C0S7VM+klxVlYScBZ2J4UVnWB50A2c+evdVpCnld2YeuyYYwBw==
-  dependencies:
-    "@reach/polymorphic" "0.18.0"
-
 "@reduxjs/toolkit@^1.8.1":
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.8.1.tgz#94ee1981b8cf9227cda40163a04704a9544c9a9f"

From 2d52c8c3e48e1bdf8ebec8a8e236e0c5cf951b56 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 23 Mar 2023 15:20:19 -0400
Subject: [PATCH 138/298] Add support for Group tags

---
 .../entity-store/hooks/useEntityActions.ts    |   3 +-
 .../group/components/group-tag-list-item.tsx  | 152 ++++++++++++++++++
 .../features/group/group-tag-timeline.tsx     |  30 ++++
 app/soapbox/features/group/group-tags.tsx     |  54 +++++++
 app/soapbox/features/ui/index.tsx             |   4 +
 .../features/ui/util/async-components.ts      |   8 +
 app/soapbox/hooks/api/groups/useGroupTags.ts  |  20 +++
 .../hooks/api/groups/useUpdateGroupTag.ts     |  17 ++
 app/soapbox/hooks/api/index.ts                |   4 +-
 app/soapbox/pages/group-page.tsx              |  38 +++--
 app/soapbox/utils/features.ts                 |   5 +
 11 files changed, 324 insertions(+), 11 deletions(-)
 create mode 100644 app/soapbox/features/group/components/group-tag-list-item.tsx
 create mode 100644 app/soapbox/features/group/group-tag-timeline.tsx
 create mode 100644 app/soapbox/features/group/group-tags.tsx
 create mode 100644 app/soapbox/hooks/api/groups/useGroupTags.ts
 create mode 100644 app/soapbox/hooks/api/groups/useUpdateGroupTag.ts

diff --git a/app/soapbox/entity-store/hooks/useEntityActions.ts b/app/soapbox/entity-store/hooks/useEntityActions.ts
index 8b87c52fd..ff27af340 100644
--- a/app/soapbox/entity-store/hooks/useEntityActions.ts
+++ b/app/soapbox/entity-store/hooks/useEntityActions.ts
@@ -12,8 +12,9 @@ interface UseEntityActionsOpts<TEntity extends Entity = Entity> {
 }
 
 interface EntityActionEndpoints {
-  post?: string
   delete?: string
+  patch?: string
+  post?: string
 }
 
 function useEntityActions<TEntity extends Entity = Entity, Data = any>(
diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
new file mode 100644
index 000000000..7792b3e81
--- /dev/null
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -0,0 +1,152 @@
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
+
+import { HStack, IconButton, Stack, Text, Tooltip } from 'soapbox/components/ui';
+import { useUpdateGroupTag } from 'soapbox/hooks/api';
+import toast from 'soapbox/toast';
+import { shortNumberFormat } from 'soapbox/utils/numbers';
+
+import type { Group, GroupTag } from 'soapbox/schemas';
+
+const messages = defineMessages({
+  hideTag: { id: 'group.tags.hide', defaultMessage: 'Hide topic' },
+  showTag: { id: 'group.tags.show', defaultMessage: 'Show topic' },
+  total: { id: 'group.tags.total', defaultMessage: 'Total Posts' },
+  pinTag: { id: 'group.tags.pin', defaultMessage: 'Pin topic' },
+  unpinTag: { id: 'group.tags.unpin', defaultMessage: 'Unpin topic' },
+  pinSuccess: { id: 'group.tags.pin.success', defaultMessage: 'Pinned!' },
+  unpinSuccess: { id: 'group.tags.unpin.success', defaultMessage: 'Unpinned!' },
+  visibleSuccess: { id: 'group.tags.visible.success', defaultMessage: 'Topic marked as visible' },
+  hiddenSuccess: { id: 'group.tags.hidden.success', defaultMessage: 'Topic marked as hidden' },
+});
+
+interface IGroupMemberListItem {
+  tag: GroupTag
+  group: Group
+  isPinnable: boolean
+}
+
+const GroupTagListItem = (props: IGroupMemberListItem) => {
+  const { group, tag, isPinnable } = props;
+
+  const intl = useIntl();
+  const updateGroupTag = useUpdateGroupTag(group.id, tag.id);
+
+  const toggleVisibility = () => {
+    updateGroupTag({
+      pinned: !tag.visible,
+    }, {
+      onSuccess(entity: GroupTag) {
+        toast.success(
+          entity.visible ?
+            intl.formatMessage(messages.visibleSuccess) :
+            intl.formatMessage(messages.hiddenSuccess),
+        );
+      },
+    });
+  };
+
+  const togglePin = () => {
+    updateGroupTag({
+      pinned: !tag.pinned,
+    }, {
+      onSuccess(entity: GroupTag) {
+        toast.success(
+          entity.pinned ?
+            intl.formatMessage(messages.pinSuccess) :
+            intl.formatMessage(messages.unpinSuccess),
+        );
+      },
+    });
+  };
+
+  const renderPinIcon = () => {
+    if (isPinnable) {
+      return (
+        <Tooltip
+          text={
+            tag.pinned ?
+              intl.formatMessage(messages.unpinTag) :
+              intl.formatMessage(messages.pinTag)
+          }
+        >
+          <IconButton
+            onClick={togglePin}
+            transparent
+            src={
+              tag.pinned ?
+                require('@tabler/icons/pin-filled.svg') :
+                require('@tabler/icons/pin.svg')
+            }
+            iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
+          />
+        </Tooltip>
+      );
+    }
+
+    if (!isPinnable && tag.pinned) {
+      return (
+        <Tooltip text={intl.formatMessage(messages.unpinTag)}>
+          <IconButton
+            onClick={togglePin}
+            transparent
+            src={require('@tabler/icons/pin-filled.svg')}
+            iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
+          />
+        </Tooltip>
+
+      );
+    }
+  };
+
+  return (
+    <HStack alignItems='center' justifyContent='between'>
+      <Link to={`/groups/${group.id}/tag/${tag.id}`} className='group grow'>
+        <Stack>
+          <Text
+            weight='bold'
+            theme={tag.visible ? 'default' : 'subtle'}
+            className='group-hover:underline'
+          >
+            #{tag.name}
+          </Text>
+          <Text size='sm' theme={tag.visible ? 'muted' : 'subtle'}>
+            {intl.formatMessage(messages.total)}:
+            {' '}
+            <Text size='sm' theme='inherit' weight='semibold' tag='span'>
+              {shortNumberFormat(tag.uses)}
+            </Text>
+          </Text>
+        </Stack>
+      </Link>
+
+      <HStack alignItems='center' space={2}>
+        {tag.visible ? (
+          renderPinIcon()
+        ) : null}
+
+        <Tooltip
+          text={
+            tag.visible ?
+              intl.formatMessage(messages.hideTag) :
+              intl.formatMessage(messages.showTag)
+          }
+        >
+          <IconButton
+            onClick={toggleVisibility}
+            transparent
+            src={
+              tag.visible ?
+                require('@tabler/icons/eye.svg') :
+                require('@tabler/icons/eye-off.svg')
+            }
+            iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
+          />
+        </Tooltip>
+      </HStack>
+    </HStack>
+  );
+};
+
+export default GroupTagListItem;
\ No newline at end of file
diff --git a/app/soapbox/features/group/group-tag-timeline.tsx b/app/soapbox/features/group/group-tag-timeline.tsx
new file mode 100644
index 000000000..2663c59cf
--- /dev/null
+++ b/app/soapbox/features/group/group-tag-timeline.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+import { Column } from 'soapbox/components/ui';
+import { useGroup, useGroupTag } from 'soapbox/hooks/api';
+
+type RouteParams = { id: string, groupId: string };
+
+interface IGroupTimeline {
+  params: RouteParams
+}
+
+const GroupTagTimeline: React.FC<IGroupTimeline> = (props) => {
+  const groupId = props.params.groupId;
+  const tagId = props.params.id;
+
+  const { group } = useGroup(groupId);
+  const { tag } = useGroupTag(tagId);
+
+  if (!group) {
+    return null;
+  }
+
+  return (
+    <Column label={`#${tag}`}>
+      {/* TODO */}
+    </Column>
+  );
+};
+
+export default GroupTagTimeline;
diff --git a/app/soapbox/features/group/group-tags.tsx b/app/soapbox/features/group/group-tags.tsx
new file mode 100644
index 000000000..dc4c7d088
--- /dev/null
+++ b/app/soapbox/features/group/group-tags.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+
+import ScrollableList from 'soapbox/components/scrollable-list';
+import { useGroupTags } from 'soapbox/hooks/api';
+import { useGroup } from 'soapbox/queries/groups';
+
+import PlaceholderAccount from '../placeholder/components/placeholder-account';
+
+import GroupTagListItem from './components/group-tag-list-item';
+
+import type { Group } from 'soapbox/types/entities';
+
+interface IGroupTopics {
+  params: { id: string }
+}
+
+const GroupTopics: React.FC<IGroupTopics> = (props) => {
+  const groupId = props.params.id;
+
+  const { group, isFetching: isFetchingGroup } = useGroup(groupId);
+  const { tags, isFetching: isFetchingTags, hasNextPage, fetchNextPage } = useGroupTags(groupId);
+
+  const isLoading = isFetchingGroup || isFetchingTags;
+
+  const pinnedTags = tags.filter((tag) => tag.pinned);
+  const isPinnable = pinnedTags.length < 3;
+
+  return (
+    <>
+      <ScrollableList
+        scrollKey='group-tags'
+        hasMore={hasNextPage}
+        onLoadMore={fetchNextPage}
+        isLoading={isLoading || !group}
+        showLoading={!group || isLoading && tags.length === 0}
+        placeholderComponent={PlaceholderAccount}
+        placeholderCount={3}
+        className='divide-y divide-solid divide-gray-300'
+        itemClassName='py-3 last:pb-0'
+      >
+        {tags.map((tag) => (
+          <GroupTagListItem
+            key={tag.id}
+            group={group as Group}
+            isPinnable={isPinnable}
+            tag={tag}
+          />
+        ))}
+      </ScrollableList>
+    </>
+  );
+};
+
+export default GroupTopics;
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index b967f27de..bcd6d8d24 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -126,6 +126,8 @@ import {
   GroupsTags,
   PendingGroupRequests,
   GroupMembers,
+  GroupTags,
+  GroupTagTimeline,
   GroupTimeline,
   ManageGroup,
   GroupBlockedMembers,
@@ -301,6 +303,8 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groupsDiscovery && <WrappedRoute path='/groups/tags' exact page={GroupsPendingPage} component={GroupsTags} content={children} />}
       {features.groupsDiscovery && <WrappedRoute path='/groups/discover/tags/:id' exact page={GroupsPendingPage} component={GroupsTag} content={children} />}
       {features.groupsPending && <WrappedRoute path='/groups/pending-requests' exact page={GroupsPendingPage} component={PendingGroupRequests} content={children} />}
+      {features.groupsTags && <WrappedRoute path='/groups/:id/tags' exact page={GroupPage} component={GroupTags} content={children} />}
+      {features.groupsTags && <WrappedRoute path='/groups/:groupId/tag/:id' exact page={GroupsPendingPage} component={GroupTagTimeline} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id' exact page={GroupPage} component={GroupTimeline} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/members' exact page={GroupPage} component={GroupMembers} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/media' publicRoute={!authenticatedProfile} component={GroupGallery} page={GroupPage} content={children} />}
diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts
index 654cab76d..e8187db46 100644
--- a/app/soapbox/features/ui/util/async-components.ts
+++ b/app/soapbox/features/ui/util/async-components.ts
@@ -578,6 +578,14 @@ export function GroupMembers() {
   return import(/* webpackChunkName: "features/groups" */'../../group/group-members');
 }
 
+export function GroupTags() {
+  return import(/* webpackChunkName: "features/groups" */'../../group/group-tags');
+}
+
+export function GroupTagTimeline() {
+  return import(/* webpackChunkName: "features/groups" */'../../group/group-tag-timeline');
+}
+
 export function GroupTimeline() {
   return import(/* webpackChunkName: "features/groups" */'../../group/group-timeline');
 }
diff --git a/app/soapbox/hooks/api/groups/useGroupTags.ts b/app/soapbox/hooks/api/groups/useGroupTags.ts
new file mode 100644
index 000000000..4b724352e
--- /dev/null
+++ b/app/soapbox/hooks/api/groups/useGroupTags.ts
@@ -0,0 +1,20 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { groupTagSchema } from 'soapbox/schemas';
+
+import type { GroupTag } from 'soapbox/schemas';
+
+function useGroupTags(groupId: string) {
+  const { entities, ...result } = useEntities<GroupTag>(
+    [Entities.GROUP_TAGS, groupId],
+    '/api/mock/groups/tags', // `api/v1/groups/${groupId}/tags`
+    { schema: groupTagSchema },
+  );
+
+  return {
+    ...result,
+    tags: entities,
+  };
+}
+
+export { useGroupTags };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts b/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts
new file mode 100644
index 000000000..2d4d61f69
--- /dev/null
+++ b/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts
@@ -0,0 +1,17 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntityActions } from 'soapbox/entity-store/hooks';
+import { groupTagSchema } from 'soapbox/schemas';
+
+import type { GroupTag } from 'soapbox/schemas';
+
+function useUpdateGroupTag(groupId: string, tagId: string) {
+  const { updateEntity } = useEntityActions<GroupTag>(
+    [Entities.GROUP_TAGS, groupId, tagId],
+    { patch: `/api/mock/truth/groups/${groupId}/tags/${tagId}` },
+    { schema: groupTagSchema },
+  );
+
+  return updateEntity;
+}
+
+export { useUpdateGroupTag };
\ No newline at end of file
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/hooks/api/index.ts
index 3ab7be9a5..c8e1f67c3 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/hooks/api/index.ts
@@ -16,6 +16,7 @@ export { useGroupMedia } from './groups/useGroupMedia';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
 export { useGroupSearch } from './groups/useGroupSearch';
 export { useGroupTag } from './groups/useGroupTag';
+export { useGroupTags } from './groups/useGroupTags';
 export { useGroupValidation } from './groups/useGroupValidation';
 export { useGroupsFromTag } from './groups/useGroupsFromTag';
 export { useJoinGroup } from './groups/useJoinGroup';
@@ -23,8 +24,9 @@ export { useLeaveGroup } from './groups/useLeaveGroup';
 export { usePopularTags } from './groups/usePopularTags';
 export { usePromoteGroupMember } from './groups/usePromoteGroupMember';
 export { useUpdateGroup } from './groups/useUpdateGroup';
+export { useUpdateGroupTag } from './groups/useUpdateGroupTag';
 
 /**
  * Relationships
  */
-export { useRelationships } from './useRelationships';
\ No newline at end of file
+export { useRelationships } from './useRelationships';
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index 449e250f3..07b9eb4d5 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useRouteMatch } from 'react-router-dom';
 
@@ -12,7 +12,7 @@ import {
   SignUpPanel,
   SuggestedGroupsPanel,
 } from 'soapbox/features/ui/util/async-components';
-import { useOwnAccount } from 'soapbox/hooks';
+import { useFeatures, useOwnAccount } from 'soapbox/hooks';
 import { useGroup } from 'soapbox/hooks/api';
 import { useGroupMembershipRequests } from 'soapbox/hooks/api/groups/useGroupMembershipRequests';
 import { Group } from 'soapbox/schemas';
@@ -23,6 +23,7 @@ const messages = defineMessages({
   all: { id: 'group.tabs.all', defaultMessage: 'All' },
   members: { id: 'group.tabs.members', defaultMessage: 'Members' },
   media: { id: 'group.tabs.media', defaultMessage: 'Media' },
+  tags: { id: 'group.tabs.tags', defaultMessage: 'Topics' },
 });
 
 interface IGroupPage {
@@ -61,6 +62,7 @@ const BlockedBlankslate = ({ group }: { group: Group }) => (
 /** Page to display a group. */
 const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   const intl = useIntl();
+  const features = useFeatures();
   const match = useRouteMatch();
   const me = useOwnAccount();
 
@@ -73,13 +75,29 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   const isBlocked = group?.relationship?.blocked_by;
   const isPrivate = group?.locked;
 
-  const items = [
-    {
+  // if ((group as any) === false) {
+  //   return (
+  //     <MissingIndicator />
+  //   );
+  // }
+
+  const tabItems = useMemo(() => {
+    const items = [];
+    items.push({
       text: intl.formatMessage(messages.all),
       to: `/groups/${group?.id}`,
       name: '/groups/:id',
-    },
-    {
+    });
+
+    if (features.groupsTags) {
+      items.push({
+        text: intl.formatMessage(messages.tags),
+        to: `/groups/${group?.id}/tags`,
+        name: '/groups/:id/tags',
+      });
+    }
+
+    items.push({
       text: intl.formatMessage(messages.members),
       to: `/groups/${group?.id}/members`,
       name: '/groups/:id/members',
@@ -89,8 +107,10 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
       text: intl.formatMessage(messages.media),
       to: `/groups/${group?.id}/media`,
       name: '/groups/:id/media',
-    },
-  ];
+    });
+
+    return items;
+  }, [features.groupsTags]);
 
   const renderChildren = () => {
     if (!isMember && isPrivate) {
@@ -109,7 +129,7 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
           <GroupHeader group={group} />
 
           <Tabs
-            items={items}
+            items={tabItems}
             activeItem={match.path}
           />
 
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index b24e75525..9c5a68bda 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -559,6 +559,11 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     groupsSearch: v.software === TRUTHSOCIAL,
 
+    /**
+     * Can see topics for Groups.
+     */
+    groupsTags: v.software === TRUTHSOCIAL,
+
     /**
      * Can validate group names.
      */

From c5c5bd0d62c44fffd5a77f3fd217718e26d404ac Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 14 Apr 2023 15:15:34 -0400
Subject: [PATCH 139/298] Add ability to update Group tags

---
 .../entity-store/hooks/useEntityActions.ts    |  6 +-
 .../group/components/group-tag-list-item.tsx  | 83 ++++++++++++-------
 app/soapbox/features/group/group-tags.tsx     | 59 ++++++++-----
 app/soapbox/hooks/api/groups/useGroupTags.ts  |  5 +-
 .../hooks/api/groups/useUpdateGroupTag.ts     | 11 +--
 5 files changed, 105 insertions(+), 59 deletions(-)

diff --git a/app/soapbox/entity-store/hooks/useEntityActions.ts b/app/soapbox/entity-store/hooks/useEntityActions.ts
index ff27af340..c7e2e431d 100644
--- a/app/soapbox/entity-store/hooks/useEntityActions.ts
+++ b/app/soapbox/entity-store/hooks/useEntityActions.ts
@@ -31,10 +31,14 @@ function useEntityActions<TEntity extends Entity = Entity, Data = any>(
   const { createEntity, isSubmitting: createSubmitting } =
     useCreateEntity<TEntity, Data>(path, (data) => api.post(endpoints.post!, data), opts);
 
+  const { createEntity: updateEntity, isSubmitting: updateSubmitting } =
+    useCreateEntity<TEntity, Data>(path, (data) => api.patch(endpoints.patch!, data), opts);
+
   return {
     createEntity,
     deleteEntity,
-    isSubmitting: createSubmitting || deleteSubmitting,
+    updateEntity,
+    isSubmitting: createSubmitting || deleteSubmitting || updateSubmitting,
   };
 }
 
diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index 7792b3e81..47f9f1ef6 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -3,7 +3,11 @@ import { defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
 import { HStack, IconButton, Stack, Text, Tooltip } from 'soapbox/components/ui';
+import { importEntities } from 'soapbox/entity-store/actions';
+import { Entities } from 'soapbox/entity-store/entities';
+import { useAppDispatch } from 'soapbox/hooks';
 import { useUpdateGroupTag } from 'soapbox/hooks/api';
+import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 import { shortNumberFormat } from 'soapbox/utils/numbers';
 
@@ -29,15 +33,26 @@ interface IGroupMemberListItem {
 
 const GroupTagListItem = (props: IGroupMemberListItem) => {
   const { group, tag, isPinnable } = props;
+  const dispatch = useAppDispatch();
 
   const intl = useIntl();
-  const updateGroupTag = useUpdateGroupTag(group.id, tag.id);
+  const { updateGroupTag } = useUpdateGroupTag(group.id, tag.id);
+
+  const isOwner = group.relationship?.role === GroupRoles.OWNER;
+  const isAdmin = group.relationship?.role === GroupRoles.ADMIN;
+  const canEdit = isOwner || isAdmin;
 
   const toggleVisibility = () => {
     updateGroupTag({
-      pinned: !tag.visible,
+      group_tag_type: tag.visible ? 'hidden' : 'normal',
     }, {
-      onSuccess(entity: GroupTag) {
+      onSuccess() {
+        const entity = {
+          ...tag,
+          visible: !tag.visible,
+        };
+        dispatch(importEntities([entity], Entities.GROUP_TAGS));
+
         toast.success(
           entity.visible ?
             intl.formatMessage(messages.visibleSuccess) :
@@ -49,9 +64,15 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
 
   const togglePin = () => {
     updateGroupTag({
-      pinned: !tag.pinned,
+      group_tag_type: tag.pinned ? 'normal' : 'pinned',
     }, {
-      onSuccess(entity: GroupTag) {
+      onSuccess() {
+        const entity = {
+          ...tag,
+          pinned: !tag.pinned,
+        };
+        dispatch(importEntities([entity], Entities.GROUP_TAGS));
+
         toast.success(
           entity.pinned ?
             intl.formatMessage(messages.pinSuccess) :
@@ -73,7 +94,7 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
         >
           <IconButton
             onClick={togglePin}
-            transparent
+            theme='transparent'
             src={
               tag.pinned ?
                 require('@tabler/icons/pin-filled.svg') :
@@ -90,7 +111,7 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
         <Tooltip text={intl.formatMessage(messages.unpinTag)}>
           <IconButton
             onClick={togglePin}
-            transparent
+            theme='transparent'
             src={require('@tabler/icons/pin-filled.svg')}
             iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
           />
@@ -106,12 +127,12 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
         <Stack>
           <Text
             weight='bold'
-            theme={tag.visible ? 'default' : 'subtle'}
+            theme={(tag.visible || !canEdit) ? 'default' : 'subtle'}
             className='group-hover:underline'
           >
             #{tag.name}
           </Text>
-          <Text size='sm' theme={tag.visible ? 'muted' : 'subtle'}>
+          <Text size='sm' theme={(tag.visible || !canEdit) ? 'muted' : 'subtle'}>
             {intl.formatMessage(messages.total)}:
             {' '}
             <Text size='sm' theme='inherit' weight='semibold' tag='span'>
@@ -121,30 +142,32 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
         </Stack>
       </Link>
 
-      <HStack alignItems='center' space={2}>
-        {tag.visible ? (
-          renderPinIcon()
-        ) : null}
+      {canEdit ? (
+        <HStack alignItems='center' space={2}>
+          {tag.visible ? (
+            renderPinIcon()
+          ) : null}
 
-        <Tooltip
-          text={
-            tag.visible ?
-              intl.formatMessage(messages.hideTag) :
-              intl.formatMessage(messages.showTag)
-          }
-        >
-          <IconButton
-            onClick={toggleVisibility}
-            transparent
-            src={
+          <Tooltip
+            text={
               tag.visible ?
-                require('@tabler/icons/eye.svg') :
-                require('@tabler/icons/eye-off.svg')
+                intl.formatMessage(messages.hideTag) :
+                intl.formatMessage(messages.showTag)
             }
-            iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
-          />
-        </Tooltip>
-      </HStack>
+          >
+            <IconButton
+              onClick={toggleVisibility}
+              theme='transparent'
+              src={
+                tag.visible ?
+                  require('@tabler/icons/eye.svg') :
+                  require('@tabler/icons/eye-off.svg')
+              }
+              iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
+            />
+          </Tooltip>
+        </HStack>
+      ) : null}
     </HStack>
   );
 };
diff --git a/app/soapbox/features/group/group-tags.tsx b/app/soapbox/features/group/group-tags.tsx
index dc4c7d088..d0b371d8b 100644
--- a/app/soapbox/features/group/group-tags.tsx
+++ b/app/soapbox/features/group/group-tags.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
+import { FormattedMessage } from 'react-intl';
 
 import ScrollableList from 'soapbox/components/scrollable-list';
+import { Icon, Stack, Text } from 'soapbox/components/ui';
 import { useGroupTags } from 'soapbox/hooks/api';
 import { useGroup } from 'soapbox/queries/groups';
 
@@ -26,28 +28,41 @@ const GroupTopics: React.FC<IGroupTopics> = (props) => {
   const isPinnable = pinnedTags.length < 3;
 
   return (
-    <>
-      <ScrollableList
-        scrollKey='group-tags'
-        hasMore={hasNextPage}
-        onLoadMore={fetchNextPage}
-        isLoading={isLoading || !group}
-        showLoading={!group || isLoading && tags.length === 0}
-        placeholderComponent={PlaceholderAccount}
-        placeholderCount={3}
-        className='divide-y divide-solid divide-gray-300'
-        itemClassName='py-3 last:pb-0'
-      >
-        {tags.map((tag) => (
-          <GroupTagListItem
-            key={tag.id}
-            group={group as Group}
-            isPinnable={isPinnable}
-            tag={tag}
-          />
-        ))}
-      </ScrollableList>
-    </>
+    <ScrollableList
+      scrollKey='group-tags'
+      hasMore={hasNextPage}
+      onLoadMore={fetchNextPage}
+      isLoading={isLoading || !group}
+      showLoading={!group || isLoading && tags.length === 0}
+      placeholderComponent={PlaceholderAccount}
+      placeholderCount={3}
+      className='divide-y divide-solid divide-gray-300'
+      itemClassName='py-3 last:pb-0'
+      emptyMessage={
+        <Stack space={4} className='pt-6' justifyContent='center' alignItems='center'>
+          <div className='rounded-full bg-gray-200 p-4 dark:bg-gray-800'>
+            <Icon
+              src={require('@tabler/icons/hash.svg')}
+              className='h-6 w-6 text-gray-600'
+            />
+          </div>
+
+          <Text theme='muted'>
+            <FormattedMessage id='group.tags.empty' defaultMessage='There are no topics in this group yet.' />
+          </Text>
+        </Stack>
+      }
+      emptyMessageCard={false}
+    >
+      {tags.map((tag) => (
+        <GroupTagListItem
+          key={tag.id}
+          group={group as Group}
+          isPinnable={isPinnable}
+          tag={tag}
+        />
+      ))}
+    </ScrollableList>
   );
 };
 
diff --git a/app/soapbox/hooks/api/groups/useGroupTags.ts b/app/soapbox/hooks/api/groups/useGroupTags.ts
index 4b724352e..42d81688f 100644
--- a/app/soapbox/hooks/api/groups/useGroupTags.ts
+++ b/app/soapbox/hooks/api/groups/useGroupTags.ts
@@ -1,13 +1,16 @@
 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/mock/groups/tags', // `api/v1/groups/${groupId}/tags`
+    () => api.get(`api/v1/truth/trends/groups/${groupId}/tags`),
     { schema: groupTagSchema },
   );
 
diff --git a/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts b/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts
index 2d4d61f69..1c68c714d 100644
--- a/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts
+++ b/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts
@@ -1,17 +1,18 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntityActions } from 'soapbox/entity-store/hooks';
-import { groupTagSchema } from 'soapbox/schemas';
 
 import type { GroupTag } from 'soapbox/schemas';
 
 function useUpdateGroupTag(groupId: string, tagId: string) {
-  const { updateEntity } = useEntityActions<GroupTag>(
+  const { updateEntity, ...rest } = useEntityActions<GroupTag>(
     [Entities.GROUP_TAGS, groupId, tagId],
-    { patch: `/api/mock/truth/groups/${groupId}/tags/${tagId}` },
-    { schema: groupTagSchema },
+    { patch: `/api/v1/groups/${groupId}/tags/${tagId}` },
   );
 
-  return updateEntity;
+  return {
+    updateGroupTag: updateEntity,
+    ...rest,
+  };
 }
 
 export { useUpdateGroupTag };
\ No newline at end of file

From ddee915d3924d07f8f68bc46ee2a59429e6d2b05 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 17 Apr 2023 10:11:03 -0400
Subject: [PATCH 140/298] Lint + Tests

---
 app/soapbox/hooks/__tests__/useGroupsPath.test.ts |  2 +-
 app/soapbox/locales/en.json                       | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/hooks/__tests__/useGroupsPath.test.ts b/app/soapbox/hooks/__tests__/useGroupsPath.test.ts
index d102fe412..7596acd9a 100644
--- a/app/soapbox/hooks/__tests__/useGroupsPath.test.ts
+++ b/app/soapbox/hooks/__tests__/useGroupsPath.test.ts
@@ -53,7 +53,7 @@ describe('useGroupsPath()', () => {
     describe('when the user has groups', () => {
       beforeEach(() => {
         __stub((mock) => {
-          mock.onGet('/api/v1/groups?q=').reply(200, [
+          mock.onGet('/api/v1/groups').reply(200, [
             buildGroup({
               display_name: 'Group',
               id: '1',
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index e762b040c..35bfb58a0 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -809,8 +809,19 @@
   "group.tabs.all": "All",
   "group.tabs.media": "Media",
   "group.tabs.members": "Members",
+  "group.tabs.tags": "Topics",
+  "group.tags.empty": "There are no topics in this group yet.",
+  "group.tags.hidden.success": "Topic marked as hidden",
+  "group.tags.hide": "Hide topic",
   "group.tags.hint": "Add up to 3 keywords that will serve as core topics of discussion in the group.",
   "group.tags.label": "Tags",
+  "group.tags.pin": "Pin topic",
+  "group.tags.pin.success": "Pinned!",
+  "group.tags.show": "Show topic",
+  "group.tags.total": "Total Posts",
+  "group.tags.unpin": "Unpin topic",
+  "group.tags.unpin.success": "Unpinned!",
+  "group.tags.visible.success": "Topic marked as visible",
   "group.update.success": "Group successfully saved",
   "group.upload_banner": "Upload photo",
   "groups.discover.popular.empty": "Unable to fetch popular groups at this time. Please check back later.",

From ccde5f8823d5357ec2d45875e60d949edda95391 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 17 Apr 2023 14:56:31 -0400
Subject: [PATCH 141/298] Make GroupLookup HOC kind of work

---
 .../components/hoc/group-lookup-hoc.tsx       | 37 +++++++++++++++++++
 app/soapbox/components/hoc/with-hoc.tsx       | 11 ++++++
 app/soapbox/features/ui/index.tsx             |  5 +++
 3 files changed, 53 insertions(+)
 create mode 100644 app/soapbox/components/hoc/group-lookup-hoc.tsx
 create mode 100644 app/soapbox/components/hoc/with-hoc.tsx

diff --git a/app/soapbox/components/hoc/group-lookup-hoc.tsx b/app/soapbox/components/hoc/group-lookup-hoc.tsx
new file mode 100644
index 000000000..5c5f43c0c
--- /dev/null
+++ b/app/soapbox/components/hoc/group-lookup-hoc.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
+
+import { Spinner } from '../ui';
+
+interface IGroupLookup {
+  params: {
+    groupSlug: string
+  }
+}
+
+function GroupLookupHoc(Component: React.ComponentType<{ params: { groupId: string } }>) {
+  const GroupLookup: React.FC<IGroupLookup> = (props) => {
+    const { entity: group } = useGroupLookup(props.params.groupSlug);
+    if (!group) return (
+      <Spinner />
+    );
+
+    const newProps = {
+      ...props,
+      params: {
+        ...props.params,
+        id: group.id,
+        groupId: group.id,
+      },
+    };
+
+    return (
+      <Component {...newProps} />
+    );
+  };
+
+  return GroupLookup;
+}
+
+export default GroupLookupHoc;
\ No newline at end of file
diff --git a/app/soapbox/components/hoc/with-hoc.tsx b/app/soapbox/components/hoc/with-hoc.tsx
new file mode 100644
index 000000000..d5752a45f
--- /dev/null
+++ b/app/soapbox/components/hoc/with-hoc.tsx
@@ -0,0 +1,11 @@
+type HOC<P, R> = (Component: React.ComponentType<P>) => React.ComponentType<R>
+type AsyncComponent<P> = () => Promise<{ default: React.ComponentType<P> }>
+
+const withHoc = <P, R>(asyncComponent: AsyncComponent<P>, hoc: HOC<P, R>) => {
+  return async () => {
+    const { default: component } = await asyncComponent();
+    return { default: hoc(component) };
+  };
+};
+
+export default withHoc;
\ No newline at end of file
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index b58f266ec..142db1047 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -20,6 +20,8 @@ import { fetchScheduledStatuses } from 'soapbox/actions/scheduled-statuses';
 import { connectUserStream } from 'soapbox/actions/streaming';
 import { fetchSuggestionsForTimeline } from 'soapbox/actions/suggestions';
 import { expandHomeTimeline } from 'soapbox/actions/timelines';
+import GroupLookupHoc from 'soapbox/components/hoc/group-lookup-hoc';
+import withHoc from 'soapbox/components/hoc/with-hoc';
 import SidebarNavigation from 'soapbox/components/sidebar-navigation';
 import ThumbNavigation from 'soapbox/components/thumb-navigation';
 import { Layout } from 'soapbox/components/ui';
@@ -137,6 +139,8 @@ import { WrappedRoute } from './util/react-router-helpers';
 // Without this it ends up in ~8 very commonly used bundles.
 import 'soapbox/components/status';
 
+const GroupTimelineSlug = withHoc(GroupTimeline as any, GroupLookupHoc);
+
 const EmptyPage = HomePage;
 
 const keyMap = {
@@ -305,6 +309,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groups && <WrappedRoute path='/groups/:id/manage/blocks' exact page={ManageGroupsPage} component={GroupBlockedMembers} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:id/manage/requests' exact page={ManageGroupsPage} component={GroupMembershipRequests} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:groupId/posts/:statusId' exact page={StatusPage} component={Status} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug' exact page={GroupPage} component={GroupTimelineSlug} content={children} />}
 
       <WrappedRoute path='/statuses/new' page={DefaultPage} component={NewStatus} content={children} exact />
       <WrappedRoute path='/statuses/:statusId' exact page={StatusPage} component={Status} content={children} />

From 1bce61182cea1a4f12984e389a510735fec56943 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 17 Apr 2023 15:28:20 -0400
Subject: [PATCH 142/298] Make components use groupId param

---
 .../components/hoc/group-lookup-hoc.tsx       | 25 ++++++++++++++---
 app/soapbox/features/group/edit-group.tsx     |  4 +--
 .../features/group/group-blocked-members.tsx  |  4 +--
 app/soapbox/features/group/group-gallery.tsx  |  2 +-
 app/soapbox/features/group/group-members.tsx  |  4 +--
 .../group/group-membership-requests.tsx       |  4 +--
 app/soapbox/features/group/group-timeline.tsx |  4 +--
 app/soapbox/features/group/manage-group.tsx   |  4 +--
 app/soapbox/features/ui/index.tsx             | 28 ++++++++++++++-----
 app/soapbox/pages/group-page.tsx              | 19 +++++++------
 10 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/app/soapbox/components/hoc/group-lookup-hoc.tsx b/app/soapbox/components/hoc/group-lookup-hoc.tsx
index 5c5f43c0c..b6a125eed 100644
--- a/app/soapbox/components/hoc/group-lookup-hoc.tsx
+++ b/app/soapbox/components/hoc/group-lookup-hoc.tsx
@@ -1,20 +1,27 @@
 import React from 'react';
 
+import ColumnLoading from 'soapbox/features/ui/components/column-loading';
 import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
-import { Spinner } from '../ui';
-
 interface IGroupLookup {
   params: {
     groupSlug: string
   }
 }
 
+interface IMaybeGroupLookup {
+  params?: {
+    groupSlug?: string
+    groupId?: string
+  }
+}
+
 function GroupLookupHoc(Component: React.ComponentType<{ params: { groupId: string } }>) {
   const GroupLookup: React.FC<IGroupLookup> = (props) => {
     const { entity: group } = useGroupLookup(props.params.groupSlug);
+
     if (!group) return (
-      <Spinner />
+      <ColumnLoading />
     );
 
     const newProps = {
@@ -31,7 +38,17 @@ function GroupLookupHoc(Component: React.ComponentType<{ params: { groupId: stri
     );
   };
 
-  return GroupLookup;
+  const MaybeGroupLookup: React.FC<IMaybeGroupLookup> = (props) => {
+    const { params } = props;
+
+    if (params?.groupId) {
+      return <Component {...props} params={{ ...params, groupId: params.groupId }} />;
+    } else {
+      return <GroupLookup {...props} params={{ ...params, groupSlug: params?.groupSlug || '' }} />;
+    }
+  };
+
+  return MaybeGroupLookup;
 }
 
 export default GroupLookupHoc;
\ No newline at end of file
diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index 1e8024f6f..296c39e7e 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -25,11 +25,11 @@ const messages = defineMessages({
 
 interface IEditGroup {
   params: {
-    id: string
+    groupId: string
   }
 }
 
-const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
+const EditGroup: React.FC<IEditGroup> = ({ params: { groupId } }) => {
   const intl = useIntl();
   const instance = useInstance();
 
diff --git a/app/soapbox/features/group/group-blocked-members.tsx b/app/soapbox/features/group/group-blocked-members.tsx
index a82f889c1..94b033837 100644
--- a/app/soapbox/features/group/group-blocked-members.tsx
+++ b/app/soapbox/features/group/group-blocked-members.tsx
@@ -12,7 +12,7 @@ import toast from 'soapbox/toast';
 
 import ColumnForbidden from '../ui/components/column-forbidden';
 
-type RouteParams = { id: string };
+type RouteParams = { groupId: string };
 
 const messages = defineMessages({
   heading: { id: 'column.group_blocked_members', defaultMessage: 'Banned Members' },
@@ -62,7 +62,7 @@ const GroupBlockedMembers: React.FC<IGroupBlockedMembers> = ({ params }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
-  const id = params?.id;
+  const id = params?.groupId;
 
   const { group } = useGroup(id);
   const accountIds = useAppSelector((state) => state.user_lists.group_blocks.get(id)?.items);
diff --git a/app/soapbox/features/group/group-gallery.tsx b/app/soapbox/features/group/group-gallery.tsx
index 139be5bf3..f8a259e50 100644
--- a/app/soapbox/features/group/group-gallery.tsx
+++ b/app/soapbox/features/group/group-gallery.tsx
@@ -16,7 +16,7 @@ import type { Attachment, Status } from 'soapbox/types/entities';
 const GroupGallery = () => {
   const dispatch = useAppDispatch();
 
-  const { id: groupId } = useParams<{ id: string }>();
+  const { groupId } = useParams<{ groupId: string }>();
 
   const { group, isLoading: groupIsLoading } = useGroup(groupId);
 
diff --git a/app/soapbox/features/group/group-members.tsx b/app/soapbox/features/group/group-members.tsx
index a3a790a62..fc04e3d29 100644
--- a/app/soapbox/features/group/group-members.tsx
+++ b/app/soapbox/features/group/group-members.tsx
@@ -16,13 +16,13 @@ import GroupMemberListItem from './components/group-member-list-item';
 import type { Group } from 'soapbox/types/entities';
 
 interface IGroupMembers {
-  params: { id: string }
+  params: { groupId: string }
 }
 
 export const MAX_ADMIN_COUNT = 5;
 
 const GroupMembers: React.FC<IGroupMembers> = (props) => {
-  const groupId = props.params.id;
+  const { groupId } = props.params;
 
   const features = useFeatures();
 
diff --git a/app/soapbox/features/group/group-membership-requests.tsx b/app/soapbox/features/group/group-membership-requests.tsx
index dc1190bbf..c83d45b06 100644
--- a/app/soapbox/features/group/group-membership-requests.tsx
+++ b/app/soapbox/features/group/group-membership-requests.tsx
@@ -14,7 +14,7 @@ import ColumnForbidden from '../ui/components/column-forbidden';
 
 import type { Account as AccountEntity } from 'soapbox/schemas';
 
-type RouteParams = { id: string };
+type RouteParams = { groupId: string };
 
 const messages = defineMessages({
   heading: { id: 'column.group_pending_requests', defaultMessage: 'Pending requests' },
@@ -54,7 +54,7 @@ interface IGroupMembershipRequests {
 }
 
 const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params }) => {
-  const id = params?.id;
+  const id = params?.groupId;
   const intl = useIntl();
 
   const { group } = useGroup(id);
diff --git a/app/soapbox/features/group/group-timeline.tsx b/app/soapbox/features/group/group-timeline.tsx
index f19da1777..53f570280 100644
--- a/app/soapbox/features/group/group-timeline.tsx
+++ b/app/soapbox/features/group/group-timeline.tsx
@@ -12,7 +12,7 @@ import { useGroup } from 'soapbox/hooks/api';
 
 import Timeline from '../ui/components/timeline';
 
-type RouteParams = { id: string };
+type RouteParams = { groupId: string };
 
 interface IGroupTimeline {
   params: RouteParams
@@ -22,7 +22,7 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
   const account = useOwnAccount();
   const dispatch = useAppDispatch();
 
-  const groupId = props.params.id;
+  const { groupId } = props.params;
 
   const { group } = useGroup(groupId);
 
diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 12dc0b11b..38b90e34b 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -14,7 +14,7 @@ import { TRUTHSOCIAL } from 'soapbox/utils/features';
 
 import ColumnForbidden from '../ui/components/column-forbidden';
 
-type RouteParams = { id: string };
+type RouteParams = { groupId: string };
 
 const messages = defineMessages({
   heading: { id: 'column.manage_group', defaultMessage: 'Manage group' },
@@ -35,7 +35,7 @@ interface IManageGroup {
 }
 
 const ManageGroup: React.FC<IManageGroup> = ({ params }) => {
-  const { id } = params;
+  const { groupId: id } = params;
 
   const backend = useBackend();
   const dispatch = useAppDispatch();
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 142db1047..c315591ac 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -140,6 +140,12 @@ import { WrappedRoute } from './util/react-router-helpers';
 import 'soapbox/components/status';
 
 const GroupTimelineSlug = withHoc(GroupTimeline as any, GroupLookupHoc);
+const GroupMembersSlug = withHoc(GroupMembers as any, GroupLookupHoc);
+const GroupGallerySlug = withHoc(GroupGallery as any, GroupLookupHoc);
+const ManageGroupSlug = withHoc(ManageGroup as any, GroupLookupHoc);
+const EditGroupSlug = withHoc(EditGroup as any, GroupLookupHoc);
+const GroupBlockedMembersSlug = withHoc(GroupBlockedMembers as any, GroupLookupHoc);
+const GroupMembershipRequestsSlug = withHoc(GroupMembershipRequests as any, GroupLookupHoc);
 
 const EmptyPage = HomePage;
 
@@ -301,15 +307,23 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groupsDiscovery && <WrappedRoute path='/groups/popular' exact page={GroupsPendingPage} component={GroupsPopular} content={children} />}
       {features.groupsDiscovery && <WrappedRoute path='/groups/suggested' exact page={GroupsPendingPage} component={GroupsSuggested} content={children} />}
       {features.groupsPending && <WrappedRoute path='/groups/pending-requests' exact page={GroupsPendingPage} component={PendingGroupRequests} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id' exact page={GroupPage} component={GroupTimeline} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/members' exact page={GroupPage} component={GroupMembers} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/media' publicRoute={!authenticatedProfile} component={GroupGallery} page={GroupPage} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage' exact page={ManageGroupsPage} component={ManageGroup} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage/edit' exact page={ManageGroupsPage} component={EditGroup} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage/blocks' exact page={ManageGroupsPage} component={GroupBlockedMembers} content={children} />}
-      {features.groups && <WrappedRoute path='/groups/:id/manage/requests' exact page={ManageGroupsPage} component={GroupMembershipRequests} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:groupId' exact page={GroupPage} component={GroupTimeline} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:groupId/members' exact page={GroupPage} component={GroupMembers} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:groupId/media' publicRoute={!authenticatedProfile} component={GroupGallery} page={GroupPage} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:groupId/manage' exact page={ManageGroupsPage} component={ManageGroup} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:groupId/manage/edit' exact page={ManageGroupsPage} component={EditGroup} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:groupId/manage/blocks' exact page={ManageGroupsPage} component={GroupBlockedMembers} content={children} />}
+      {features.groups && <WrappedRoute path='/groups/:groupId/manage/requests' exact page={ManageGroupsPage} component={GroupMembershipRequests} content={children} />}
       {features.groups && <WrappedRoute path='/groups/:groupId/posts/:statusId' exact page={StatusPage} component={Status} content={children} />}
+
       {features.groups && <WrappedRoute path='/group/:groupSlug' exact page={GroupPage} component={GroupTimelineSlug} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug/members' exact page={GroupPage} component={GroupMembersSlug} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug/media' publicRoute={!authenticatedProfile} component={GroupGallerySlug} page={GroupPage} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug/manage' exact page={ManageGroupsPage} component={ManageGroupSlug} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug/manage/edit' exact page={ManageGroupsPage} component={EditGroupSlug} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug/manage/blocks' exact page={ManageGroupsPage} component={GroupBlockedMembersSlug} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug/manage/requests' exact page={ManageGroupsPage} component={GroupMembershipRequestsSlug} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug/posts/:statusId' exact page={StatusPage} component={Status} content={children} />}
 
       <WrappedRoute path='/statuses/new' page={DefaultPage} component={NewStatus} content={children} exact />
       <WrappedRoute path='/statuses/:statusId' exact page={StatusPage} component={Status} content={children} />
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index 449e250f3..61e41ad25 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useRouteMatch } from 'react-router-dom';
 
+import GroupLookupHoc from 'soapbox/components/hoc/group-lookup-hoc';
 import { Column, Icon, Layout, Stack, Text } from 'soapbox/components/ui';
 import GroupHeader from 'soapbox/features/group/components/group-header';
 import LinkFooter from 'soapbox/features/ui/components/link-footer';
@@ -27,7 +28,7 @@ const messages = defineMessages({
 
 interface IGroupPage {
   params?: {
-    id?: string
+    groupId?: string
   }
   children: React.ReactNode
 }
@@ -64,7 +65,7 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   const match = useRouteMatch();
   const me = useOwnAccount();
 
-  const id = params?.id || '';
+  const id = params?.groupId || '';
 
   const { group } = useGroup(id);
   const { accounts: pending } = useGroupMembershipRequests(id);
@@ -76,19 +77,19 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   const items = [
     {
       text: intl.formatMessage(messages.all),
-      to: `/groups/${group?.id}`,
-      name: '/groups/:id',
+      to: group?.slug ? `/group/${group.slug}` : `/groups/${group?.id}`,
+      name: group?.slug ? '/group/:groupSlug' : '/groups/:groupId',
     },
     {
       text: intl.formatMessage(messages.members),
-      to: `/groups/${group?.id}/members`,
-      name: '/groups/:id/members',
+      to: group?.slug ? `/group/${group.slug}/members` : `/groups/${group?.id}/members`,
+      name: group?.slug ? '/group/:groupSlug/members' : '/groups/:groupId/members',
       count: pending.length,
     },
     {
       text: intl.formatMessage(messages.media),
-      to: `/groups/${group?.id}/media`,
-      name: '/groups/:id/media',
+      to: group?.slug ? `/group/${group.slug}/media` : `/groups/${group?.id}/media`,
+      name: group?.slug ? '/group/:groupSlug' : '/groups/:groupId/media',
     },
   ];
 
@@ -141,4 +142,4 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   );
 };
 
-export default GroupPage;
+export default GroupLookupHoc(GroupPage as any) as any;

From f2d5b2eaefafcf58eb6ace34c61edc5b6ec0d2a4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 17 Apr 2023 15:42:08 -0400
Subject: [PATCH 143/298] Update group URLs to use slugs

---
 .../components/groups/popover/group-popover.tsx      |  2 +-
 app/soapbox/components/status.tsx                    |  2 +-
 .../group/components/group-action-button.tsx         |  2 +-
 app/soapbox/features/group/group-blocked-members.tsx |  2 +-
 app/soapbox/features/group/group-members.tsx         |  5 ++++-
 app/soapbox/features/group/manage-group.tsx          |  8 ++++----
 .../groups/components/discover/group-grid-item.tsx   |  2 +-
 .../groups/components/discover/group-list-item.tsx   |  2 +-
 app/soapbox/features/groups/index.tsx                |  2 +-
 app/soapbox/features/groups/pending-requests.tsx     |  2 +-
 app/soapbox/features/status/index.tsx                |  7 +++++--
 app/soapbox/pages/group-page.tsx                     | 12 ++++++------
 12 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/app/soapbox/components/groups/popover/group-popover.tsx b/app/soapbox/components/groups/popover/group-popover.tsx
index 752deeb8a..ba2457fb3 100644
--- a/app/soapbox/components/groups/popover/group-popover.tsx
+++ b/app/soapbox/components/groups/popover/group-popover.tsx
@@ -80,7 +80,7 @@ const GroupPopover = (props: IGroupPopoverContainer) => {
           </Stack>
 
           <div className='px-4 pb-4'>
-            <Link to={`/groups/${group.id}`}>
+            <Link to={`/group/${group.slug}`}>
               <Button type='button' theme='secondary' block>
                 {intl.formatMessage(messages.action)}
               </Button>
diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 752e73636..24131159d 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -253,7 +253,7 @@ const Status: React.FC<IStatus> = (props) => {
       return (
         <StatusInfo
           avatarSize={avatarSize}
-          to={`/groups/${group.id}`}
+          to={`/group/${group.slug}`}
           icon={<Icon src={require('@tabler/icons/circles.svg')} className='h-4 w-4 text-primary-600 dark:text-accent-blue' />}
           text={
             <Text size='xs' theme='muted' weight='medium'>
diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index 96f807f9d..96653f97e 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -82,7 +82,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
     return (
       <Button
         theme='secondary'
-        to={`/groups/${group.id}/manage`}
+        to={`/group/${group.slug}/manage`}
       >
         <FormattedMessage id='group.manage' defaultMessage='Manage Group' />
       </Button>
diff --git a/app/soapbox/features/group/group-blocked-members.tsx b/app/soapbox/features/group/group-blocked-members.tsx
index 94b033837..988b90b1b 100644
--- a/app/soapbox/features/group/group-blocked-members.tsx
+++ b/app/soapbox/features/group/group-blocked-members.tsx
@@ -86,7 +86,7 @@ const GroupBlockedMembers: React.FC<IGroupBlockedMembers> = ({ params }) => {
   const emptyMessage = <FormattedMessage id='empty_column.group_blocks' defaultMessage="The group hasn't banned any users yet." />;
 
   return (
-    <Column label={intl.formatMessage(messages.heading)} backHref={`/groups/${id}/manage`}>
+    <Column label={intl.formatMessage(messages.heading)} backHref={`/group/${group.slug}/manage`}>
       <ScrollableList
         scrollKey='group_blocks'
         emptyMessage={emptyMessage}
diff --git a/app/soapbox/features/group/group-members.tsx b/app/soapbox/features/group/group-members.tsx
index fc04e3d29..36ccd05b7 100644
--- a/app/soapbox/features/group/group-members.tsx
+++ b/app/soapbox/features/group/group-members.tsx
@@ -58,7 +58,10 @@ const GroupMembers: React.FC<IGroupMembers> = (props) => {
         itemClassName='py-3 last:pb-0'
         prepend={(pendingCount > 0) && (
           <div className={clsx('py-3', { 'border-b border-gray-200 dark:border-gray-800': members.length })}>
-            <PendingItemsRow to={`/groups/${groupId}/manage/requests`} count={pendingCount} />
+            <PendingItemsRow
+              to={`/group/${group?.slug}/manage/requests`}
+              count={pendingCount}
+            />
           </div>
         )}
       >
diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 38b90e34b..dd3efe9cd 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -77,12 +77,12 @@ const ManageGroup: React.FC<IManageGroup> = ({ params }) => {
       },
     }));
 
-  const navigateToEdit = () => history.push(`/groups/${id}/manage/edit`);
-  const navigateToPending = () => history.push(`/groups/${id}/manage/requests`);
-  const navigateToBlocks = () => history.push(`/groups/${id}/manage/blocks`);
+  const navigateToEdit = () => history.push(`/group/${group.slug}/manage/edit`);
+  const navigateToPending = () => history.push(`/group/${group.slug}/manage/requests`);
+  const navigateToBlocks = () => history.push(`/group/${group.slug}/manage/blocks`);
 
   return (
-    <Column label={intl.formatMessage(messages.heading)} backHref={`/groups/${id}`}>
+    <Column label={intl.formatMessage(messages.heading)} backHref={`/group/${group.slug}`}>
       <CardBody className='space-y-4'>
         {isOwner && (
           <>
diff --git a/app/soapbox/features/groups/components/discover/group-grid-item.tsx b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
index 17d53225e..fd1168f4e 100644
--- a/app/soapbox/features/groups/components/discover/group-grid-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
@@ -25,7 +25,7 @@ const GroupGridItem = forwardRef((props: IGroup, ref: React.ForwardedRef<HTMLDiv
         width,
       }}
     >
-      <Link to={`/groups/${group.id}`}>
+      <Link to={`/group/${group.slug}`}>
         <Stack
           className='aspect-h-7 aspect-w-10 h-full w-full overflow-hidden rounded-lg'
           ref={ref}
diff --git a/app/soapbox/features/groups/components/discover/group-list-item.tsx b/app/soapbox/features/groups/components/discover/group-list-item.tsx
index cb492503f..9747eb8b7 100644
--- a/app/soapbox/features/groups/components/discover/group-list-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-list-item.tsx
@@ -21,7 +21,7 @@ const GroupListItem = (props: IGroup) => {
       alignItems='center'
       justifyContent='between'
     >
-      <Link key={group.id} to={`/groups/${group.id}`}>
+      <Link key={group.id} to={`/group/${group.slug}`}>
         <HStack alignItems='center' space={2}>
           <GroupAvatar
             group={group}
diff --git a/app/soapbox/features/groups/index.tsx b/app/soapbox/features/groups/index.tsx
index 2f6436cd5..0407ff8e0 100644
--- a/app/soapbox/features/groups/index.tsx
+++ b/app/soapbox/features/groups/index.tsx
@@ -106,7 +106,7 @@ const Groups: React.FC = () => {
         placeholderCount={3}
       >
         {groups.map((group) => (
-          <Link key={group.id} to={`/groups/${group.id}`}>
+          <Link key={group.id} to={`/group/${group.slug}`}>
             <GroupCard group={group} />
           </Link>
         ))}
diff --git a/app/soapbox/features/groups/pending-requests.tsx b/app/soapbox/features/groups/pending-requests.tsx
index cc9ceed1d..1233ff3a7 100644
--- a/app/soapbox/features/groups/pending-requests.tsx
+++ b/app/soapbox/features/groups/pending-requests.tsx
@@ -57,7 +57,7 @@ export default () => {
         showLoading={isLoading && groups.length === 0}
       >
         {groups.map((group) => (
-          <Link key={group.id} to={`/groups/${group.id}`}>
+          <Link key={group.id} to={`/group/${group.slug}`}>
             <GroupCard group={group} />
           </Link>
         ))}
diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 818d83720..aaae4b9c7 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -119,6 +119,7 @@ type DisplayMedia = 'default' | 'hide_all' | 'show_all';
 type RouteParams = {
   statusId: string
   groupId?: string
+  groupSlug?: string
 };
 
 interface IThread {
@@ -517,8 +518,10 @@ const Thread: React.FC<IThread> = (props) => {
     children.push(...renderChildren(descendantsIds).toArray());
   }
 
-  if (status.group && typeof status.group === 'object' && !props.params.groupId) {
-    return <Redirect to={`/groups/${status.group.id}/posts/${props.params.statusId}`} />;
+  if (status.group && typeof status.group === 'object') {
+    if (status.group.slug && !props.params.groupSlug) {
+      return <Redirect to={`/group/${status.group.slug}/posts/${props.params.statusId}`} />;
+    }
   }
 
   const titleMessage = () => {
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index 61e41ad25..13dda5467 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -77,19 +77,19 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   const items = [
     {
       text: intl.formatMessage(messages.all),
-      to: group?.slug ? `/group/${group.slug}` : `/groups/${group?.id}`,
-      name: group?.slug ? '/group/:groupSlug' : '/groups/:groupId',
+      to: `/group/${group?.slug}`,
+      name: '/group/:groupSlug',
     },
     {
       text: intl.formatMessage(messages.members),
-      to: group?.slug ? `/group/${group.slug}/members` : `/groups/${group?.id}/members`,
-      name: group?.slug ? '/group/:groupSlug/members' : '/groups/:groupId/members',
+      to: `/group/${group?.slug}/members`,
+      name: '/group/:groupSlug/members',
       count: pending.length,
     },
     {
       text: intl.formatMessage(messages.media),
-      to: group?.slug ? `/group/${group.slug}/media` : `/groups/${group?.id}/media`,
-      name: group?.slug ? '/group/:groupSlug' : '/groups/:groupId/media',
+      to: `/group/${group?.slug}/media`,
+      name: '/group/:groupSlug',
     },
   ];
 

From dea9979b3909623afa1883bd5e18b10977e32a40 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 17 Apr 2023 15:45:16 -0400
Subject: [PATCH 144/298] GroupLookup: improve column loading

---
 app/soapbox/components/hoc/group-lookup-hoc.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/components/hoc/group-lookup-hoc.tsx b/app/soapbox/components/hoc/group-lookup-hoc.tsx
index b6a125eed..a7c76eed6 100644
--- a/app/soapbox/components/hoc/group-lookup-hoc.tsx
+++ b/app/soapbox/components/hoc/group-lookup-hoc.tsx
@@ -3,6 +3,8 @@ import React from 'react';
 import ColumnLoading from 'soapbox/features/ui/components/column-loading';
 import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
+import { Layout } from '../ui';
+
 interface IGroupLookup {
   params: {
     groupSlug: string
@@ -21,7 +23,13 @@ function GroupLookupHoc(Component: React.ComponentType<{ params: { groupId: stri
     const { entity: group } = useGroupLookup(props.params.groupSlug);
 
     if (!group) return (
-      <ColumnLoading />
+      <>
+        <Layout.Main>
+          <ColumnLoading />
+        </Layout.Main>
+
+        <Layout.Aside />
+      </>
     );
 
     const newProps = {

From 7b544d2427cb62cc123b867d1433478e9911b8f7 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 17 Apr 2023 16:34:48 -0400
Subject: [PATCH 145/298] Group Link Preview

---
 app/soapbox/components/status-media.tsx       |  5 +++
 .../groups/components/group-link-preview.tsx  | 43 +++++++++++++++++++
 app/soapbox/normalizers/card.ts               | 12 ++++++
 3 files changed, 60 insertions(+)
 create mode 100644 app/soapbox/features/groups/components/group-link-preview.tsx

diff --git a/app/soapbox/components/status-media.tsx b/app/soapbox/components/status-media.tsx
index 0867e6ca2..192a4c169 100644
--- a/app/soapbox/components/status-media.tsx
+++ b/app/soapbox/components/status-media.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 
 import { openModal } from 'soapbox/actions/modals';
 import AttachmentThumbs from 'soapbox/components/attachment-thumbs';
+import { GroupLinkPreview } from 'soapbox/features/groups/components/group-link-preview';
 import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card';
 import Card from 'soapbox/features/status/components/card';
 import Bundle from 'soapbox/features/ui/components/bundle';
@@ -153,6 +154,10 @@ const StatusMedia: React.FC<IStatusMedia> = ({
         </Bundle>
       );
     }
+  } else if (status.spoiler_text.length === 0 && !status.quote && status.card?.group) {
+    media = (
+      <GroupLinkPreview card={status.card} />
+    );
   } else if (status.spoiler_text.length === 0 && !status.quote && status.card) {
     media = (
       <Card
diff --git a/app/soapbox/features/groups/components/group-link-preview.tsx b/app/soapbox/features/groups/components/group-link-preview.tsx
new file mode 100644
index 000000000..3cc7f1708
--- /dev/null
+++ b/app/soapbox/features/groups/components/group-link-preview.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { Avatar, Button, CardTitle, Stack } from 'soapbox/components/ui';
+import { type Card as StatusCard } from 'soapbox/types/entities';
+
+interface IGroupLinkPreview {
+  card: StatusCard
+}
+
+const GroupLinkPreview: React.FC<IGroupLinkPreview> = ({ card }) => {
+  const history = useHistory();
+
+  const { group } = card;
+  if (!group) return null;
+
+  const navigateToGroup = () => history.push(`/groups/${group.id}`);
+
+  return (
+    <Stack className='overflow-hidden rounded-lg border border-gray-300 text-center'>
+      <div
+        className='-mb-8 h-32 w-full bg-center'
+        style={{ backgroundImage: `url(${group.header})` }}
+      />
+
+      <Avatar
+        className='mx-auto border-4 border-white'
+        src={group.avatar}
+        size={64}
+      />
+
+      <Stack space={4} className='p-4'>
+        <CardTitle title={<span dangerouslySetInnerHTML={{ __html: group.display_name_html }} />} />
+
+        <Button theme='primary' onClick={navigateToGroup} block>
+          View Group
+        </Button>
+      </Stack>
+    </Stack>
+  );
+};
+
+export { GroupLinkPreview };
\ No newline at end of file
diff --git a/app/soapbox/normalizers/card.ts b/app/soapbox/normalizers/card.ts
index 536d12c38..5d0af42cf 100644
--- a/app/soapbox/normalizers/card.ts
+++ b/app/soapbox/normalizers/card.ts
@@ -7,6 +7,7 @@ import punycode from 'punycode';
 
 import { Record as ImmutableRecord, Map as ImmutableMap, fromJS } from 'immutable';
 
+import { groupSchema, type Group } from 'soapbox/schemas';
 import { mergeDefined } from 'soapbox/utils/normalizers';
 
 // https://docs.joinmastodon.org/entities/card/
@@ -16,6 +17,7 @@ export const CardRecord = ImmutableRecord({
   blurhash: null as string | null,
   description: '',
   embed_url: '',
+  group: null as null | Group,
   height: 0,
   html: '',
   image: null as string | null,
@@ -60,11 +62,21 @@ const normalizeProviderName = (card: ImmutableMap<string, any>) => {
   return card.set('provider_name', providerName);
 };
 
+const normalizeGroup = (card: ImmutableMap<string, any>) => {
+  try {
+    const group = groupSchema.parse(card.get('group').toJS());
+    return card.set('group', group);
+  } catch (_e) {
+    return card.set('group', null);
+  }
+};
+
 export const normalizeCard = (card: Record<string, any>) => {
   return CardRecord(
     ImmutableMap(fromJS(card)).withMutations(card => {
       normalizePleromaOpengraph(card);
       normalizeProviderName(card);
+      normalizeGroup(card);
     }),
   );
 };

From a461ef9f51b08285d6e3134648eac2b41ac5e2c5 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 17 Apr 2023 16:55:45 -0400
Subject: [PATCH 146/298] Fix endpoint

---
 app/soapbox/hooks/api/groups/useGroupTags.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/hooks/api/groups/useGroupTags.ts b/app/soapbox/hooks/api/groups/useGroupTags.ts
index 42d81688f..b2c29aa3c 100644
--- a/app/soapbox/hooks/api/groups/useGroupTags.ts
+++ b/app/soapbox/hooks/api/groups/useGroupTags.ts
@@ -10,7 +10,7 @@ function useGroupTags(groupId: string) {
 
   const { entities, ...result } = useEntities<GroupTag>(
     [Entities.GROUP_TAGS, groupId],
-    () => api.get(`api/v1/truth/trends/groups/${groupId}/tags`),
+    () => api.get(`/api/v1/truth/trends/groups/${groupId}/tags`),
     { schema: groupTagSchema },
   );
 

From 3f44e6cdcb8b7f27d2c5aecd5ad5ae86bde3dc0f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 18 Apr 2023 09:31:08 -0400
Subject: [PATCH 147/298] GroupLinkPreview: fix cursor

---
 app/soapbox/features/groups/components/group-link-preview.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/groups/components/group-link-preview.tsx b/app/soapbox/features/groups/components/group-link-preview.tsx
index 3cc7f1708..dc5770281 100644
--- a/app/soapbox/features/groups/components/group-link-preview.tsx
+++ b/app/soapbox/features/groups/components/group-link-preview.tsx
@@ -17,7 +17,7 @@ const GroupLinkPreview: React.FC<IGroupLinkPreview> = ({ card }) => {
   const navigateToGroup = () => history.push(`/groups/${group.id}`);
 
   return (
-    <Stack className='overflow-hidden rounded-lg border border-gray-300 text-center'>
+    <Stack className='cursor-default overflow-hidden rounded-lg border border-gray-300 text-center'>
       <div
         className='-mb-8 h-32 w-full bg-center'
         style={{ backgroundImage: `url(${group.header})` }}

From 19dfda4ca2080dce8f040e5f85f4e1aa9aee2e47 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 18 Apr 2023 09:39:09 -0400
Subject: [PATCH 148/298] GroupLinkPreview: dark mode

---
 app/soapbox/features/groups/components/group-link-preview.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/groups/components/group-link-preview.tsx b/app/soapbox/features/groups/components/group-link-preview.tsx
index dc5770281..be0e9f746 100644
--- a/app/soapbox/features/groups/components/group-link-preview.tsx
+++ b/app/soapbox/features/groups/components/group-link-preview.tsx
@@ -17,14 +17,14 @@ const GroupLinkPreview: React.FC<IGroupLinkPreview> = ({ card }) => {
   const navigateToGroup = () => history.push(`/groups/${group.id}`);
 
   return (
-    <Stack className='cursor-default overflow-hidden rounded-lg border border-gray-300 text-center'>
+    <Stack className='cursor-default overflow-hidden rounded-lg border border-gray-300 text-center dark:border-gray-800'>
       <div
         className='-mb-8 h-32 w-full bg-center'
         style={{ backgroundImage: `url(${group.header})` }}
       />
 
       <Avatar
-        className='mx-auto border-4 border-white'
+        className='mx-auto border-4 border-white dark:border-primary-900'
         src={group.avatar}
         size={64}
       />

From 70c2c5c4385cd84ea4b1be00bb484bdcaed9922b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 18 Apr 2023 10:00:18 -0400
Subject: [PATCH 149/298] GroupLinkPreview: link to slug URL

---
 app/soapbox/features/groups/components/group-link-preview.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/groups/components/group-link-preview.tsx b/app/soapbox/features/groups/components/group-link-preview.tsx
index be0e9f746..18ca586a5 100644
--- a/app/soapbox/features/groups/components/group-link-preview.tsx
+++ b/app/soapbox/features/groups/components/group-link-preview.tsx
@@ -14,7 +14,7 @@ const GroupLinkPreview: React.FC<IGroupLinkPreview> = ({ card }) => {
   const { group } = card;
   if (!group) return null;
 
-  const navigateToGroup = () => history.push(`/groups/${group.id}`);
+  const navigateToGroup = () => history.push(`/group/${group.slug}`);
 
   return (
     <Stack className='cursor-default overflow-hidden rounded-lg border border-gray-300 text-center dark:border-gray-800'>

From 2216dc4d4cc34a1bd9aaadcb273b4738c293b0f8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 18 Apr 2023 10:40:11 -0400
Subject: [PATCH 150/298] ProfileHoverCard: fix rounded corners

---
 app/soapbox/components/profile-hover-card.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/components/profile-hover-card.tsx b/app/soapbox/components/profile-hover-card.tsx
index 2dd6a3fdd..d0c8a93d4 100644
--- a/app/soapbox/components/profile-hover-card.tsx
+++ b/app/soapbox/components/profile-hover-card.tsx
@@ -106,7 +106,7 @@ export const ProfileHoverCard: React.FC<IProfileHoverCard> = ({ visible = true }
       onMouseEnter={handleMouseEnter(dispatch)}
       onMouseLeave={handleMouseLeave(dispatch)}
     >
-      <Card variant='rounded' className='relative isolate'>
+      <Card variant='rounded' className='relative isolate overflow-hidden'>
         <CardBody>
           <Stack space={2}>
             <BundleContainer fetchComponent={UserPanel}>

From 6ad99d10dc9a484388721d55fd73ae3475773248 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 18 Apr 2023 10:56:03 -0400
Subject: [PATCH 151/298] Improve spacing of ads

---
 app/soapbox/features/ads/components/ad.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/ads/components/ad.tsx b/app/soapbox/features/ads/components/ad.tsx
index 0895093b7..6af45db24 100644
--- a/app/soapbox/features/ads/components/ad.tsx
+++ b/app/soapbox/features/ads/components/ad.tsx
@@ -73,7 +73,7 @@ const Ad: React.FC<IAd> = ({ ad }) => {
 
   return (
     <div className='relative'>
-      <Card className='py-6 sm:p-5' variant='rounded'>
+      <Card className='py-4' variant='rounded'>
         <Stack space={4}>
           <HStack alignItems='center' space={3}>
             <Avatar src={instance.thumbnail} size={42} />

From de9e7b3c90c36b2ff771aa580da6d0d4ce4fdb58 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 18 Apr 2023 11:00:36 -0400
Subject: [PATCH 152/298] Thread: scroll into view accounting for sticky column
 header

---
 app/soapbox/features/status/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 28bde468b..393cb2ad9 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -403,7 +403,7 @@ const Thread: React.FC<IThread> = (props) => {
   useEffect(() => {
     scroller.current?.scrollToIndex({
       index: ancestorsIds.size,
-      offset: -80,
+      offset: -140,
     });
 
     setImmediate(() => statusRef.current?.querySelector<HTMLDivElement>('.detailed-actualStatus')?.focus());

From 0f29c5673cb205cc596f038698677de5c251076c Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 18 Apr 2023 12:03:42 -0400
Subject: [PATCH 153/298] Fix bug with slug in Group Media

---
 app/soapbox/features/group/group-gallery.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/group/group-gallery.tsx b/app/soapbox/features/group/group-gallery.tsx
index f8a259e50..f5b1164e7 100644
--- a/app/soapbox/features/group/group-gallery.tsx
+++ b/app/soapbox/features/group/group-gallery.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useParams } from 'react-router-dom';
 
 import { openModal } from 'soapbox/actions/modals';
 import LoadMore from 'soapbox/components/load-more';
@@ -13,10 +12,14 @@ import MediaItem from '../account-gallery/components/media-item';
 
 import type { Attachment, Status } from 'soapbox/types/entities';
 
-const GroupGallery = () => {
-  const dispatch = useAppDispatch();
+interface IGroupGallery {
+  params: { groupId: string }
+}
 
-  const { groupId } = useParams<{ groupId: string }>();
+const GroupGallery: React.FC<IGroupGallery> = (props) => {
+  const { groupId } = props.params;
+
+  const dispatch = useAppDispatch();
 
   const { group, isLoading: groupIsLoading } = useGroup(groupId);
 

From e88be5fadacecf575d6aefa398f1e201a6abfeb8 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 18 Apr 2023 12:03:52 -0400
Subject: [PATCH 154/298] Fix spacing

---
 app/soapbox/features/group/group-gallery.tsx | 23 ++++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/soapbox/features/group/group-gallery.tsx b/app/soapbox/features/group/group-gallery.tsx
index f5b1164e7..96ed47e13 100644
--- a/app/soapbox/features/group/group-gallery.tsx
+++ b/app/soapbox/features/group/group-gallery.tsx
@@ -27,6 +27,7 @@ const GroupGallery: React.FC<IGroupGallery> = (props) => {
     entities: statuses,
     fetchNextPage,
     isLoading,
+    isFetching,
     hasNextPage,
   } = useGroupMedia(groupId);
 
@@ -48,21 +49,25 @@ const GroupGallery: React.FC<IGroupGallery> = (props) => {
 
   if (isLoading || groupIsLoading) {
     return (
-      <Column>
-        <Spinner />
+      <Column transparent withHeader={false}>
+        <div className='pt-6'>
+          <Spinner />
+        </div>
       </Column>
     );
   }
 
   if (!group) {
     return (
-      <MissingIndicator />
+      <div className='pt-6'>
+        <MissingIndicator nested />
+      </div>
     );
   }
 
   return (
     <Column label={group.display_name} transparent withHeader={false}>
-      <div role='feed' className='grid grid-cols-2 gap-2 sm:grid-cols-3'>
+      <div role='feed' className='mt-4 grid grid-cols-2 gap-2 sm:grid-cols-3'>
         {attachments.map((attachment) => (
           <MediaItem
             key={`${attachment.status.id}+${attachment.id}`}
@@ -76,16 +81,10 @@ const GroupGallery: React.FC<IGroupGallery> = (props) => {
             <FormattedMessage id='account_gallery.none' defaultMessage='No media to show.' />
           </div>
         )}
-
-        {(hasNextPage && !isLoading) && (
-          <LoadMore className='my-auto' visible={!isLoading} onClick={fetchNextPage} />
-        )}
       </div>
 
-      {isLoading && (
-        <div className='slist__append'>
-          <Spinner />
-        </div>
+      {hasNextPage && (
+        <LoadMore className='mt-4' disabled={isFetching} onClick={fetchNextPage} />
       )}
     </Column>
   );

From fcf6d258effd610f72d1c386a13106b98fd307db Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 18 Apr 2023 16:51:55 -0400
Subject: [PATCH 155/298] Prevent request to endpoint if not member

---
 .../features/ui/components/group-media-panel.tsx      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/ui/components/group-media-panel.tsx b/app/soapbox/features/ui/components/group-media-panel.tsx
index 85432d74c..1d9428f33 100644
--- a/app/soapbox/features/ui/components/group-media-panel.tsx
+++ b/app/soapbox/features/ui/components/group-media-panel.tsx
@@ -21,6 +21,9 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
 
   const [loading, setLoading] = useState(true);
 
+  const isMember = !!group?.relationship?.member;
+  const isPrivate = group?.locked;
+
   const attachments: ImmutableList<Attachment> = useAppSelector((state) => group ? getGroupGallery(state, group?.id) : ImmutableList());
 
   const handleOpenMedia = (attachment: Attachment): void => {
@@ -37,13 +40,13 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
   useEffect(() => {
     setLoading(true);
 
-    if (group) {
+    if (group && (isMember || !isPrivate)) {
       dispatch(expandGroupMediaTimeline(group.id))
       // @ts-ignore
         .then(() => setLoading(false))
         .catch(() => {});
     }
-  }, [group?.id]);
+  }, [group?.id, isMember, isPrivate]);
 
   const renderAttachments = () => {
     const nineAttachments = attachments.slice(0, 9);
@@ -69,6 +72,10 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
     }
   };
 
+  if (isPrivate && !isMember) {
+    return null;
+  }
+
   return (
     <Widget title={<FormattedMessage id='media_panel.title' defaultMessage='Media' />}>
       {group && (

From 776cc1e5bbc723df007a2d0079957f86d18d1d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 19 Apr 2023 15:20:19 +0200
Subject: [PATCH 156/298] Move ScheduleForm below SpoilerInput in ComposeForm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/features/compose/components/compose-form.tsx  | 3 ++-
 app/soapbox/features/compose/components/schedule-form.tsx | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx
index 321b30aa2..5940dd7dd 100644
--- a/app/soapbox/features/compose/components/compose-form.tsx
+++ b/app/soapbox/features/compose/components/compose-form.tsx
@@ -319,7 +319,6 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
           <Stack space={4} className='compose-form__modifiers'>
             <UploadForm composeId={id} />
             <PollForm composeId={id} />
-            <ScheduleFormContainer composeId={id} />
 
             <SpoilerInput
               composeId={id}
@@ -328,6 +327,8 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
               onSuggestionSelected={onSpoilerSuggestionSelected}
               ref={spoilerTextRef}
             />
+
+            <ScheduleFormContainer composeId={id} />
           </Stack>
         }
       </AutosuggestTextarea>
diff --git a/app/soapbox/features/compose/components/schedule-form.tsx b/app/soapbox/features/compose/components/schedule-form.tsx
index 4c293662f..769dc6a97 100644
--- a/app/soapbox/features/compose/components/schedule-form.tsx
+++ b/app/soapbox/features/compose/components/schedule-form.tsx
@@ -52,8 +52,8 @@ const ScheduleForm: React.FC<IScheduleForm> = ({ composeId }) => {
   }
 
   return (
-    <Stack className='mb-2' space={1}>
-      <Text theme='muted'>
+    <Stack space={2}>
+      <Text weight='medium'>
         <FormattedMessage id='datepicker.hint' defaultMessage='Scheduled to post at…' />
       </Text>
       <HStack space={2} alignItems='center'>

From 2cce0435b433995854537b4bf5ac0848666c8b4b Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 10:09:03 -0400
Subject: [PATCH 157/298] Improve StatusInfo for reposting from groups

---
 app/soapbox/components/status.tsx             | 92 ++++++++++++++-----
 .../components/statuses/status-info.tsx       | 41 +++++----
 .../status/components/detailed-status.tsx     | 29 +++---
 3 files changed, 110 insertions(+), 52 deletions(-)

diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 24131159d..8456a46a4 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import React, { useEffect, useRef, useState } from 'react';
 import { HotKeys } from 'react-hotkeys';
 import { useIntl, FormattedMessage, defineMessages } from 'react-intl';
-import { useHistory } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 
 import { mentionCompose, replyCompose } from 'soapbox/actions/compose';
 import { toggleFavourite, toggleReblog } from 'soapbox/actions/interactions';
@@ -211,11 +211,50 @@ const Status: React.FC<IStatus> = (props) => {
   };
 
   const renderStatusInfo = () => {
-    if (isReblog) {
+    if (isReblog && showGroup && group) {
+      return (
+        <StatusInfo
+          avatarSize={avatarSize}
+          icon={<Icon src={require('@tabler/icons/repeat.svg')} className='h-4 w-4 text-green-600' />}
+          text={
+            <FormattedMessage
+              id='status.reblogged_by_with_group'
+              defaultMessage='{name} reposted from {group}'
+              values={{
+                name: (
+                  <Link
+                    to={`/@${status.getIn(['account', 'acct'])}`}
+                    className='hover:underline'
+                  >
+                    <bdi className='truncate'>
+                      <strong
+                        className='text-gray-800 dark:text-gray-200'
+                        dangerouslySetInnerHTML={{
+                          __html: String(status.getIn(['account', 'display_name_html'])),
+                        }}
+                      />
+                    </bdi>
+                  </Link>
+                ),
+                group: (
+                  <Link to={`/group/${(status.group as GroupEntity).slug}`} className='hover:underline'>
+                    <strong
+                      className='text-gray-800 dark:text-gray-200'
+                      dangerouslySetInnerHTML={{
+                        __html: (status.group as GroupEntity).display_name_html,
+                      }}
+                    />
+                  </Link>
+                ),
+              }}
+            />
+          }
+        />
+      );
+    } else if (isReblog) {
       return (
         <StatusInfo
           avatarSize={avatarSize}
-          to={`/@${status.getIn(['account', 'acct'])}`}
           icon={<Icon src={require('@tabler/icons/repeat.svg')} className='h-4 w-4 text-green-600' />}
           text={
             <FormattedMessage
@@ -223,14 +262,16 @@ const Status: React.FC<IStatus> = (props) => {
               defaultMessage='{name} reposted'
               values={{
                 name: (
-                  <bdi className='truncate pr-1 rtl:pl-1'>
-                    <strong
-                      className='text-gray-800 dark:text-gray-200'
-                      dangerouslySetInnerHTML={{
-                        __html: String(status.getIn(['account', 'display_name_html'])),
-                      }}
-                    />
-                  </bdi>
+                  <Link to={`/@${status.getIn(['account', 'acct'])}`} className='hover:underline'>
+                    <bdi className='truncate'>
+                      <strong
+                        className='text-gray-800 dark:text-gray-200'
+                        dangerouslySetInnerHTML={{
+                          __html: String(status.getIn(['account', 'display_name_html'])),
+                        }}
+                      />
+                    </bdi>
+                  </Link>
                 ),
               }}
             />
@@ -243,9 +284,7 @@ const Status: React.FC<IStatus> = (props) => {
           avatarSize={avatarSize}
           icon={<Icon src={require('@tabler/icons/pinned.svg')} className='h-4 w-4 text-gray-600 dark:text-gray-400' />}
           text={
-            <Text size='xs' theme='muted' weight='medium'>
-              <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
-            </Text>
+            <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
           }
         />
       );
@@ -253,18 +292,23 @@ const Status: React.FC<IStatus> = (props) => {
       return (
         <StatusInfo
           avatarSize={avatarSize}
-          to={`/group/${group.slug}`}
           icon={<Icon src={require('@tabler/icons/circles.svg')} className='h-4 w-4 text-primary-600 dark:text-accent-blue' />}
           text={
-            <Text size='xs' theme='muted' weight='medium'>
-              <FormattedMessage
-                id='status.group'
-                defaultMessage='Posted in {group}'
-                values={{ group: (
-                  <span dangerouslySetInnerHTML={{ __html: group.display_name_html }} />
-                ) }}
-              />
-            </Text>
+            <FormattedMessage
+              id='status.group'
+              defaultMessage='Posted in {group}'
+              values={{
+                group: (
+                  <Link to={`/group/${group.slug}`} className='hover:underline'>
+                    <bdi className='truncate'>
+                      <strong className='text-gray-800 dark:text-gray-200'>
+                        <span dangerouslySetInnerHTML={{ __html: group.display_name_html }} />
+                      </strong>
+                    </bdi>
+                  </Link>
+                ),
+              }}
+            />
           }
         />
       );
diff --git a/app/soapbox/components/statuses/status-info.tsx b/app/soapbox/components/statuses/status-info.tsx
index 322a911bc..50fad86b3 100644
--- a/app/soapbox/components/statuses/status-info.tsx
+++ b/app/soapbox/components/statuses/status-info.tsx
@@ -1,37 +1,44 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
+
+import { HStack, Text } from '../ui';
 
 interface IStatusInfo {
   avatarSize: number
-  to?: string
   icon: React.ReactNode
   text: React.ReactNode
 }
 
 const StatusInfo = (props: IStatusInfo) => {
-  const { avatarSize, to, icon, text } = props;
+  const { avatarSize, icon, text } = props;
 
-  const onClick = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
+  const onClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
     event.stopPropagation();
   };
 
-  const Container = to ? Link : 'div';
-  const containerProps: any = to ? { onClick, to } : {};
-
   return (
-    <Container
-      {...containerProps}
-      className='flex items-center space-x-3 text-xs font-medium text-gray-700 hover:underline rtl:space-x-reverse dark:text-gray-600'
+    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+    <div
+      // eslint-disable-next-line jsx-a11y/aria-role
+      role='status-info'
+      onClick={onClick}
     >
-      <div
-        className='flex justify-end'
-        style={{ width: avatarSize }}
+      <HStack
+        space={3}
+        alignItems='center'
+        className='cursor-default text-xs font-medium text-gray-700 rtl:space-x-reverse dark:text-gray-600'
       >
-        {icon}
-      </div>
+        <div
+          className='flex justify-end'
+          style={{ width: avatarSize }}
+        >
+          {icon}
+        </div>
 
-      {text}
-    </Container>
+        <Text size='xs' theme='muted' weight='medium'>
+          {text}
+        </Text>
+      </HStack>
+    </div>
   );
 };
 
diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx
index 05e435d4e..2959d285d 100644
--- a/app/soapbox/features/status/components/detailed-status.tsx
+++ b/app/soapbox/features/status/components/detailed-status.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { FormattedDate, FormattedMessage, useIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 
 import Account from 'soapbox/components/account';
 import StatusContent from 'soapbox/components/status-content';
@@ -56,22 +57,28 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
         <div className='mb-4'>
           <StatusInfo
             avatarSize={42}
-            to={`/groups/${(status.group as Group).id}`}
             icon={
               <Icon
                 src={require('@tabler/icons/circles.svg')}
                 className='h-4 w-4 text-primary-600 dark:text-accent-blue'
-              />}
+              />
+            }
             text={
-              <Text size='xs' theme='muted' weight='medium'>
-                <FormattedMessage
-                  id='status.group'
-                  defaultMessage='Posted in {group}'
-                  values={{ group: (
-                    <span dangerouslySetInnerHTML={{ __html: (status.group as Group).display_name_html }} />
-                  ) }}
-                />
-              </Text>
+              <FormattedMessage
+                id='status.group'
+                defaultMessage='Posted in {group}'
+                values={{
+                  group: (
+                    <Link to={`/group/${(status.group as Group).slug}`} className='hover:underline'>
+                      <bdi className='truncate'>
+                        <strong className='text-gray-800 dark:text-gray-200'>
+                          <span dangerouslySetInnerHTML={{ __html: (status.group as Group).display_name_html }} />
+                        </strong>
+                      </bdi>
+                    </Link>
+                  ),
+                }}
+              />
             }
           />
         </div>

From 5dbaba3c415db9ac74de4f9021fe433c1f802daa Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 10:20:23 -0400
Subject: [PATCH 158/298] Add locale

---
 app/soapbox/locales/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 35bfb58a0..f7f1f20e1 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1469,6 +1469,7 @@
   "status.reblog": "Repost",
   "status.reblog_private": "Repost to original audience",
   "status.reblogged_by": "{name} reposted",
+  "status.reblogged_by_with_group": "{name} reposted from {group}",
   "status.reblogs.empty": "No one has reposted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_account_from_group": "Remove account from group",

From 666c95e0b56637c1c827e70c5f10c41ca7bdd12f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 19 Apr 2023 10:55:00 -0400
Subject: [PATCH 159/298] Groups: set composer visibilty when quoting a group
 post

---
 app/soapbox/reducers/compose.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/soapbox/reducers/compose.ts b/app/soapbox/reducers/compose.ts
index cfce14a5a..7aefbae25 100644
--- a/app/soapbox/reducers/compose.ts
+++ b/app/soapbox/reducers/compose.ts
@@ -349,6 +349,15 @@ export default function compose(state = initialState, action: AnyAction) {
         map.set('content_type', defaultCompose.content_type);
         map.set('spoiler', false);
         map.set('spoiler_text', '');
+
+        if (action.status.visibility === 'group') {
+          if (action.status.group?.group_visibility === 'everyone') {
+            map.set('privacy', privacyPreference('public', defaultCompose.privacy));
+          } else if (action.status.group?.group_visibility === 'members_only') {
+            map.set('group_id', action.status.getIn(['group', 'id']) || action.status.get('group'));
+            map.set('privacy', 'group');
+          }
+        }
       }));
     case COMPOSE_SUBMIT_REQUEST:
       return updateCompose(state, action.id, compose => compose.set('is_submitting', true));

From bc72b1822ec8f9df9e4215c6f2015fc4a6f1b1a8 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 16:22:34 -0400
Subject: [PATCH 160/298] Support pagination in My Groups

---
 app/soapbox/features/groups/index.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/groups/index.tsx b/app/soapbox/features/groups/index.tsx
index 0407ff8e0..7528989f6 100644
--- a/app/soapbox/features/groups/index.tsx
+++ b/app/soapbox/features/groups/index.tsx
@@ -30,12 +30,16 @@ const Groups: React.FC = () => {
   const [searchValue, setSearchValue] = useState<string>('');
   const debouncedValue = debounce(searchValue, 300);
 
-  const { groups, isLoading } = useGroups(debouncedValue);
+  const { groups, isLoading, hasNextPage, fetchNextPage } = useGroups(debouncedValue);
 
-  const createGroup = () => {
-    dispatch(openModal('CREATE_GROUP'));
+  const handleLoadMore = () => {
+    if (hasNextPage) {
+      fetchNextPage();
+    }
   };
 
+  const createGroup = () => dispatch(openModal('CREATE_GROUP'));
+
   const renderBlankslate = () => (
     <Stack space={4} alignItems='center' justifyContent='center' className='py-6'>
       <Stack space={2} className='max-w-sm'>
@@ -104,6 +108,8 @@ const Groups: React.FC = () => {
         showLoading={isLoading && groups.length === 0}
         placeholderComponent={PlaceholderGroupCard}
         placeholderCount={3}
+        onLoadMore={handleLoadMore}
+        hasMore={hasNextPage}
       >
         {groups.map((group) => (
           <Link key={group.id} to={`/group/${group.slug}`}>

From 2516fd36e0bbbfedc4de7e153b58008a058ff62d Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 16:28:15 -0400
Subject: [PATCH 161/298] Update 'Create Group' modal title dynamically

---
 .../manage-group-modal/create-group-modal.tsx | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
index bbeb2d43e..068cf82ec 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
@@ -33,7 +33,9 @@ const CreateGroupModal: React.FC<ICreateGroupModal> = ({ onClose }) => {
   const debounce = useDebounce;
 
   const [group, setGroup] = useState<Group | null>(null);
-  const [params, setParams] = useState<CreateGroupParams>({});
+  const [params, setParams] = useState<CreateGroupParams>({
+    group_visibility: 'everyone',
+  });
   const [currentStep, setCurrentStep] = useState<Steps>(Steps.ONE);
 
   const { createGroup, isSubmitting } = useCreateGroup();
@@ -96,9 +98,22 @@ const CreateGroupModal: React.FC<ICreateGroupModal> = ({ onClose }) => {
     }
   };
 
+  const renderModalTitle = () => {
+    switch (currentStep) {
+      case Steps.ONE:
+        return <FormattedMessage id='navigation_bar.create_group' defaultMessage='Create Group' />;
+      default:
+        if (params.group_visibility === 'everyone') {
+          return <FormattedMessage id='navigation_bar.create_group.public' defaultMessage='Create Public Group' />;
+        } else {
+          return <FormattedMessage id='navigation_bar.create_group.private' defaultMessage='Create Private Group' />;
+        }
+    }
+  };
+
   return (
     <Modal
-      title={<FormattedMessage id='navigation_bar.create_group' defaultMessage='Create Group' />}
+      title={renderModalTitle()}
       confirmationAction={handleNextStep}
       confirmationText={confirmationText}
       confirmationDisabled={isSubmitting || (currentStep === Steps.TWO && !isValid)}

From e43a9164b7b96f7d460d28437e46e32e0df2b180 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 16:44:00 -0400
Subject: [PATCH 162/298] Update modal title in Group creation

---
 .../modals/manage-group-modal/create-group-modal.tsx          | 2 +-
 app/soapbox/locales/en.json                                   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
index 068cf82ec..9f5d143a7 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
@@ -14,7 +14,7 @@ import PrivacyStep from './steps/privacy-step';
 
 const messages = defineMessages({
   next: { id: 'manage_group.next', defaultMessage: 'Next' },
-  create: { id: 'manage_group.create', defaultMessage: 'Create' },
+  create: { id: 'manage_group.create', defaultMessage: 'Create Group' },
   done: { id: 'manage_group.done', defaultMessage: 'Done' },
 });
 
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index f7f1f20e1..8e5c8e306 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -965,7 +965,7 @@
   "manage_group.confirmation.info_3": "Share your new group with friends, family and followers to grow its membership.",
   "manage_group.confirmation.share": "Share this group",
   "manage_group.confirmation.title": "You’re all set!",
-  "manage_group.create": "Create",
+  "manage_group.create": "Create Group",
   "manage_group.delete_group": "Delete group",
   "manage_group.done": "Done",
   "manage_group.edit_group": "Edit group",
@@ -1055,6 +1055,8 @@
   "navigation_bar.compose_reply": "Reply to post",
   "navigation_bar.create_event": "Create new event",
   "navigation_bar.create_group": "Create Group",
+  "navigation_bar.create_group.private": "Create Private Group",
+  "navigation_bar.create_group.public": "Create Public Group",
   "navigation_bar.domain_blocks": "Domain blocks",
   "navigation_bar.edit_group": "Edit Group",
   "navigation_bar.favourites": "Likes",

From 68be77fa542f3eabaa57ab6ff5da9b744ad76f20 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 16:44:22 -0400
Subject: [PATCH 163/298] Use 'copy' function for copying group uri

---
 .../steps/confirmation-step.tsx                   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index 7db6d9c20..af1a5c363 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { Avatar, Divider, HStack, Stack, Text, Button } from 'soapbox/components/ui';
+import copy from 'soapbox/utils/copy';
 
 import type { Group } from 'soapbox/schemas';
 
@@ -10,11 +11,7 @@ interface IConfirmationStep {
 }
 
 const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
-  const handleCopyLink = () => {
-    if (navigator.clipboard) {
-      navigator.clipboard.writeText(group.uri);
-    }
-  };
+  const handleCopyLink = () => copy(group.uri);
 
   const handleShare = () => {
     navigator.share({
@@ -90,9 +87,11 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
           </Button>
         )}
 
-        <Button onClick={handleCopyLink} theme='transparent' icon={require('@tabler/icons/link.svg')} className='text-primary-600'>
-          <FormattedMessage id='manage_group.confirmation.copy' defaultMessage='Copy link' />
-        </Button>
+        {group.uri && (
+          <Button onClick={handleCopyLink} theme='transparent' icon={require('@tabler/icons/link.svg')} className='text-primary-600'>
+            <FormattedMessage id='manage_group.confirmation.copy' defaultMessage='Copy link' />
+          </Button>
+        )}
       </HStack>
     </Stack>
   );

From 2813b02329aec05851cdfb6340018d402a91168d Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 16:45:26 -0400
Subject: [PATCH 164/298] Coerce group 'id' into String

---
 app/soapbox/schemas/group.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/schemas/group.ts b/app/soapbox/schemas/group.ts
index 827531ee7..746ae9d33 100644
--- a/app/soapbox/schemas/group.ts
+++ b/app/soapbox/schemas/group.ts
@@ -22,7 +22,7 @@ const groupSchema = z.object({
   group_visibility: z.string().catch(''), // TruthSocial
   header: z.string().catch(headerMissing),
   header_static: z.string().catch(''),
-  id: z.string(),
+  id: z.coerce.string(),
   locked: z.boolean().catch(false),
   membership_required: z.boolean().catch(false),
   members_count: z.number().catch(0),

From c87589be4ecd17db2abdf7fc854b477772a98645 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 16:51:07 -0400
Subject: [PATCH 165/298] Build group URI and handle successful copying

---
 .../steps/confirmation-step.tsx               | 23 +++++++++++++------
 app/soapbox/utils/copy.ts                     | 10 +++++++-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index af1a5c363..f0be4f73b 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { Avatar, Divider, HStack, Stack, Text, Button } from 'soapbox/components/ui';
+import toast from 'soapbox/toast';
 import copy from 'soapbox/utils/copy';
 
 import type { Group } from 'soapbox/schemas';
@@ -10,8 +11,18 @@ interface IConfirmationStep {
   group: Group
 }
 
+const messages = defineMessages({
+  copied: { id: 'copy.success', defaultMessage: 'Copied to clipboard!' },
+});
+
 const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
-  const handleCopyLink = () => copy(group.uri);
+  const intl = useIntl();
+
+  const handleCopyLink = () => {
+    copy(`${window.location.origin}/group/${group.slug}`, () => {
+      toast.success(intl.formatMessage(messages.copied));
+    });
+  };
 
   const handleShare = () => {
     navigator.share({
@@ -87,11 +98,9 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
           </Button>
         )}
 
-        {group.uri && (
-          <Button onClick={handleCopyLink} theme='transparent' icon={require('@tabler/icons/link.svg')} className='text-primary-600'>
-            <FormattedMessage id='manage_group.confirmation.copy' defaultMessage='Copy link' />
-          </Button>
-        )}
+        <Button onClick={handleCopyLink} theme='transparent' icon={require('@tabler/icons/link.svg')} className='text-primary-600'>
+          <FormattedMessage id='manage_group.confirmation.copy' defaultMessage='Copy link' />
+        </Button>
       </HStack>
     </Stack>
   );
diff --git a/app/soapbox/utils/copy.ts b/app/soapbox/utils/copy.ts
index 4eea324f5..57aa2de8c 100644
--- a/app/soapbox/utils/copy.ts
+++ b/app/soapbox/utils/copy.ts
@@ -1,6 +1,10 @@
-const copy = (text: string) => {
+const copy = (text: string, onSuccess?: () => void) => {
   if (navigator.clipboard) {
     navigator.clipboard.writeText(text);
+
+    if (onSuccess) {
+      onSuccess();
+    }
   } else {
     const textarea = document.createElement('textarea');
 
@@ -16,6 +20,10 @@ const copy = (text: string) => {
     // Do nothing
     } finally {
       document.body.removeChild(textarea);
+
+      if (onSuccess) {
+        onSuccess();
+      }
     }
   }
 };

From 67a5240e43e4f7c8565b89362aff14b36e07fc38 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 20 Apr 2023 09:51:40 -0400
Subject: [PATCH 166/298] Add locale

---
 app/soapbox/locales/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 8e5c8e306..8a8e23db7 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -528,6 +528,7 @@
   "confirmations.scheduled_status_delete.heading": "Cancel scheduled post",
   "confirmations.scheduled_status_delete.message": "Are you sure you want to cancel this scheduled post?",
   "confirmations.unfollow.confirm": "Unfollow",
+  "copy.success": "Copied to clipboard!",
   "crypto_donate.explanation_box.message": "{siteTitle} accepts cryptocurrency donations. You may send a donation to any of the addresses below. Thank you for your support!",
   "crypto_donate.explanation_box.title": "Sending cryptocurrency donations",
   "crypto_donate_panel.actions.view": "Click to see {count, plural, one {# wallet} other {# wallets}}",

From 65bab5e7865f895b3a060b3f9f9d53d7b70ca67a Mon Sep 17 00:00:00 2001
From: Soapbox Bot <soapbox+bot@alexgleason.me>
Date: Thu, 20 Apr 2023 21:04:44 +0000
Subject: [PATCH 167/298] Update Node.js to v20

---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 2 +-
 Dockerfile.dev | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9516ec2d6..97892e166 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: node:18
+image: node:20
 
 variables:
   NODE_ENV: test
diff --git a/Dockerfile b/Dockerfile
index bfb7c2e48..b02bf86e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18 as build
+FROM node:20 as build
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 8d1655db0..1e6056945 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:20
 
 RUN apt-get update &&\
     apt-get install -y inotify-tools &&\

From 7842f8e7dca4c4954d9b9467e99da361834bf70e Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 21 Apr 2023 09:36:08 -0400
Subject: [PATCH 168/298] Only owners can edit tags

---
 .../features/group/components/group-tag-list-item.tsx     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index 47f9f1ef6..fdea2e492 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -39,8 +39,6 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
   const { updateGroupTag } = useUpdateGroupTag(group.id, tag.id);
 
   const isOwner = group.relationship?.role === GroupRoles.OWNER;
-  const isAdmin = group.relationship?.role === GroupRoles.ADMIN;
-  const canEdit = isOwner || isAdmin;
 
   const toggleVisibility = () => {
     updateGroupTag({
@@ -127,12 +125,12 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
         <Stack>
           <Text
             weight='bold'
-            theme={(tag.visible || !canEdit) ? 'default' : 'subtle'}
+            theme={(tag.visible || !isOwner) ? 'default' : 'subtle'}
             className='group-hover:underline'
           >
             #{tag.name}
           </Text>
-          <Text size='sm' theme={(tag.visible || !canEdit) ? 'muted' : 'subtle'}>
+          <Text size='sm' theme={(tag.visible || !isOwner) ? 'muted' : 'subtle'}>
             {intl.formatMessage(messages.total)}:
             {' '}
             <Text size='sm' theme='inherit' weight='semibold' tag='span'>
@@ -142,7 +140,7 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
         </Stack>
       </Link>
 
-      {canEdit ? (
+      {isOwner ? (
         <HStack alignItems='center' space={2}>
           {tag.visible ? (
             renderPinIcon()

From 6977d305bfd7601c01fa382935f66c78a51d145d Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 21 Apr 2023 09:36:26 -0400
Subject: [PATCH 169/298] Fix route to tag path

---
 app/soapbox/features/group/components/group-tag-list-item.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index fdea2e492..e4d718695 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -121,7 +121,7 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
 
   return (
     <HStack alignItems='center' justifyContent='between'>
-      <Link to={`/groups/${group.id}/tag/${tag.id}`} className='group grow'>
+      <Link to={`/group/${group.slug}/tag/${tag.id}`} className='group grow'>
         <Stack>
           <Text
             weight='bold'

From ed4b86c5fa4da12c8f2e8f633895879f93e28c12 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 21 Apr 2023 09:36:37 -0400
Subject: [PATCH 170/298] Add page to show statuses per tag

---
 app/soapbox/actions/timelines.ts              |  4 ++
 .../features/group/group-tag-timeline.tsx     | 54 ++++++++++++++++---
 app/soapbox/features/ui/index.tsx             |  2 +-
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/app/soapbox/actions/timelines.ts b/app/soapbox/actions/timelines.ts
index cafaa6aa5..902b99f70 100644
--- a/app/soapbox/actions/timelines.ts
+++ b/app/soapbox/actions/timelines.ts
@@ -248,6 +248,9 @@ const expandListTimeline = (id: string, { maxId }: Record<string, any> = {}, don
 const expandGroupTimeline = (id: string, { maxId }: Record<string, any> = {}, done = noOp) =>
   expandTimeline(`group:${id}`, `/api/v1/timelines/group/${id}`, { max_id: maxId }, done);
 
+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 });
 
@@ -350,6 +353,7 @@ export {
   expandAccountMediaTimeline,
   expandListTimeline,
   expandGroupTimeline,
+  expandGroupTimelineFromTag,
   expandGroupMediaTimeline,
   expandHashtagTimeline,
   expandTimelineRequest,
diff --git a/app/soapbox/features/group/group-tag-timeline.tsx b/app/soapbox/features/group/group-tag-timeline.tsx
index 2663c59cf..f2ddee382 100644
--- a/app/soapbox/features/group/group-tag-timeline.tsx
+++ b/app/soapbox/features/group/group-tag-timeline.tsx
@@ -1,28 +1,66 @@
-import React from 'react';
+import React, { useEffect } from 'react';
+import { FormattedMessage } from 'react-intl';
 
-import { Column } from 'soapbox/components/ui';
+import { expandGroupTimelineFromTag } from 'soapbox/actions/timelines';
+import { Column, Icon, Stack, Text } from 'soapbox/components/ui';
+import { useAppDispatch } from 'soapbox/hooks';
 import { useGroup, useGroupTag } from 'soapbox/hooks/api';
 
-type RouteParams = { id: string, groupId: string };
+import Timeline from '../ui/components/timeline';
+
+type RouteParams = { tagId: string, groupId: string };
 
 interface IGroupTimeline {
   params: RouteParams
 }
 
 const GroupTagTimeline: React.FC<IGroupTimeline> = (props) => {
+  const dispatch = useAppDispatch();
   const groupId = props.params.groupId;
-  const tagId = props.params.id;
+  const tagId = props.params.tagId;
 
   const { group } = useGroup(groupId);
-  const { tag } = useGroupTag(tagId);
+  const { tag, isLoading } = useGroupTag(tagId);
 
-  if (!group) {
+  const handleLoadMore = (maxId: string) => {
+    dispatch(expandGroupTimelineFromTag(groupId, tag?.name as string, { maxId }));
+  };
+
+  useEffect(() => {
+    if (tag?.name) {
+      dispatch(expandGroupTimelineFromTag(groupId, tag?.name));
+    }
+  }, [groupId, tag]);
+
+
+  if (isLoading || !tag || !group) {
     return null;
   }
 
   return (
-    <Column label={`#${tag}`}>
-      {/* TODO */}
+    <Column label={`#${tag.name}`}>
+      <Timeline
+        scrollKey='group_timeline'
+        timelineId={`group:tags:${groupId}:${tag.name}`}
+        onLoadMore={handleLoadMore}
+        divideType='border'
+        showGroup={false}
+        emptyMessageCard={false}
+        emptyMessage={
+          <Stack space={4} className='py-6' justifyContent='center' alignItems='center'>
+            <div className='rounded-full bg-gray-200 p-4 dark:bg-gray-800'>
+              <Icon
+                src={require('@tabler/icons/message-2.svg')}
+                className='h-6 w-6 text-gray-600'
+              />
+            </div>
+
+            <Text theme='muted'>
+              <FormattedMessage id='empty_column.group' defaultMessage='There are no posts in this group yet.' />
+            </Text>
+          </Stack>
+        }
+      />
     </Column>
   );
 };
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 565666465..b41cd6746 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -327,7 +327,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.groups && <WrappedRoute path='/groups/:groupId/posts/:statusId' exact page={StatusPage} component={Status} content={children} />}
 
       {features.groupsTags && <WrappedRoute path='/group/:groupSlug/tags' exact page={GroupPage} component={GroupTagsSlug} content={children} />}
-      {features.groupsTags && <WrappedRoute path='/group/:groupSlug/tag/:id' exact page={GroupsPendingPage} component={GroupTagTimelineSlug} content={children} />}
+      {features.groupsTags && <WrappedRoute path='/group/:groupSlug/tag/:tagId' exact page={GroupsPendingPage} component={GroupTagTimelineSlug} content={children} />}
       {features.groups && <WrappedRoute path='/group/:groupSlug' exact page={GroupPage} component={GroupTimelineSlug} content={children} />}
       {features.groups && <WrappedRoute path='/group/:groupSlug/members' exact page={GroupPage} component={GroupMembersSlug} content={children} />}
       {features.groups && <WrappedRoute path='/group/:groupSlug/media' publicRoute={!authenticatedProfile} component={GroupGallerySlug} page={GroupPage} content={children} />}

From f61202c6e0bafb6c7085ae72f8b6fcfff8775934 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 21 Apr 2023 09:41:28 -0400
Subject: [PATCH 171/298] Fix z-index positioning of Group Grid item

---
 .../groups/components/discover/group-grid-item.tsx     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/features/groups/components/discover/group-grid-item.tsx b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
index fd1168f4e..4380053d3 100644
--- a/app/soapbox/features/groups/components/discover/group-grid-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
@@ -39,7 +39,11 @@ const GroupGridItem = forwardRef((props: IGroup, ref: React.ForwardedRef<HTMLDiv
             />
           )}
 
-          <Stack justifyContent='end' className='z-10 p-4 text-white' space={3}>
+          <div
+            className='absolute inset-x-0 bottom-0 flex justify-center rounded-b-lg bg-gradient-to-t from-gray-900 to-transparent pb-8 pt-12 transition-opacity duration-500'
+          />
+
+          <Stack justifyContent='end' className='p-4 text-white' space={3}>
             <GroupAvatar
               group={group}
               size={44}
@@ -60,10 +64,6 @@ const GroupGridItem = forwardRef((props: IGroup, ref: React.ForwardedRef<HTMLDiv
               </HStack>
             </Stack>
           </Stack>
-
-          <div
-            className='absolute inset-x-0 bottom-0 z-0 flex justify-center rounded-b-lg bg-gradient-to-t from-gray-900 to-transparent pb-8 pt-12 transition-opacity duration-500'
-          />
         </Stack>
       </Link>
 

From 63ca6554d19620fc2fb4634ea502bfcf1691d640 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 21 Apr 2023 09:46:19 -0400
Subject: [PATCH 172/298] Improve spacing between GroupGridItem

---
 .../features/groups/components/discover/group-grid-item.tsx     | 2 +-
 .../features/groups/components/discover/popular-groups.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/groups/components/discover/group-grid-item.tsx b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
index 4380053d3..da8f7542c 100644
--- a/app/soapbox/features/groups/components/discover/group-grid-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
@@ -20,7 +20,7 @@ const GroupGridItem = forwardRef((props: IGroup, ref: React.ForwardedRef<HTMLDiv
   return (
     <div
       key={group.id}
-      className='relative flex shrink-0 flex-col space-y-2 px-0.5'
+      className='relative flex shrink-0 flex-col space-y-2 px-1'
       style={{
         width,
       }}
diff --git a/app/soapbox/features/groups/components/discover/popular-groups.tsx b/app/soapbox/features/groups/components/discover/popular-groups.tsx
index 8dcf607e7..6395ea3b0 100644
--- a/app/soapbox/features/groups/components/discover/popular-groups.tsx
+++ b/app/soapbox/features/groups/components/discover/popular-groups.tsx
@@ -53,7 +53,7 @@ const PopularGroups = () => {
               {isFetching ? (
                 new Array(4).fill(0).map((_, idx) => (
                   <div
-                    className='relative flex shrink-0 flex-col space-y-2 px-0.5'
+                    className='relative flex shrink-0 flex-col space-y-2 px-1'
                     style={{ width: width || 'auto' }}
                     key={idx}
                   >

From e5f7fe244c22478d9e2704b056c43d3b67072b4d Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 21 Apr 2023 10:11:34 -0400
Subject: [PATCH 173/298] Grid spacing improvements

---
 .../groups/components/discover/search/results.tsx      | 10 ++++------
 app/soapbox/features/groups/popular.tsx                | 10 ++++------
 app/soapbox/features/groups/suggested.tsx              | 10 ++++------
 app/soapbox/features/groups/tag.tsx                    | 10 ++++------
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/app/soapbox/features/groups/components/discover/search/results.tsx b/app/soapbox/features/groups/components/discover/search/results.tsx
index 9df350375..2543f6ebc 100644
--- a/app/soapbox/features/groups/components/discover/search/results.tsx
+++ b/app/soapbox/features/groups/components/discover/search/results.tsx
@@ -46,10 +46,8 @@ export default (props: Props) => {
     </div>
   ), []);
 
-  const renderGroupGrid = useCallback((group: Group, index: number) => (
-    <div className='pb-4'>
-      <GroupGridItem group={group} />
-    </div>
+  const renderGroupGrid = useCallback((group: Group) => (
+    <GroupGridItem group={group} />
   ), []);
 
   return (
@@ -79,10 +77,10 @@ export default (props: Props) => {
         <VirtuosoGrid
           useWindowScroll
           data={groups}
-          itemContent={(index, group) => renderGroupGrid(group, index)}
+          itemContent={(_index, group) => renderGroupGrid(group)}
           components={{
             Item: (props) => (
-              <div {...props} className='w-1/2 flex-none' />
+              <div {...props} className='w-1/2 flex-none pb-4 [&:nth-last-of-type(-n+2)]:pb-0' />
             ),
             List: GridList,
           }}
diff --git a/app/soapbox/features/groups/popular.tsx b/app/soapbox/features/groups/popular.tsx
index 7f2d43a64..c2c11148c 100644
--- a/app/soapbox/features/groups/popular.tsx
+++ b/app/soapbox/features/groups/popular.tsx
@@ -46,10 +46,8 @@ const Popular: React.FC = () => {
     </div>
   ), []);
 
-  const renderGroupGrid = useCallback((group: Group, index: number) => (
-    <div className='pb-4'>
-      <GroupGridItem group={group} />
-    </div>
+  const renderGroupGrid = useCallback((group: Group) => (
+    <GroupGridItem group={group} />
   ), []);
 
   return (
@@ -73,10 +71,10 @@ const Popular: React.FC = () => {
         <VirtuosoGrid
           useWindowScroll
           data={groups}
-          itemContent={(index, group) => renderGroupGrid(group, index)}
+          itemContent={(_index, group) => renderGroupGrid(group)}
           components={{
             Item: (props) => (
-              <div {...props} className='w-1/2 flex-none' />
+              <div {...props} className='w-1/2 flex-none pb-4 [&:nth-last-of-type(-n+2)]:pb-0' />
             ),
             List: GridList,
           }}
diff --git a/app/soapbox/features/groups/suggested.tsx b/app/soapbox/features/groups/suggested.tsx
index 5c52f678b..4d1843598 100644
--- a/app/soapbox/features/groups/suggested.tsx
+++ b/app/soapbox/features/groups/suggested.tsx
@@ -46,10 +46,8 @@ const Suggested: React.FC = () => {
     </div>
   ), []);
 
-  const renderGroupGrid = useCallback((group: Group, index: number) => (
-    <div className='pb-4'>
-      <GroupGridItem group={group} />
-    </div>
+  const renderGroupGrid = useCallback((group: Group) => (
+    <GroupGridItem group={group} />
   ), []);
 
   return (
@@ -73,10 +71,10 @@ const Suggested: React.FC = () => {
         <VirtuosoGrid
           useWindowScroll
           data={groups}
-          itemContent={(index, group) => renderGroupGrid(group, index)}
+          itemContent={(_index, group) => renderGroupGrid(group)}
           components={{
             Item: (props) => (
-              <div {...props} className='w-1/2 flex-none' />
+              <div {...props} className='w-1/2 flex-none pb-4 [&:nth-last-of-type(-n+2)]:pb-0' />
             ),
             List: GridList,
           }}
diff --git a/app/soapbox/features/groups/tag.tsx b/app/soapbox/features/groups/tag.tsx
index 4774a4700..8b18053d3 100644
--- a/app/soapbox/features/groups/tag.tsx
+++ b/app/soapbox/features/groups/tag.tsx
@@ -50,10 +50,8 @@ const Tag: React.FC<ITag> = (props) => {
     </div>
   ), []);
 
-  const renderGroupGrid = useCallback((group: Group, index: number) => (
-    <div className='pb-4'>
-      <GroupGridItem group={group} />
-    </div>
+  const renderGroupGrid = useCallback((group: Group) => (
+    <GroupGridItem group={group} />
   ), []);
 
   if (isLoading || !tag) {
@@ -100,10 +98,10 @@ const Tag: React.FC<ITag> = (props) => {
         <VirtuosoGrid
           useWindowScroll
           data={groups}
-          itemContent={(index, group) => renderGroupGrid(group, index)}
+          itemContent={(_index, group) => renderGroupGrid(group)}
           components={{
             Item: (props) => (
-              <div {...props} className='w-1/2 flex-none' />
+              <div {...props} className='w-1/2 flex-none pb-4 [&:nth-last-of-type(-n+2)]:pb-0' />
             ),
             List: GridList,
           }}

From 620e0cb606fb5e1c0668b37cadf5984a24760ad6 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 21 Apr 2023 10:19:37 -0400
Subject: [PATCH 174/298] Remove hashtag warning for Group posts

---
 app/soapbox/features/compose/containers/warning-container.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/compose/containers/warning-container.tsx b/app/soapbox/features/compose/containers/warning-container.tsx
index 6c2a81f87..fd073cda8 100644
--- a/app/soapbox/features/compose/containers/warning-container.tsx
+++ b/app/soapbox/features/compose/containers/warning-container.tsx
@@ -18,7 +18,7 @@ const WarningWrapper: React.FC<IWarningWrapper> = ({ composeId }) => {
   const me = useAppSelector((state) => state.me);
 
   const needsLockWarning = useAppSelector((state) => compose.privacy === 'private' && !state.accounts.get(me)!.locked);
-  const hashtagWarning = compose.privacy !== 'public' && APPROX_HASHTAG_RE.test(compose.text);
+  const hashtagWarning = (compose.privacy !== 'public' && compose.privacy !== 'group') && APPROX_HASHTAG_RE.test(compose.text);
   const directMessageWarning = compose.privacy === 'direct';
 
   if (needsLockWarning) {

From ede31e4e5a81990d267f1cbd1702799048b4c79a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 11:31:59 -0500
Subject: [PATCH 175/298] GroupTagsField: hide "x" until there's more than one
 tag

---
 app/soapbox/features/group/components/group-tags-field.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/features/group/components/group-tags-field.tsx b/app/soapbox/features/group/components/group-tags-field.tsx
index 8502c3a1b..ba98d808e 100644
--- a/app/soapbox/features/group/components/group-tags-field.tsx
+++ b/app/soapbox/features/group/components/group-tags-field.tsx
@@ -28,6 +28,7 @@ const GroupTagsField: React.FC<IGroupTagsField> = ({ tags, onChange, onAddItem,
       onAddItem={onAddItem}
       onRemoveItem={onRemoveItem}
       maxItems={maxItems}
+      minItems={1}
     />
   );
 };

From 7ea9f0ad86f9e1f5dba550471612ab93e2890f71 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 12:28:44 -0500
Subject: [PATCH 176/298] UploadArea: update deprecated e.keyCode --> e.key

---
 app/soapbox/features/ui/components/upload-area.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/ui/components/upload-area.tsx b/app/soapbox/features/ui/components/upload-area.tsx
index 42f363749..8eba75ed5 100644
--- a/app/soapbox/features/ui/components/upload-area.tsx
+++ b/app/soapbox/features/ui/components/upload-area.tsx
@@ -17,11 +17,9 @@ interface IUploadArea {
 /** Component to display when a file is dragged over the UI. */
 const UploadArea: React.FC<IUploadArea> = ({ active, onClose }) => {
   const handleKeyUp = (e: KeyboardEvent) => {
-    const keyCode = e.keyCode;
-
     if (active) {
-      switch (keyCode) {
-        case 27:
+      switch (e.key) {
+        case 'Escape':
           e.preventDefault();
           e.stopPropagation();
           onClose();

From 28c8f1dbd6d98adea16cd51b59cf0d0962c2b54f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 16:03:44 -0500
Subject: [PATCH 177/298] Add useDraggedFiles hook

---
 app/soapbox/hooks/index.ts           |  1 +
 app/soapbox/hooks/useDraggedFiles.ts | 70 ++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 app/soapbox/hooks/useDraggedFiles.ts

diff --git a/app/soapbox/hooks/index.ts b/app/soapbox/hooks/index.ts
index 6f52e0c8f..0bd63eb21 100644
--- a/app/soapbox/hooks/index.ts
+++ b/app/soapbox/hooks/index.ts
@@ -6,6 +6,7 @@ export { useBackend } from './useBackend';
 export { useClickOutside } from './useClickOutside';
 export { useCompose } from './useCompose';
 export { useDebounce } from './useDebounce';
+export { useDraggedFiles } from './useDraggedFiles';
 export { useGetState } from './useGetState';
 export { useGroupsPath } from './useGroupsPath';
 export { useDimensions } from './useDimensions';
diff --git a/app/soapbox/hooks/useDraggedFiles.ts b/app/soapbox/hooks/useDraggedFiles.ts
new file mode 100644
index 000000000..a35303ef6
--- /dev/null
+++ b/app/soapbox/hooks/useDraggedFiles.ts
@@ -0,0 +1,70 @@
+import React, { useCallback, useEffect, useState } from 'react';
+
+/** Controls the state of files being dragged over a node. */
+function useDraggedFiles<R extends HTMLElement>(node: React.RefObject<R>, onDrop?: (files: FileList) => void) {
+  const [isDragging, setIsDragging] = useState(false);
+
+  const handleDocumentDragEnter = useCallback((e: DragEvent) => {
+    if (isDraggingFiles(e)) {
+      setIsDragging(true);
+    }
+  }, [setIsDragging]);
+
+  const handleDocumentDragLeave = useCallback((e: DragEvent) => {
+    if (isOffscreen(e)) {
+      setIsDragging(false);
+    }
+  }, [setIsDragging]);
+
+  const handleDocumentDrop = useCallback((e: DragEvent) => {
+    setIsDragging(false);
+  }, [setIsDragging]);
+
+  const handleDrop = useCallback((e: DragEvent) => {
+    if (isDraggingFiles(e) && onDrop) {
+      onDrop(e.dataTransfer.files);
+    }
+    setIsDragging(false);
+    e.preventDefault();
+  }, [onDrop]);
+
+  useEffect(() => {
+    document.addEventListener('dragenter', handleDocumentDragEnter);
+    document.addEventListener('dragleave', handleDocumentDragLeave);
+    document.addEventListener('drop', handleDocumentDrop);
+    return () => {
+      document.removeEventListener('dragenter', handleDocumentDragEnter);
+      document.removeEventListener('dragleave', handleDocumentDragLeave);
+      document.removeEventListener('drop', handleDocumentDrop);
+    };
+  }, []);
+
+  useEffect(() => {
+    node.current?.addEventListener('drop', handleDrop);
+    return () => {
+      node.current?.removeEventListener('drop', handleDrop);
+    };
+  }, [node.current]);
+
+  return {
+    /** Whether the document is being dragged over. */
+    isDragging,
+  };
+}
+
+/** Ensure only files are being dragged, and not eg highlighted text. */
+function isDraggingFiles(e: DragEvent): e is DragEvent & { dataTransfer: DataTransfer } {
+  if (e.dataTransfer) {
+    const { types } = e.dataTransfer;
+    return types.length === 1 && types[0] === 'Files';
+  } else {
+    return false;
+  }
+}
+
+/** Check whether the cursor is in the screen. Mostly useful for dragleave events. */
+function isOffscreen(e: DragEvent): boolean {
+  return e.screenX === 0 && e.screenY === 0;
+}
+
+export { useDraggedFiles };
\ No newline at end of file

From aad73094700ec5c6fdf6c40396bb56b7e071b7fd Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 16:28:54 -0500
Subject: [PATCH 178/298] useDraggedFiles: control dragged state of node

---
 app/soapbox/hooks/useDraggedFiles.ts | 30 ++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/hooks/useDraggedFiles.ts b/app/soapbox/hooks/useDraggedFiles.ts
index a35303ef6..8f519d16e 100644
--- a/app/soapbox/hooks/useDraggedFiles.ts
+++ b/app/soapbox/hooks/useDraggedFiles.ts
@@ -3,6 +3,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 /** Controls the state of files being dragged over a node. */
 function useDraggedFiles<R extends HTMLElement>(node: React.RefObject<R>, onDrop?: (files: FileList) => void) {
   const [isDragging, setIsDragging] = useState(false);
+  const [isDraggedOver, setIsDraggedOver] = useState(false);
 
   const handleDocumentDragEnter = useCallback((e: DragEvent) => {
     if (isDraggingFiles(e)) {
@@ -11,20 +12,34 @@ function useDraggedFiles<R extends HTMLElement>(node: React.RefObject<R>, onDrop
   }, [setIsDragging]);
 
   const handleDocumentDragLeave = useCallback((e: DragEvent) => {
-    if (isOffscreen(e)) {
+    if (isDraggedOffscreen(e)) {
       setIsDragging(false);
     }
   }, [setIsDragging]);
 
   const handleDocumentDrop = useCallback((e: DragEvent) => {
     setIsDragging(false);
+    setIsDraggedOver(false);
   }, [setIsDragging]);
 
+  const handleDragEnter = useCallback((e: DragEvent) => {
+    if (isDraggingFiles(e)) {
+      setIsDraggedOver(true);
+    }
+  }, [setIsDraggedOver]);
+
+  const handleDragLeave = useCallback((e: DragEvent) => {
+    if (!node.current || isDraggedOutOfNode(e, node.current)) {
+      setIsDraggedOver(false);
+    }
+  }, [setIsDraggedOver]);
+
   const handleDrop = useCallback((e: DragEvent) => {
     if (isDraggingFiles(e) && onDrop) {
       onDrop(e.dataTransfer.files);
     }
     setIsDragging(false);
+    setIsDraggedOver(false);
     e.preventDefault();
   }, [onDrop]);
 
@@ -40,8 +55,12 @@ function useDraggedFiles<R extends HTMLElement>(node: React.RefObject<R>, onDrop
   }, []);
 
   useEffect(() => {
+    node.current?.addEventListener('dragenter', handleDragEnter);
+    node.current?.addEventListener('dragleave', handleDragLeave);
     node.current?.addEventListener('drop', handleDrop);
     return () => {
+      node.current?.removeEventListener('dragenter', handleDragEnter);
+      node.current?.removeEventListener('dragleave', handleDragLeave);
       node.current?.removeEventListener('drop', handleDrop);
     };
   }, [node.current]);
@@ -49,6 +68,8 @@ function useDraggedFiles<R extends HTMLElement>(node: React.RefObject<R>, onDrop
   return {
     /** Whether the document is being dragged over. */
     isDragging,
+    /** Whether the node is being dragged over. */
+    isDraggedOver,
   };
 }
 
@@ -63,8 +84,13 @@ function isDraggingFiles(e: DragEvent): e is DragEvent & { dataTransfer: DataTra
 }
 
 /** Check whether the cursor is in the screen. Mostly useful for dragleave events. */
-function isOffscreen(e: DragEvent): boolean {
+function isDraggedOffscreen(e: DragEvent): boolean {
   return e.screenX === 0 && e.screenY === 0;
 }
 
+/** Check whether the cursor is dragged out of the node. */
+function isDraggedOutOfNode(e: DragEvent, node: Node): boolean {
+  return !node.contains(document.elementFromPoint(e.clientX, e.clientY));
+}
+
 export { useDraggedFiles };
\ No newline at end of file

From ed0206c3791a4c164946b975ac129c175d4c67f5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 16:31:10 -0500
Subject: [PATCH 179/298] Improve drag-and-drop of Home feed composer

---
 .../compose/components/compose-form.tsx       |   2 +-
 app/soapbox/features/ui/index.tsx             | 116 ++++--------------
 app/soapbox/pages/home-page.tsx               |  24 +++-
 3 files changed, 49 insertions(+), 93 deletions(-)

diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx
index 5940dd7dd..f3ac7a582 100644
--- a/app/soapbox/features/compose/components/compose-form.tsx
+++ b/app/soapbox/features/compose/components/compose-form.tsx
@@ -88,7 +88,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
 
   const [composeFocused, setComposeFocused] = useState(false);
 
-  const formRef = useRef(null);
+  const formRef = useRef<HTMLDivElement>(null);
   const spoilerTextRef = useRef<AutosuggestInput>(null);
   const autosuggestTextareaRef = useRef<AutosuggestTextarea>(null);
 
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 565666465..82bd3d27e 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -1,16 +1,15 @@
 'use strict';
 
-import React, { useState, useEffect, useRef } from 'react';
+import clsx from 'clsx';
+import React, { useEffect, useRef } from 'react';
 import { HotKeys } from 'react-hotkeys';
-import { useIntl } from 'react-intl';
 import { Switch, useHistory, useLocation, Redirect } from 'react-router-dom';
 
 import { fetchFollowRequests } from 'soapbox/actions/accounts';
 import { fetchReports, fetchUsers, fetchConfig } from 'soapbox/actions/admin';
 import { fetchAnnouncements } from 'soapbox/actions/announcements';
-import { uploadCompose, resetCompose } from 'soapbox/actions/compose';
+import { resetCompose } from 'soapbox/actions/compose';
 import { fetchCustomEmojis } from 'soapbox/actions/custom-emojis';
-import { uploadEventBanner } from 'soapbox/actions/events';
 import { fetchFilters } from 'soapbox/actions/filters';
 import { fetchMarker } from 'soapbox/actions/markers';
 import { openModal } from 'soapbox/actions/modals';
@@ -26,7 +25,7 @@ import SidebarNavigation from 'soapbox/components/sidebar-navigation';
 import ThumbNavigation from 'soapbox/components/thumb-navigation';
 import { Layout } from 'soapbox/components/ui';
 import { useStatContext } from 'soapbox/contexts/stat-context';
-import { useAppDispatch, useAppSelector, useOwnAccount, useSoapboxConfig, useFeatures, useInstance } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector, useOwnAccount, useSoapboxConfig, useFeatures, useInstance, useDraggedFiles } from 'soapbox/hooks';
 import AdminPage from 'soapbox/pages/admin-page';
 import ChatsPage from 'soapbox/pages/chats-page';
 import DefaultPage from 'soapbox/pages/default-page';
@@ -101,7 +100,6 @@ import {
   FollowRecommendations,
   Directory,
   SidebarMenu,
-  UploadArea,
   ProfileHoverCard,
   StatusHoverCard,
   Share,
@@ -387,16 +385,12 @@ interface IUI {
 }
 
 const UI: React.FC<IUI> = ({ children }) => {
-  const intl = useIntl();
   const history = useHistory();
   const dispatch = useAppDispatch();
   const { data: pendingPolicy } = usePendingPolicy();
   const instance = useInstance();
   const statContext = useStatContext();
 
-  const [draggingOver, setDraggingOver] = useState<boolean>(false);
-
-  const dragTargets = useRef<EventTarget[]>([]);
   const disconnect = useRef<any>(null);
   const node = useRef<HTMLDivElement | null>(null);
   const hotkeys = useRef<HTMLDivElement | null>(null);
@@ -411,74 +405,7 @@ const UI: React.FC<IUI> = ({ children }) => {
   const streamingUrl = instance.urls.get('streaming_api');
   const standalone = useAppSelector(isStandalone);
 
-  const handleDragEnter = (e: DragEvent) => {
-    e.preventDefault();
-
-    if (e.target && !dragTargets.current.includes(e.target)) {
-      dragTargets.current.push(e.target);
-    }
-
-    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files')) {
-      setDraggingOver(true);
-    }
-  };
-
-  const handleDragOver = (e: DragEvent) => {
-    if (dataTransferIsText(e.dataTransfer)) return false;
-    e.preventDefault();
-    e.stopPropagation();
-
-    try {
-      if (e.dataTransfer) {
-        e.dataTransfer.dropEffect = 'copy';
-      }
-    } catch (err) {
-      // Do nothing
-    }
-
-    return false;
-  };
-
-  const handleDrop = (e: DragEvent) => {
-    if (!me) return;
-
-    if (dataTransferIsText(e.dataTransfer)) return;
-    e.preventDefault();
-
-    setDraggingOver(false);
-    dragTargets.current = [];
-
-    dispatch((_, getState) => {
-      if (e.dataTransfer && e.dataTransfer.files.length >= 1) {
-        const modals = getState().modals;
-        const isModalOpen = modals.last()?.modalType === 'COMPOSE';
-        const isEventsModalOpen = modals.last()?.modalType === 'COMPOSE_EVENT';
-        if (isEventsModalOpen) dispatch(uploadEventBanner(e.dataTransfer.files[0], intl));
-        else dispatch(uploadCompose(isModalOpen ? 'compose-modal' : 'home', e.dataTransfer.files, intl));
-      }
-    });
-  };
-
-  const handleDragLeave = (e: DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-
-    dragTargets.current = dragTargets.current.filter(el => el !== e.target && node.current?.contains(el as Node));
-
-    if (dragTargets.current.length > 0) {
-      return;
-    }
-
-    setDraggingOver(false);
-  };
-
-  const dataTransferIsText = (dataTransfer: DataTransfer | null) => {
-    return (dataTransfer && Array.from(dataTransfer.types).includes('text/plain') && dataTransfer.items.length === 1);
-  };
-
-  const closeUploadModal = () => {
-    setDraggingOver(false);
-  };
+  const { isDragging } = useDraggedFiles(node);
 
   const handleServiceWorkerPostMessage = ({ data }: MessageEvent) => {
     if (data.type === 'navigate') {
@@ -501,6 +428,11 @@ const UI: React.FC<IUI> = ({ children }) => {
     }
   };
 
+  const handleDragEnter = (e: DragEvent) => e.preventDefault();
+  const handleDragLeave = (e: DragEvent) => e.preventDefault();
+  const handleDragOver = (e: DragEvent) => e.preventDefault();
+  const handleDrop = (e: DragEvent) => e.preventDefault();
+
   /** Load initial data when a user is logged in */
   const loadAccountData = () => {
     if (!account) return;
@@ -535,11 +467,6 @@ const UI: React.FC<IUI> = ({ children }) => {
   };
 
   useEffect(() => {
-    document.addEventListener('dragenter', handleDragEnter, false);
-    document.addEventListener('dragover', handleDragOver, false);
-    document.addEventListener('drop', handleDrop, false);
-    document.addEventListener('dragleave', handleDragLeave, false);
-
     if ('serviceWorker' in navigator) {
       navigator.serviceWorker.addEventListener('message', handleServiceWorkerPostMessage);
     }
@@ -548,12 +475,21 @@ const UI: React.FC<IUI> = ({ children }) => {
       window.setTimeout(() => Notification.requestPermission(), 120 * 1000);
     }
 
+    return () => {
+      disconnectStreaming();
+    };
+  }, []);
+
+  useEffect(() => {
+    document.addEventListener('dragenter', handleDragEnter);
+    document.addEventListener('dragleave', handleDragLeave);
+    document.addEventListener('dragover', handleDragOver);
+    document.addEventListener('drop', handleDrop);
     return () => {
       document.removeEventListener('dragenter', handleDragEnter);
+      document.removeEventListener('dragleave', handleDragLeave);
       document.removeEventListener('dragover', handleDragOver);
       document.removeEventListener('drop', handleDrop);
-      document.removeEventListener('dragleave', handleDragLeave);
-      disconnectStreaming();
     };
   }, []);
 
@@ -697,6 +633,12 @@ const UI: React.FC<IUI> = ({ children }) => {
   return (
     <HotKeys keyMap={keyMap} handlers={me ? handlers : undefined} ref={setHotkeysRef} attach={window} focused>
       <div ref={node} style={style}>
+        <div
+          className={clsx('pointer-events-none fixed z-[9000] h-screen w-screen transition', {
+            'backdrop-blur': isDragging,
+          })}
+        />
+
         <BackgroundShapes />
 
         <div className='z-10 flex flex-col'>
@@ -718,10 +660,6 @@ const UI: React.FC<IUI> = ({ children }) => {
             </div>
           )}
 
-          <BundleContainer fetchComponent={UploadArea}>
-            {Component => <Component active={draggingOver} onClose={closeUploadModal} />}
-          </BundleContainer>
-
           {me && (
             <BundleContainer fetchComponent={SidebarMenu}>
               {Component => <Component />}
diff --git a/app/soapbox/pages/home-page.tsx b/app/soapbox/pages/home-page.tsx
index 2ba7cac0a..f11e0bcc3 100644
--- a/app/soapbox/pages/home-page.tsx
+++ b/app/soapbox/pages/home-page.tsx
@@ -1,6 +1,9 @@
+import clsx from 'clsx';
 import React, { useRef } from 'react';
+import { useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
+import { uploadCompose } from 'soapbox/actions/compose';
 import FeedCarousel from 'soapbox/features/feed-filtering/feed-carousel';
 import LinkFooter from 'soapbox/features/ui/components/link-footer';
 import {
@@ -14,7 +17,7 @@ import {
   CtaBanner,
   AnnouncementsPanel,
 } from 'soapbox/features/ui/util/async-components';
-import { useAppSelector, useOwnAccount, useFeatures, useSoapboxConfig } from 'soapbox/hooks';
+import { useAppSelector, useOwnAccount, useFeatures, useSoapboxConfig, useDraggedFiles, useAppDispatch } from 'soapbox/hooks';
 
 import { Avatar, Card, CardBody, HStack, Layout } from '../components/ui';
 import ComposeForm from '../features/compose/components/compose-form';
@@ -25,17 +28,25 @@ interface IHomePage {
 }
 
 const HomePage: React.FC<IHomePage> = ({ children }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
   const me = useAppSelector(state => state.me);
   const account = useOwnAccount();
   const features = useFeatures();
   const soapboxConfig = useSoapboxConfig();
 
+  const composeId = 'home';
   const composeBlock = useRef<HTMLDivElement>(null);
 
   const hasPatron = soapboxConfig.extensions.getIn(['patron', 'enabled']) === true;
   const hasCrypto = typeof soapboxConfig.cryptoAddresses.getIn([0, 'ticker']) === 'string';
   const cryptoLimit = soapboxConfig.cryptoDonatePanel.get('limit', 0);
 
+  const { isDragging, isDraggedOver } = useDraggedFiles(composeBlock, (files) => {
+    dispatch(uploadCompose(composeId, files, intl));
+  });
+
   const acct = account ? account.acct : '';
   const avatar = account ? account.avatar : '';
 
@@ -43,7 +54,14 @@ const HomePage: React.FC<IHomePage> = ({ children }) => {
     <>
       <Layout.Main className='space-y-3 pt-3 dark:divide-gray-800 sm:pt-0'>
         {me && (
-          <Card className='relative z-[1]' variant='rounded' ref={composeBlock}>
+          <Card
+            className={clsx('relative z-[1] transition', {
+              'border-2 border-primary-600 border-dashed z-[9001]': isDragging,
+              'ring-2 ring-offset-2 ring-primary-600': isDraggedOver,
+            })}
+            variant='rounded'
+            ref={composeBlock}
+          >
             <CardBody>
               <HStack alignItems='start' space={4}>
                 <Link to={`/@${acct}`}>
@@ -52,7 +70,7 @@ const HomePage: React.FC<IHomePage> = ({ children }) => {
 
                 <div className='w-full translate-y-0.5'>
                   <ComposeForm
-                    id='home'
+                    id={composeId}
                     shouldCondense
                     autoFocus={false}
                     clickableAreaRef={composeBlock}

From 1e18f787569e64fe0cecc494d93a824912d8b524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Fri, 21 Apr 2023 23:38:07 +0200
Subject: [PATCH 180/298] Fix v2 filters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/features/filters/index.tsx |  4 ++--
 app/soapbox/selectors/index.ts         | 19 +------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/soapbox/features/filters/index.tsx b/app/soapbox/features/filters/index.tsx
index 46eba410b..5aadf1795 100644
--- a/app/soapbox/features/filters/index.tsx
+++ b/app/soapbox/features/filters/index.tsx
@@ -70,8 +70,8 @@ const Filters = () => {
         emptyMessage={emptyMessage}
         itemClassName='pb-4 last:pb-0'
       >
-        {filters.map((filter, i) => (
-          <div className='rounded-lg bg-gray-100 p-4 dark:bg-primary-800'>
+        {filters.map((filter) => (
+          <div key={filter.id} className='rounded-lg bg-gray-100 p-4 dark:bg-primary-800'>
             <Stack space={2}>
               <Stack className='grow' space={1}>
                 <Text weight='medium'>
diff --git a/app/soapbox/selectors/index.ts b/app/soapbox/selectors/index.ts
index 4679c1148..a936ffdf1 100644
--- a/app/soapbox/selectors/index.ts
+++ b/app/soapbox/selectors/index.ts
@@ -159,23 +159,6 @@ const checkFiltered = (index: string, filters: ImmutableList<FilterEntity>) =>
       if (regex.test(index)) return result.concat(filter.title);
       return result;
     }, ImmutableList<string>())), ImmutableList<string>());
-// const results =
-// let expr = escapeRegExp(filter.phrase);
-
-// if (filter.whole_word) {
-//   if (/^[\w]/.test(expr)) {
-//     expr = `\\b${expr}`;
-//   }
-
-//   if (/[\w]$/.test(expr)) {
-//     expr = `${expr}\\b`;
-//   }
-// }
-
-// const regex = new RegExp(expr);
-
-// if (regex.test(index)) return result.join(filter.phrase);
-// return result;
 
 type APIStatus = { id: string, username?: string };
 
@@ -216,7 +199,7 @@ export const makeGetStatus = () => {
         // @ts-ignore
         map.set('group', group || null);
 
-        if ((features.filters || features.filtersV2) && (accountReblog || accountBase).id !== me) {
+        if ((features.filters) && (accountReblog || accountBase).id !== me) {
           const filtered = checkFiltered(statusReblog?.search_index || statusBase.search_index, filters);
 
           map.set('filtered', filtered);

From 78ce8a4894d9f426ee37a6cfb7cd74d5ac9e45bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Fri, 21 Apr 2023 23:50:08 +0200
Subject: [PATCH 181/298] Make empty-column-indicator fullwidth on Gallery
 pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/features/account-gallery/index.tsx | 2 +-
 app/soapbox/features/group/group-gallery.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/account-gallery/index.tsx b/app/soapbox/features/account-gallery/index.tsx
index 7082124c8..7cee5c569 100644
--- a/app/soapbox/features/account-gallery/index.tsx
+++ b/app/soapbox/features/account-gallery/index.tsx
@@ -148,7 +148,7 @@ const AccountGallery = () => {
         ))}
 
         {!isLoading && attachments.size === 0 && (
-          <div className='empty-column-indicator'>
+          <div className='empty-column-indicator col-span-2 sm:col-span-3'>
             <FormattedMessage id='account_gallery.none' defaultMessage='No media to show.' />
           </div>
         )}
diff --git a/app/soapbox/features/group/group-gallery.tsx b/app/soapbox/features/group/group-gallery.tsx
index 96ed47e13..70a77680d 100644
--- a/app/soapbox/features/group/group-gallery.tsx
+++ b/app/soapbox/features/group/group-gallery.tsx
@@ -77,7 +77,7 @@ const GroupGallery: React.FC<IGroupGallery> = (props) => {
         ))}
 
         {(!isLoading && attachments.length === 0) && (
-          <div className='empty-column-indicator'>
+          <div className='empty-column-indicator col-span-2 sm:col-span-3'>
             <FormattedMessage id='account_gallery.none' defaultMessage='No media to show.' />
           </div>
         )}

From d0722934a96dd542afc9d5d39e9a48f922322319 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 16:54:08 -0500
Subject: [PATCH 182/298] ComposeForm: expand when dragged

---
 app/soapbox/features/compose/components/compose-form.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx
index f3ac7a582..92364b7b0 100644
--- a/app/soapbox/features/compose/components/compose-form.tsx
+++ b/app/soapbox/features/compose/components/compose-form.tsx
@@ -17,7 +17,7 @@ import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest
 import AutosuggestTextarea from 'soapbox/components/autosuggest-textarea';
 import { Button, HStack, Stack } from 'soapbox/components/ui';
 import EmojiPickerDropdown from 'soapbox/features/emoji/containers/emoji-picker-dropdown-container';
-import { useAppDispatch, useAppSelector, useCompose, useFeatures, useInstance, usePrevious } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles, useFeatures, useInstance, usePrevious } from 'soapbox/hooks';
 import { isMobile } from 'soapbox/is-mobile';
 
 import QuotedStatusContainer from '../containers/quoted-status-container';
@@ -92,6 +92,8 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
   const spoilerTextRef = useRef<AutosuggestInput>(null);
   const autosuggestTextareaRef = useRef<AutosuggestTextarea>(null);
 
+  const { isDraggedOver } = useDraggedFiles(formRef);
+
   const handleChange: React.ChangeEventHandler<HTMLTextAreaElement> = (e) => {
     dispatch(changeCompose(id, e.target.value));
   };
@@ -236,7 +238,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
     </HStack>
   ), [features, id]);
 
-  const condensed = shouldCondense && !composeFocused && isEmpty() && !isUploading;
+  const condensed = shouldCondense && !isDraggedOver && !composeFocused && isEmpty() && !isUploading;
   const disabled = isSubmitting;
   const countedText = [spoilerText, countableText(text)].join('');
   const disabledButton = disabled || isUploading || isChangingUpload || length(countedText) > maxTootChars || (countedText.length !== 0 && countedText.trim().length === 0 && !anyMedia);

From c9037f66615504951ec2ab2fa49c0ec7c99dd0b8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 16:54:23 -0500
Subject: [PATCH 183/298] GroupTimeline: add drop zone to composer

---
 app/soapbox/features/group/group-timeline.tsx | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/features/group/group-timeline.tsx b/app/soapbox/features/group/group-timeline.tsx
index 53f570280..2390adc0a 100644
--- a/app/soapbox/features/group/group-timeline.tsx
+++ b/app/soapbox/features/group/group-timeline.tsx
@@ -1,13 +1,14 @@
-import React, { useEffect } from 'react';
-import { FormattedMessage } from 'react-intl';
+import clsx from 'clsx';
+import React, { useEffect, useRef } from 'react';
+import { FormattedMessage, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
-import { groupCompose, setGroupTimelineVisible } from 'soapbox/actions/compose';
+import { groupCompose, setGroupTimelineVisible, uploadCompose } from 'soapbox/actions/compose';
 import { connectGroupStream } from 'soapbox/actions/streaming';
 import { expandGroupTimeline } from 'soapbox/actions/timelines';
 import { Avatar, HStack, Icon, Stack, Text, Toggle } from 'soapbox/components/ui';
 import ComposeForm from 'soapbox/features/compose/components/compose-form';
-import { useAppDispatch, useAppSelector, useOwnAccount } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector, useDraggedFiles, useOwnAccount } from 'soapbox/hooks';
 import { useGroup } from 'soapbox/hooks/api';
 
 import Timeline from '../ui/components/timeline';
@@ -19,8 +20,10 @@ interface IGroupTimeline {
 }
 
 const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
+  const intl = useIntl();
   const account = useOwnAccount();
   const dispatch = useAppDispatch();
+  const composer = useRef<HTMLDivElement>(null);
 
   const { groupId } = props.params;
 
@@ -30,6 +33,10 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
   const canComposeGroupStatus = !!account && group?.relationship?.member;
   const groupTimelineVisible = useAppSelector((state) => !!state.compose.get(composeId)?.group_timeline_visible);
 
+  const { isDragging, isDraggedOver } = useDraggedFiles(composer, (files) => {
+    dispatch(uploadCompose(composeId, files, intl));
+  });
+
   const handleLoadMore = (maxId: string) => {
     dispatch(expandGroupTimeline(groupId, { maxId }));
   };
@@ -57,7 +64,15 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
     <Stack space={2}>
       {canComposeGroupStatus && (
         <div className='border-b border-solid border-gray-200 py-6 dark:border-gray-800'>
-          <HStack alignItems='start' space={4}>
+          <HStack
+            ref={composer}
+            alignItems='start'
+            space={4}
+            className={clsx('relative rounded-xl transition', {
+              'border-2 border-primary-600 border-dashed z-[9001] p-4': isDragging,
+              'ring-2 ring-offset-2 ring-primary-600': isDraggedOver,
+            })}
+          >
             <Link to={`/@${account.acct}`}>
               <Avatar src={account.avatar} size={46} />
             </Link>

From 0904b6a2a0dfae61850ea1c65a15f8b98b391274 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 17:13:40 -0500
Subject: [PATCH 184/298] Fix drag-and-drop interaction with ComposeModal

---
 app/soapbox/components/ui/modal/modal.tsx     | 14 +++++++++----
 app/soapbox/features/group/group-timeline.tsx |  2 +-
 .../ui/components/modals/compose-modal.tsx    | 20 +++++++++++++++----
 app/soapbox/features/ui/index.tsx             |  2 +-
 app/soapbox/pages/home-page.tsx               |  2 +-
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/components/ui/modal/modal.tsx b/app/soapbox/components/ui/modal/modal.tsx
index 69daac0b8..98b001f4c 100644
--- a/app/soapbox/components/ui/modal/modal.tsx
+++ b/app/soapbox/components/ui/modal/modal.tsx
@@ -55,10 +55,11 @@ interface IModal {
   title?: React.ReactNode
   width?: keyof typeof widths
   children?: React.ReactNode
+  className?: string
 }
 
 /** Displays a modal dialog box. */
-const Modal: React.FC<IModal> = ({
+const Modal = React.forwardRef<HTMLDivElement, IModal>(({
   cancelAction,
   cancelText,
   children,
@@ -76,7 +77,8 @@ const Modal: React.FC<IModal> = ({
   skipFocus = false,
   title,
   width = 'xl',
-}) => {
+  className,
+}, ref) => {
   const intl = useIntl();
   const buttonRef = React.useRef<HTMLButtonElement>(null);
 
@@ -87,7 +89,11 @@ const Modal: React.FC<IModal> = ({
   }, [skipFocus, buttonRef]);
 
   return (
-    <div data-testid='modal' className={clsx('pointer-events-auto mx-auto block w-full rounded-2xl bg-white p-6 text-start align-middle text-gray-900 shadow-xl transition-all dark:bg-primary-900 dark:text-gray-100', widths[width])}>
+    <div
+      ref={ref}
+      data-testid='modal'
+      className={clsx(className, 'pointer-events-auto mx-auto block w-full rounded-2xl bg-white p-6 text-start align-middle text-gray-900 shadow-xl transition-all dark:bg-primary-900 dark:text-gray-100', widths[width])}
+    >
       <div className='w-full justify-between sm:flex sm:items-start'>
         <div className='w-full'>
           {title && (
@@ -157,6 +163,6 @@ const Modal: React.FC<IModal> = ({
       )}
     </div>
   );
-};
+});
 
 export default Modal;
diff --git a/app/soapbox/features/group/group-timeline.tsx b/app/soapbox/features/group/group-timeline.tsx
index 2390adc0a..d189fdb68 100644
--- a/app/soapbox/features/group/group-timeline.tsx
+++ b/app/soapbox/features/group/group-timeline.tsx
@@ -69,7 +69,7 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
             alignItems='start'
             space={4}
             className={clsx('relative rounded-xl transition', {
-              'border-2 border-primary-600 border-dashed z-[9001] p-4': isDragging,
+              'border-2 border-primary-600 border-dashed z-[99] p-4': isDragging,
               'ring-2 ring-offset-2 ring-primary-600': isDraggedOver,
             })}
           >
diff --git a/app/soapbox/features/ui/components/modals/compose-modal.tsx b/app/soapbox/features/ui/components/modals/compose-modal.tsx
index b007ae1ba..72a06fb7c 100644
--- a/app/soapbox/features/ui/components/modals/compose-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/compose-modal.tsx
@@ -1,11 +1,12 @@
-import React from 'react';
+import clsx from 'clsx';
+import React, { useRef } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { cancelReplyCompose } from 'soapbox/actions/compose';
+import { cancelReplyCompose, uploadCompose } from 'soapbox/actions/compose';
 import { openModal, closeModal } from 'soapbox/actions/modals';
 import { checkComposeContent } from 'soapbox/components/modal-root';
 import { Modal } from 'soapbox/components/ui';
-import { useAppDispatch, useCompose } from 'soapbox/hooks';
+import { useAppDispatch, useCompose, useDraggedFiles } from 'soapbox/hooks';
 
 import ComposeForm from '../../../compose/components/compose-form';
 
@@ -22,11 +23,17 @@ interface IComposeModal {
 const ComposeModal: React.FC<IComposeModal> = ({ onClose }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
+  const node = useRef<HTMLDivElement>(null);
 
-  const compose = useCompose('compose-modal');
+  const composeId = 'compose-modal';
+  const compose = useCompose(composeId);
 
   const { id: statusId, privacy, in_reply_to: inReplyTo, quote } = compose!;
 
+  const { isDragging, isDraggedOver } = useDraggedFiles(node, (files) => {
+    dispatch(uploadCompose(composeId, files, intl));
+  });
+
   const onClickClose = () => {
     if (checkComposeContent(compose)) {
       dispatch(openModal('CONFIRM', {
@@ -64,8 +71,13 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose }) => {
 
   return (
     <Modal
+      ref={node}
       title={renderTitle()}
       onClose={onClickClose}
+      className={clsx({
+        'border-2 border-primary-600 border-dashed !z-[99]': isDragging,
+        'ring-2 ring-offset-2 ring-primary-600': isDraggedOver,
+      })}
     >
       <ComposeForm id='compose-modal' />
     </Modal>
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 82bd3d27e..9635e7589 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -634,7 +634,7 @@ const UI: React.FC<IUI> = ({ children }) => {
     <HotKeys keyMap={keyMap} handlers={me ? handlers : undefined} ref={setHotkeysRef} attach={window} focused>
       <div ref={node} style={style}>
         <div
-          className={clsx('pointer-events-none fixed z-[9000] h-screen w-screen transition', {
+          className={clsx('pointer-events-none fixed z-[90] h-screen w-screen transition', {
             'backdrop-blur': isDragging,
           })}
         />
diff --git a/app/soapbox/pages/home-page.tsx b/app/soapbox/pages/home-page.tsx
index f11e0bcc3..1df0572a6 100644
--- a/app/soapbox/pages/home-page.tsx
+++ b/app/soapbox/pages/home-page.tsx
@@ -56,7 +56,7 @@ const HomePage: React.FC<IHomePage> = ({ children }) => {
         {me && (
           <Card
             className={clsx('relative z-[1] transition', {
-              'border-2 border-primary-600 border-dashed z-[9001]': isDragging,
+              'border-2 border-primary-600 border-dashed z-[99]': isDragging,
               'ring-2 ring-offset-2 ring-primary-600': isDraggedOver,
             })}
             variant='rounded'

From 01b99d875be61c1fe9475ce216ec43d9b761f965 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 17:33:20 -0500
Subject: [PATCH 185/298] Remove UploadArea component

---
 .../features/ui/components/upload-area.tsx    | 71 -------------------
 .../features/ui/util/async-components.ts      |  4 --
 2 files changed, 75 deletions(-)
 delete mode 100644 app/soapbox/features/ui/components/upload-area.tsx

diff --git a/app/soapbox/features/ui/components/upload-area.tsx b/app/soapbox/features/ui/components/upload-area.tsx
deleted file mode 100644
index 8eba75ed5..000000000
--- a/app/soapbox/features/ui/components/upload-area.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import clsx from 'clsx';
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import { spring } from 'react-motion';
-
-import { Icon, Stack, Text } from 'soapbox/components/ui';
-
-import Motion from '../util/optional-motion';
-
-interface IUploadArea {
-  /** Whether the upload area is active. */
-  active: boolean
-  /** Callback when the upload area is closed. */
-  onClose: () => void
-}
-
-/** Component to display when a file is dragged over the UI. */
-const UploadArea: React.FC<IUploadArea> = ({ active, onClose }) => {
-  const handleKeyUp = (e: KeyboardEvent) => {
-    if (active) {
-      switch (e.key) {
-        case 'Escape':
-          e.preventDefault();
-          e.stopPropagation();
-          onClose();
-          break;
-      }
-    }
-  };
-
-  React.useEffect(() => {
-    window.addEventListener('keyup', handleKeyUp, false);
-
-    return () => window.removeEventListener('keyup', handleKeyUp);
-  }, []);
-
-  return (
-    <Motion
-      defaultStyle={{ backgroundOpacity: 0, backgroundScale: 0.95 }}
-      style={{ backgroundOpacity: spring(active ? 1 : 0, { stiffness: 150, damping: 15 }), backgroundScale: spring(active ? 1 : 0.95, { stiffness: 200, damping: 3 }) }}
-    >
-      {({ backgroundOpacity, backgroundScale }) => (
-        <div
-          className={clsx({
-            'flex items-center justify-center bg-gray-700/90 h-full w-full absolute left-0 top-0 z-1000 pointer-events-none': true,
-            'visible': active,
-            'invisible': !active,
-          })}
-          style={{ opacity: backgroundOpacity }}
-        >
-          <div className='relative flex h-40 w-80 p-2'>
-            <div className='absolute inset-0' style={{ transform: `scale(${backgroundScale})` }} />
-
-            <Stack space={3} justifyContent='center' alignItems='center'>
-              <Icon
-                src={require('@tabler/icons/cloud-upload.svg')}
-                className='h-12 w-12 text-white/90'
-              />
-
-              <Text size='xl' theme='white'>
-                <FormattedMessage id='upload_area.title' defaultMessage='Drag & drop to upload' />
-              </Text>
-            </Stack>
-          </div>
-        </div>
-      )}
-    </Motion>
-  );
-};
-
-export default UploadArea;
diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts
index e8187db46..0b50f0194 100644
--- a/app/soapbox/features/ui/util/async-components.ts
+++ b/app/soapbox/features/ui/util/async-components.ts
@@ -374,10 +374,6 @@ export function SidebarMenu() {
   return import(/* webpackChunkName: "features/ui" */'../../../components/sidebar-menu');
 }
 
-export function UploadArea() {
-  return import(/* webpackChunkName: "features/compose" */'../components/upload-area');
-}
-
 export function ModalContainer() {
   return import(/* webpackChunkName: "features/ui" */'../containers/modal-container');
 }

From cce0d639d81314c8f1e233c1cba915fcf36fe84c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 17:34:21 -0500
Subject: [PATCH 186/298] CHANGELOG: drop zones

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6bc03ee8..b27bae103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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.
 
 ### Fixed
 - Posts: fixed emojis being cut off in reactions modal.

From 94b84438b060a586c8ae6394e0c32a906d27e954 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 21 Apr 2023 19:27:26 -0500
Subject: [PATCH 187/298] yarn i18n

---
 app/soapbox/locales/en.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 8a8e23db7..3f6c24526 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1546,7 +1546,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media attachment",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",

From 8530471ddbd7f1327bd5194b1461446a4cae927a Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 24 Apr 2023 08:17:51 -0400
Subject: [PATCH 188/298] Handle errors on Group Headers

---
 app/soapbox/components/still-image.tsx        |  5 ++++-
 .../group/components/group-header.tsx         | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/components/still-image.tsx b/app/soapbox/components/still-image.tsx
index 8dce32f6f..8632d3c5d 100644
--- a/app/soapbox/components/still-image.tsx
+++ b/app/soapbox/components/still-image.tsx
@@ -16,10 +16,12 @@ interface IStillImage {
   letterboxed?: boolean
   /** Whether to show the file extension in the corner. */
   showExt?: boolean
+  /** Callback function if the image fails to load */
+  onError?(): void
 }
 
 /** Renders images on a canvas, only playing GIFs if autoPlayGif is enabled. */
-const StillImage: React.FC<IStillImage> = ({ alt, className, src, style, letterboxed = false, showExt = false }) => {
+const StillImage: React.FC<IStillImage> = ({ alt, className, src, style, letterboxed = false, showExt = false, onError }) => {
   const settings = useSettings();
   const autoPlayGif = settings.get('autoPlayGif');
 
@@ -55,6 +57,7 @@ const StillImage: React.FC<IStillImage> = ({ alt, className, src, style, letterb
         alt={alt}
         ref={img}
         onLoad={handleImageLoad}
+        onError={onError}
         className={clsx(baseClassName, {
           'invisible group-hover:visible': hoverToPlay,
         })}
diff --git a/app/soapbox/features/group/components/group-header.tsx b/app/soapbox/features/group/components/group-header.tsx
index a49d87fe7..f3180037b 100644
--- a/app/soapbox/features/group/components/group-header.tsx
+++ b/app/soapbox/features/group/components/group-header.tsx
@@ -1,11 +1,11 @@
 import { List as ImmutableList } from 'immutable';
-import React from 'react';
+import React, { useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals';
 import GroupAvatar from 'soapbox/components/groups/group-avatar';
 import StillImage from 'soapbox/components/still-image';
-import { HStack, Stack, Text } from 'soapbox/components/ui';
+import { HStack, Icon, Stack, Text } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
 import { normalizeAttachment } from 'soapbox/normalizers';
 import { isDefaultHeader } from 'soapbox/utils/accounts';
@@ -30,6 +30,8 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
+  const [isHeaderMissing, setIsHeaderMissing] = useState<boolean>(false);
+
   if (!group) {
     return (
       <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6'>
@@ -88,20 +90,27 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
         <StillImage
           src={group.header}
           alt={intl.formatMessage(messages.header)}
-          className='h-32 w-full bg-gray-200 object-center dark:bg-gray-900/50 md:rounded-t-xl lg:h-52'
+          className='relative h-32 w-full bg-gray-200 object-center dark:bg-gray-900/50 md:rounded-t-xl lg:h-52'
+          onError={() => setIsHeaderMissing(true)}
         />
       );
 
       if (!isDefaultHeader(group.header)) {
         header = (
-          <a href={group.header} onClick={handleHeaderClick} target='_blank'>
+          <a href={group.header} onClick={handleHeaderClick} target='_blank' className='relative'>
             {header}
           </a>
         );
       }
     }
 
-    return header;
+    return (
+      <div className='flex h-32 w-full items-center justify-center bg-gray-200 dark:bg-gray-800/30 md:rounded-t-xl lg:h-52'>
+        {isHeaderMissing ? (
+          <Icon src={require('@tabler/icons/photo-off.svg')} className='h-6 w-6 text-gray-500 dark:text-gray-700' />
+        ) : header}
+      </div>
+    );
   };
 
   return (

From 11cb90bb1560846454935c70d3daf525ad8e27a8 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 24 Apr 2023 11:33:42 -0400
Subject: [PATCH 189/298] Allow admins to report Groups

---
 app/soapbox/features/group/components/group-options-button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/group/components/group-options-button.tsx b/app/soapbox/features/group/components/group-options-button.tsx
index d3f877292..7f24a3668 100644
--- a/app/soapbox/features/group/components/group-options-button.tsx
+++ b/app/soapbox/features/group/components/group-options-button.tsx
@@ -51,7 +51,7 @@ const GroupOptionsButton = ({ group }: IGroupActionButton) => {
   const menu: Menu = useMemo(() => {
     const items = [];
 
-    if (isMember) {
+    if (isMember || isAdmin) {
       items.push({
         text: intl.formatMessage(messages.report),
         icon: require('@tabler/icons/flag.svg'),

From 9b90289e7cd919cf8fe1857ff8b1d82980762f25 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 24 Apr 2023 11:34:09 -0400
Subject: [PATCH 190/298] Fix confirmation step in Group report

---
 .../ui/components/modals/report-modal/report-modal.tsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
index 04252424d..566e75981 100644
--- a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
@@ -54,8 +54,8 @@ const reportSteps = {
   },
   [ReportableEntities.GROUP]: {
     ONE: ReasonStep,
-    TWO: ConfirmationStep,
-    THREE: null,
+    TWO: null,
+    THREE: ConfirmationStep,
   },
 };
 

From 50a005da5497d37ff1e8b49cc4fbe63c33285304 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 24 Apr 2023 11:46:31 -0400
Subject: [PATCH 191/298] Fix counter in Group tabs

---
 app/soapbox/pages/group-page.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index ae383be8c..79076a16a 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -76,12 +76,6 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   const isBlocked = group?.relationship?.blocked_by;
   const isPrivate = group?.locked;
 
-  // if ((group as any) === false) {
-  //   return (
-  //     <MissingIndicator />
-  //   );
-  // }
-
   const tabItems = useMemo(() => {
     const items = [];
     items.push({
@@ -111,7 +105,7 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
     });
 
     return items;
-  }, [features.groupsTags]);
+  }, [features.groupsTags, pending.length]);
 
   const renderChildren = () => {
     if (!isMember && isPrivate) {

From 68d3775737e0f8eddc4bd8ff30bf14ca8d28b131 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 24 Apr 2023 12:15:56 -0400
Subject: [PATCH 192/298] Clear pending groups cache

---
 .../group/components/group-action-button.tsx  |  7 ++-
 app/soapbox/queries/groups.ts                 | 48 +------------------
 2 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index 96653f97e..28f860a46 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -5,8 +5,10 @@ import { openModal } from 'soapbox/actions/modals';
 import { Button } from 'soapbox/components/ui';
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
-import { useAppDispatch } from 'soapbox/hooks';
+import { useAppDispatch, useOwnAccount } from 'soapbox/hooks';
 import { useCancelMembershipRequest, useJoinGroup, useLeaveGroup } from 'soapbox/hooks/api';
+import { queryClient } from 'soapbox/queries/client';
+import { GroupKeys } from 'soapbox/queries/groups';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
@@ -28,6 +30,7 @@ const messages = defineMessages({
 const GroupActionButton = ({ group }: IGroupActionButton) => {
   const dispatch = useAppDispatch();
   const intl = useIntl();
+  const account = useOwnAccount();
 
   const joinGroup = useJoinGroup(group);
   const leaveGroup = useLeaveGroup(group);
@@ -42,6 +45,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
   const onJoinGroup = () => joinGroup.mutate({}, {
     onSuccess() {
       joinGroup.invalidate();
+      queryClient.invalidateQueries(GroupKeys.pendingGroups(account?.id as string));
 
       toast.success(
         group.locked
@@ -71,6 +75,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
         requested: false,
       };
       dispatch(importEntities([entity], Entities.GROUP_RELATIONSHIPS));
+      queryClient.invalidateQueries(GroupKeys.pendingGroups(account?.id as string));
     },
   });
 
diff --git a/app/soapbox/queries/groups.ts b/app/soapbox/queries/groups.ts
index daf39806e..2291ba420 100644
--- a/app/soapbox/queries/groups.ts
+++ b/app/soapbox/queries/groups.ts
@@ -9,10 +9,7 @@ import { flattenPages, PaginatedResult } from 'soapbox/utils/queries';
 
 const GroupKeys = {
   group: (id: string) => ['groups', 'group', id] as const,
-  myGroups: (userId: string) => ['groups', userId] as const,
   pendingGroups: (userId: string) => ['groups', userId, 'pending'] as const,
-  popularGroups: ['groups', 'popular'] as const,
-  suggestedGroups: ['groups', 'suggested'] as const,
 };
 
 const useGroupsApi = () => {
@@ -49,50 +46,6 @@ const useGroupsApi = () => {
   return { fetchGroups };
 };
 
-const useGroups = () => {
-  const account = useOwnAccount();
-  const features = useFeatures();
-  const { fetchGroups } = useGroupsApi();
-
-  const getGroups = async (pageParam?: any): Promise<PaginatedResult<Group>> => {
-    const endpoint = '/api/v1/groups';
-    const nextPageLink = pageParam?.link;
-    const uri = nextPageLink || endpoint;
-    const { response, groups } = await fetchGroups(uri);
-
-    const link = getNextLink(response);
-    const hasMore = !!link;
-
-    return {
-      result: groups,
-      hasMore,
-      link,
-    };
-  };
-
-  const queryInfo = useInfiniteQuery(
-    GroupKeys.myGroups(account?.id as string),
-    ({ pageParam }: any) => getGroups(pageParam),
-    {
-      enabled: !!account && features.groups,
-      keepPreviousData: true,
-      getNextPageParam: (config) => {
-        if (config?.hasMore) {
-          return { nextLink: config?.link };
-        }
-
-        return undefined;
-      },
-    });
-
-  const data = flattenPages(queryInfo.data);
-
-  return {
-    ...queryInfo,
-    groups: data || [],
-  };
-};
-
 const usePendingGroups = () => {
   const features = useFeatures();
   const account = useOwnAccount();
@@ -162,4 +115,5 @@ export {
   useGroup,
   useGroups,
   usePendingGroups,
+  GroupKeys,
 };

From 1144b863a287b5d5c50e87e799f960b9a4edd45d Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 24 Apr 2023 13:01:01 -0400
Subject: [PATCH 193/298] Fix export

---
 app/soapbox/queries/groups.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/queries/groups.ts b/app/soapbox/queries/groups.ts
index 2291ba420..26152892e 100644
--- a/app/soapbox/queries/groups.ts
+++ b/app/soapbox/queries/groups.ts
@@ -113,7 +113,6 @@ const useGroup = (id: string) => {
 
 export {
   useGroup,
-  useGroups,
   usePendingGroups,
   GroupKeys,
 };

From 929935fb1930cfa78b3fde962afd327d114e3401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Tue, 25 Apr 2023 19:14:02 +0200
Subject: [PATCH 194/298] Fix default privacy setting on Mastodon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/reducers/compose.ts | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/soapbox/reducers/compose.ts b/app/soapbox/reducers/compose.ts
index 7aefbae25..ef1571954 100644
--- a/app/soapbox/reducers/compose.ts
+++ b/app/soapbox/reducers/compose.ts
@@ -245,25 +245,13 @@ const getAccountSettings = (account: ImmutableMap<string, any>) => {
 const importAccount = (compose: Compose, account: APIEntity) => {
   const settings = getAccountSettings(ImmutableMap(fromJS(account)));
 
-  const defaultPrivacy = settings.get('defaultPrivacy', 'public');
-  const defaultContentType = settings.get('defaultContentType', 'text/plain');
-
-  return compose.merge({
-    privacy: defaultPrivacy,
-    content_type: defaultContentType,
-    tagHistory: ImmutableList(tagHistory.get(account.id)),
-  });
-};
-
-const updateAccount = (compose: Compose, account: APIEntity) => {
-  const settings = getAccountSettings(ImmutableMap(fromJS(account)));
-
   const defaultPrivacy = settings.get('defaultPrivacy');
   const defaultContentType = settings.get('defaultContentType');
 
   return compose.withMutations(compose => {
     if (defaultPrivacy) compose.set('privacy', defaultPrivacy);
     if (defaultContentType) compose.set('content_type', defaultContentType);
+    compose.set('tagHistory', ImmutableList(tagHistory.get(account.id)));
   });
 };
 
@@ -507,9 +495,8 @@ export default function compose(state = initialState, action: AnyAction) {
     case COMPOSE_SET_GROUP_TIMELINE_VISIBLE:
       return updateCompose(state, action.id, compose => compose.set('group_timeline_visible', action.groupTimelineVisible));
     case ME_FETCH_SUCCESS:
-      return updateCompose(state, 'default', compose => importAccount(compose, action.me));
     case ME_PATCH_SUCCESS:
-      return updateCompose(state, 'default', compose => updateAccount(compose, action.me));
+      return updateCompose(state, 'default', compose => importAccount(compose, action.me));
     case SETTING_CHANGE:
       return updateCompose(state, 'default', compose => updateSetting(compose, action.path, action.value));
     default:

From 36be68cdcc83b57b92224e1a8047792df167d0d8 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 25 Apr 2023 15:27:39 -0400
Subject: [PATCH 195/298] Improve fallback of Group Avatars not loading

---
 app/soapbox/components/group-card.tsx         | 18 ++-----
 app/soapbox/components/still-image.tsx        |  2 +-
 app/soapbox/components/ui/avatar/avatar.tsx   | 34 ++++++++++---
 .../group/components/group-header-image.tsx   | 50 +++++++++++++++++++
 .../components/discover/group-grid-item.tsx   | 12 ++---
 5 files changed, 88 insertions(+), 28 deletions(-)
 create mode 100644 app/soapbox/features/group/components/group-header-image.tsx

diff --git a/app/soapbox/components/group-card.tsx b/app/soapbox/components/group-card.tsx
index 2aee2bc7f..84e771902 100644
--- a/app/soapbox/components/group-card.tsx
+++ b/app/soapbox/components/group-card.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
 
+import GroupHeaderImage from 'soapbox/features/group/components/group-header-image';
 import GroupMemberCount from 'soapbox/features/group/components/group-member-count';
 import GroupPrivacy from 'soapbox/features/group/components/group-privacy';
 import GroupRelationship from 'soapbox/features/group/components/group-relationship';
@@ -10,17 +10,11 @@ import { HStack, Stack, Text } from './ui';
 
 import type { Group as GroupEntity } from 'soapbox/types/entities';
 
-const messages = defineMessages({
-  groupHeader: { id: 'group.header.alt', defaultMessage: 'Group header' },
-});
-
 interface IGroupCard {
   group: GroupEntity
 }
 
 const GroupCard: React.FC<IGroupCard> = ({ group }) => {
-  const intl = useIntl();
-
   return (
     <Stack
       className='relative h-[240px] rounded-lg border border-solid border-gray-300 bg-white dark:border-primary-800 dark:bg-primary-900'
@@ -28,12 +22,10 @@ const GroupCard: React.FC<IGroupCard> = ({ group }) => {
     >
       {/* Group Cover Image */}
       <Stack grow className='relative basis-1/2 rounded-t-lg bg-primary-100 dark:bg-gray-800'>
-        {group.header && (
-          <img
-            className='absolute inset-0 h-full w-full rounded-t-lg object-cover'
-            src={group.header} alt={intl.formatMessage(messages.groupHeader)}
-          />
-        )}
+        <GroupHeaderImage
+          group={group}
+          className='absolute inset-0 h-full w-full rounded-t-lg object-cover'
+        />
       </Stack>
 
       {/* Group Avatar */}
diff --git a/app/soapbox/components/still-image.tsx b/app/soapbox/components/still-image.tsx
index 8632d3c5d..cdebaf359 100644
--- a/app/soapbox/components/still-image.tsx
+++ b/app/soapbox/components/still-image.tsx
@@ -3,7 +3,7 @@ import React, { useRef } from 'react';
 
 import { useSettings } from 'soapbox/hooks';
 
-interface IStillImage {
+export interface IStillImage {
   /** Image alt text. */
   alt?: string
   /** Extra class names for the outer <div> container. */
diff --git a/app/soapbox/components/ui/avatar/avatar.tsx b/app/soapbox/components/ui/avatar/avatar.tsx
index aef3c7147..762939776 100644
--- a/app/soapbox/components/ui/avatar/avatar.tsx
+++ b/app/soapbox/components/ui/avatar/avatar.tsx
@@ -1,34 +1,54 @@
 import clsx from 'clsx';
-import React from 'react';
+import React, { useState } from 'react';
 
-import StillImage from 'soapbox/components/still-image';
+import StillImage, { IStillImage } from 'soapbox/components/still-image';
+
+import Icon from '../icon/icon';
 
 const AVATAR_SIZE = 42;
 
-interface IAvatar {
-  /** URL to the avatar image. */
-  src: string
+interface IAvatar extends Pick<IStillImage, 'src' | 'onError' | 'className'> {
   /** Width and height of the avatar in pixels. */
   size?: number
-  /** Extra class names for the div surrounding the avatar image. */
-  className?: string
 }
 
 /** Round profile avatar for accounts. */
 const Avatar = (props: IAvatar) => {
   const { src, size = AVATAR_SIZE, className } = props;
 
+  const [isAvatarMissing, setIsAvatarMissing] = useState<boolean>(false);
+
+  const handleLoadFailure = () => setIsAvatarMissing(true);
+
   const style: React.CSSProperties = React.useMemo(() => ({
     width: size,
     height: size,
   }), [size]);
 
+  if (isAvatarMissing) {
+    return (
+      <div
+        style={{
+          width: size,
+          height: size,
+        }}
+        className={clsx('flex items-center justify-center rounded-full bg-gray-200 dark:bg-gray-900', className)}
+      >
+        <Icon
+          src={require('@tabler/icons/photo-off.svg')}
+          className='h-4 w-4 text-gray-500 dark:text-gray-700'
+        />
+      </div>
+    );
+  }
+
   return (
     <StillImage
       className={clsx('rounded-full', className)}
       style={style}
       src={src}
       alt='Avatar'
+      onError={handleLoadFailure}
     />
   );
 };
diff --git a/app/soapbox/features/group/components/group-header-image.tsx b/app/soapbox/features/group/components/group-header-image.tsx
new file mode 100644
index 000000000..f40749536
--- /dev/null
+++ b/app/soapbox/features/group/components/group-header-image.tsx
@@ -0,0 +1,50 @@
+import clsx from 'clsx';
+import React, { useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Icon } from 'soapbox/components/ui';
+
+import type { Group } from 'soapbox/schemas';
+
+const messages = defineMessages({
+  header: { id: 'group.header.alt', defaultMessage: 'Group header' },
+});
+
+interface IGroupHeaderImage {
+  group?: Group | false | null
+  className?: string
+}
+
+const GroupHeaderImage: React.FC<IGroupHeaderImage> = ({ className, group }) => {
+  const intl = useIntl();
+
+  const [isHeaderMissing, setIsHeaderMissing] = useState<boolean>(false);
+
+  if (!group || !group.header) {
+    return null;
+  }
+
+  if (isHeaderMissing) {
+    return (
+      <div
+        className={clsx(className, 'flex items-center justify-center bg-gray-200 dark:bg-gray-800/30')}
+      >
+        <Icon
+          src={require('@tabler/icons/photo-off.svg')}
+          className='h-6 w-6 text-gray-500 dark:text-gray-700'
+        />
+      </div>
+    );
+  }
+
+  return (
+    <img
+      className={className}
+      src={group.header}
+      alt={intl.formatMessage(messages.header)}
+      onError={() => setIsHeaderMissing(true)}
+    />
+  );
+};
+
+export default GroupHeaderImage;
diff --git a/app/soapbox/features/groups/components/discover/group-grid-item.tsx b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
index da8f7542c..c30055971 100644
--- a/app/soapbox/features/groups/components/discover/group-grid-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
 import GroupAvatar from 'soapbox/components/groups/group-avatar';
 import { HStack, Stack, Text } from 'soapbox/components/ui';
 import GroupActionButton from 'soapbox/features/group/components/group-action-button';
+import GroupHeaderImage from 'soapbox/features/group/components/group-header-image';
 import GroupMemberCount from 'soapbox/features/group/components/group-member-count';
 import GroupPrivacy from 'soapbox/features/group/components/group-privacy';
 
@@ -31,13 +32,10 @@ const GroupGridItem = forwardRef((props: IGroup, ref: React.ForwardedRef<HTMLDiv
           ref={ref}
           style={{ minHeight: 180 }}
         >
-          {group.header && (
-            <img
-              src={group.header}
-              alt='Group cover'
-              className='absolute inset-0 object-cover'
-            />
-          )}
+          <GroupHeaderImage
+            group={group}
+            className='absolute inset-0 object-cover'
+          />
 
           <div
             className='absolute inset-x-0 bottom-0 flex justify-center rounded-b-lg bg-gradient-to-t from-gray-900 to-transparent pb-8 pt-12 transition-opacity duration-500'

From 6cda34fb69c091ac029ec0f957f237185fe6e6dd Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 25 Apr 2023 10:03:21 -0400
Subject: [PATCH 196/298] Handle null group in confirmation step

---
 .../modals/manage-group-modal/create-group-modal.tsx |  2 +-
 .../manage-group-modal/steps/confirmation-step.tsx   | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
index 9f5d143a7..f09232b42 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
@@ -94,7 +94,7 @@ const CreateGroupModal: React.FC<ICreateGroupModal> = ({ onClose }) => {
       case Steps.TWO:
         return <DetailsStep params={params} onChange={setParams} />;
       case Steps.THREE:
-        return <ConfirmationStep group={group!} />;
+        return <ConfirmationStep group={group} />;
     }
   };
 
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index f0be4f73b..0b7a38d0e 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -8,7 +8,7 @@ import copy from 'soapbox/utils/copy';
 import type { Group } from 'soapbox/schemas';
 
 interface IConfirmationStep {
-  group: Group
+  group: Group | null
 }
 
 const messages = defineMessages({
@@ -19,20 +19,24 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
   const intl = useIntl();
 
   const handleCopyLink = () => {
-    copy(`${window.location.origin}/group/${group.slug}`, () => {
+    copy(`${window.location.origin}/group/${group?.slug}`, () => {
       toast.success(intl.formatMessage(messages.copied));
     });
   };
 
   const handleShare = () => {
     navigator.share({
-      text: group.display_name,
-      url: group.uri,
+      text: group?.display_name,
+      url: group?.uri,
     }).catch((e) => {
       if (e.name !== 'AbortError') console.error(e);
     });
   };
 
+  if (!group) {
+    return null;
+  }
+
   return (
     <Stack space={9}>
       <Stack space={3}>

From 4f0cafabcfc393d3d0fc2da3a1bdcbcc53d26f7f Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 19 Apr 2023 12:40:08 -0400
Subject: [PATCH 197/298] Fix logic with toggling Group Tag visibility

---
 .../features/group/components/group-tag-list-item.tsx      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index e4d718695..329913095 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -41,13 +41,16 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
   const isOwner = group.relationship?.role === GroupRoles.OWNER;
 
   const toggleVisibility = () => {
+    const isHiding = tag.visible;
+
     updateGroupTag({
-      group_tag_type: tag.visible ? 'hidden' : 'normal',
+      group_tag_type: isHiding ? 'hidden' : 'normal',
     }, {
       onSuccess() {
-        const entity = {
+        const entity: GroupTag = {
           ...tag,
           visible: !tag.visible,
+          pinned: isHiding ? false : tag.pinned, // unpin if we're hiding
         };
         dispatch(importEntities([entity], Entities.GROUP_TAGS));
 

From 5d923842c5434c256b950d0e11df88f09ab8d1b6 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 26 Apr 2023 09:17:31 -0400
Subject: [PATCH 198/298] Change 'uses' to 'groups' in Tag schema

---
 app/soapbox/features/group/components/group-tag-list-item.tsx   | 2 +-
 .../features/groups/components/discover/tag-list-item.tsx       | 2 +-
 app/soapbox/schemas/group-tag.ts                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index e4d718695..643f3ef39 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -134,7 +134,7 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
             {intl.formatMessage(messages.total)}:
             {' '}
             <Text size='sm' theme='inherit' weight='semibold' tag='span'>
-              {shortNumberFormat(tag.uses)}
+              {shortNumberFormat(tag.groups)}
             </Text>
           </Text>
         </Stack>
diff --git a/app/soapbox/features/groups/components/discover/tag-list-item.tsx b/app/soapbox/features/groups/components/discover/tag-list-item.tsx
index c899e1085..fc71f7144 100644
--- a/app/soapbox/features/groups/components/discover/tag-list-item.tsx
+++ b/app/soapbox/features/groups/components/discover/tag-list-item.tsx
@@ -29,7 +29,7 @@ const TagListItem = (props: ITagListItem) => {
             defaultMessage='Number of groups'
           />
           :{' '}
-          {tag.uses}
+          {tag.groups}
         </Text>
       </Stack>
     </Link>
diff --git a/app/soapbox/schemas/group-tag.ts b/app/soapbox/schemas/group-tag.ts
index 9fa885569..f49162cfd 100644
--- a/app/soapbox/schemas/group-tag.ts
+++ b/app/soapbox/schemas/group-tag.ts
@@ -3,7 +3,7 @@ import z from 'zod';
 const groupTagSchema = z.object({
   id: z.string(),
   name: z.string(),
-  uses: z.number().optional(),
+  groups: z.number().optional(),
   url: z.string().optional(),
   pinned: z.boolean().optional().catch(false),
   visible: z.boolean().optional().default(true),

From b2848f52f9ccee652ae70cab8a0a66178d8ea29e Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 26 Apr 2023 09:46:31 -0400
Subject: [PATCH 199/298] Hide status info if Thread Status

---
 app/soapbox/features/status/components/thread-status.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/status/components/thread-status.tsx b/app/soapbox/features/status/components/thread-status.tsx
index 871e8f431..c3ff7bc65 100644
--- a/app/soapbox/features/status/components/thread-status.tsx
+++ b/app/soapbox/features/status/components/thread-status.tsx
@@ -44,7 +44,7 @@ const ThreadStatus: React.FC<IThreadStatus> = (props): JSX.Element => {
       {renderConnector()}
       {isLoaded ? (
         // @ts-ignore FIXME
-        <StatusContainer {...props} />
+        <StatusContainer {...props} showGroup={false} />
       ) : (
         <PlaceholderStatus variant='slim' />
       )}

From 7548c264904967ac584c10b22a5cc98ed195ea11 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 26 Apr 2023 10:11:54 -0400
Subject: [PATCH 200/298] Hide 'View group' button if already on Group

---
 .../groups/popover/group-popover.tsx          | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/soapbox/components/groups/popover/group-popover.tsx b/app/soapbox/components/groups/popover/group-popover.tsx
index ba2457fb3..245420af6 100644
--- a/app/soapbox/components/groups/popover/group-popover.tsx
+++ b/app/soapbox/components/groups/popover/group-popover.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Link } from 'react-router-dom';
+import { Link, matchPath, useHistory } from 'react-router-dom';
 
 import { Button, Divider, HStack, Popover, Stack, Text } from 'soapbox/components/ui';
 import GroupMemberCount from 'soapbox/features/group/components/group-member-count';
@@ -26,6 +26,13 @@ const GroupPopover = (props: IGroupPopoverContainer) => {
   const { children, group, isEnabled } = props;
 
   const intl = useIntl();
+  const history = useHistory();
+
+  const path = history.location.pathname;
+  const shouldHideAction = matchPath(path, {
+    path: ['/group/:groupSlug'],
+    exact: true,
+  });
 
   if (!isEnabled) {
     return children;
@@ -36,7 +43,7 @@ const GroupPopover = (props: IGroupPopoverContainer) => {
       interaction='click'
       referenceElementClassName='cursor-pointer'
       content={
-        <Stack space={4} className='w-80'>
+        <Stack space={4} className='w-80 pb-4'>
           <Stack
             className='relative h-60 rounded-lg bg-white dark:border-primary-800 dark:bg-primary-900'
             data-testid='group-card'
@@ -79,13 +86,15 @@ const GroupPopover = (props: IGroupPopoverContainer) => {
             </Text>
           </Stack>
 
-          <div className='px-4 pb-4'>
-            <Link to={`/group/${group.slug}`}>
-              <Button type='button' theme='secondary' block>
-                {intl.formatMessage(messages.action)}
-              </Button>
-            </Link>
-          </div>
+          {!shouldHideAction && (
+            <div className='px-4'>
+              <Link to={`/group/${group.slug}`}>
+                <Button type='button' theme='secondary' block>
+                  {intl.formatMessage(messages.action)}
+                </Button>
+              </Link>
+            </div>
+          )}
         </Stack>
       }
       isFlush

From 472092201584360950048bc512aa181fcc5046fc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 26 Apr 2023 12:45:39 -0500
Subject: [PATCH 201/298] ComposeButton: style group compose button

---
 .../features/ui/components/compose-button.tsx | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/compose-button.tsx b/app/soapbox/features/ui/components/compose-button.tsx
index 155a7194e..dc414647b 100644
--- a/app/soapbox/features/ui/components/compose-button.tsx
+++ b/app/soapbox/features/ui/components/compose-button.tsx
@@ -1,11 +1,23 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
+import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { openModal } from 'soapbox/actions/modals';
-import { Button } from 'soapbox/components/ui';
+import { Avatar, Button, HStack } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
+import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 const ComposeButton = () => {
+  const location = useLocation();
+
+  if (location.pathname.startsWith('/group/')) {
+    return <GroupComposeButton />;
+  }
+
+  return <HomeComposeButton />;
+};
+
+const HomeComposeButton = () => {
   const dispatch = useAppDispatch();
   const onOpenCompose = () => dispatch(openModal('COMPOSE'));
 
@@ -22,4 +34,32 @@ const ComposeButton = () => {
   );
 };
 
+const GroupComposeButton = () => {
+  const dispatch = useAppDispatch();
+  const match = useRouteMatch<{ groupSlug: string }>('/group/:groupSlug');
+  const { entity: group } = useGroupLookup(match?.params.groupSlug || '');
+
+  const onOpenCompose = () => dispatch(openModal('COMPOSE'));
+
+  if (group) {
+    return (
+      <Button
+        theme='accent'
+        size='lg'
+        onClick={onOpenCompose}
+        block
+      >
+        <HStack space={3} alignItems='center'>
+          <Avatar className='-my-1 border-2 border-white' size={30} src={group.avatar} />
+          <span>
+            <FormattedMessage id='navigation.compose_group' defaultMessage='Compose to Group' />
+          </span>
+        </HStack>
+      </Button>
+    );
+  }
+
+  return null;
+};
+
 export default ComposeButton;

From 3a5f9f3c9306123f2e5454ed2364998cb6d8f1d8 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 26 Apr 2023 14:27:36 -0400
Subject: [PATCH 202/298] Update GroupRelationship state after join/leave group

---
 .../features/group/components/group-action-button.tsx      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index 28f860a46..e9a47a962 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
 import { openModal } from 'soapbox/actions/modals';
 import { Button } from 'soapbox/components/ui';
 import { importEntities } from 'soapbox/entity-store/actions';
@@ -43,8 +44,9 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
   const isBlocked = group.relationship?.blocked_by;
 
   const onJoinGroup = () => joinGroup.mutate({}, {
-    onSuccess() {
+    onSuccess(entity) {
       joinGroup.invalidate();
+      dispatch(fetchGroupRelationshipsSuccess([entity]));
       queryClient.invalidateQueries(GroupKeys.pendingGroups(account?.id as string));
 
       toast.success(
@@ -61,8 +63,9 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
       message: intl.formatMessage(messages.confirmationMessage),
       confirm: intl.formatMessage(messages.confirmationConfirm),
       onConfirm: () => leaveGroup.mutate(group.relationship?.id as string, {
-        onSuccess() {
+        onSuccess(entity) {
           leaveGroup.invalidate();
+          dispatch(fetchGroupRelationshipsSuccess([entity]));
           toast.success(intl.formatMessage(messages.leaveSuccess));
         },
       }),

From 27f632786fc530e5b4b7cfc44b838a2faeb2e266 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 26 Apr 2023 15:53:52 -0400
Subject: [PATCH 203/298] Account for soft-deleted Groups in the profile

---
 .../group/components/group-header.tsx         | 38 ++++++++------
 app/soapbox/locales/en.json                   |  3 ++
 app/soapbox/normalizers/group.ts              |  1 +
 app/soapbox/pages/group-page.tsx              | 51 +++++++++++++++----
 app/soapbox/schemas/group.ts                  |  1 +
 5 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/app/soapbox/features/group/components/group-header.tsx b/app/soapbox/features/group/components/group-header.tsx
index f3180037b..9626906d5 100644
--- a/app/soapbox/features/group/components/group-header.tsx
+++ b/app/soapbox/features/group/components/group-header.tsx
@@ -52,6 +52,8 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
     );
   }
 
+  const isDeleted = !!group.deleted_at;
+
   const onAvatarClick = () => {
     const avatar = normalizeAttachment({
       type: 'image',
@@ -136,24 +138,28 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
           dangerouslySetInnerHTML={{ __html: group.display_name_html }}
         />
 
-        <Stack space={1} alignItems='center'>
-          <HStack className='text-gray-700 dark:text-gray-600' space={2} wrap>
-            <GroupRelationship group={group} />
-            <GroupPrivacy group={group} />
-            <GroupMemberCount group={group} />
-          </HStack>
+        {!isDeleted && (
+          <>
+            <Stack space={1} alignItems='center'>
+              <HStack className='text-gray-700 dark:text-gray-600' space={2} wrap>
+                <GroupRelationship group={group} />
+                <GroupPrivacy group={group} />
+                <GroupMemberCount group={group} />
+              </HStack>
 
-          <Text
-            theme='muted'
-            align='center'
-            dangerouslySetInnerHTML={{ __html: group.note_emojified }}
-          />
-        </Stack>
+              <Text
+                theme='muted'
+                align='center'
+                dangerouslySetInnerHTML={{ __html: group.note_emojified }}
+              />
+            </Stack>
 
-        <HStack alignItems='center' space={2}>
-          <GroupOptionsButton group={group} />
-          <GroupActionButton group={group} />
-        </HStack>
+            <HStack alignItems='center' space={2}>
+              <GroupOptionsButton group={group} />
+              <GroupActionButton group={group} />
+            </HStack>
+          </>
+        )}
       </Stack>
     </div>
   );
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 3f6c24526..b9c54f32c 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -768,8 +768,10 @@
   "gdpr.message": "{siteTitle} uses session cookies, which are essential to the website's functioning.",
   "gdpr.title": "{siteTitle} uses cookies",
   "getting_started.open_source_notice": "{code_name} is open source software. You can contribute or report issues at {code_link} (v{code_version}).",
+  "group.banned.message": "You are banned from",
   "group.cancel_request": "Cancel Request",
   "group.delete.success": "Group successfully deleted",
+  "group.deleted.message": "This group has been deleted.",
   "group.demote.user.success": "@{name} is now a member",
   "group.group_mod_authorize.fail": "Failed to approve @{name}",
   "group.group_mod_block": "Ban from group",
@@ -801,6 +803,7 @@
   "group.privacy.public": "Public",
   "group.privacy.public.full": "Public Group",
   "group.privacy.public.info": "Discoverable. Anyone can join.",
+  "group.private.message": "Content is only visible to group members",
   "group.promote.admin.confirmation.message": "Are you sure you want to assign the admin role to @{name}?",
   "group.promote.admin.confirmation.title": "Assign Admin Role",
   "group.promote.admin.success": "@{name} is now an admin",
diff --git a/app/soapbox/normalizers/group.ts b/app/soapbox/normalizers/group.ts
index 127bca29f..152a6c3c4 100644
--- a/app/soapbox/normalizers/group.ts
+++ b/app/soapbox/normalizers/group.ts
@@ -21,6 +21,7 @@ export const GroupRecord = ImmutableRecord({
   avatar: '',
   avatar_static: '',
   created_at: '',
+  deleted_at: null,
   display_name: '',
   domain: '',
   emojis: [] as Emoji[],
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index 79076a16a..9e11c34a9 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { useRouteMatch } from 'react-router-dom';
 
 import GroupLookupHoc from 'soapbox/components/hoc/group-lookup-hoc';
@@ -34,26 +34,56 @@ interface IGroupPage {
   children: React.ReactNode
 }
 
-const PrivacyBlankslate = () => (
+const DeletedBlankslate = () => (
   <Stack space={4} className='py-10' alignItems='center'>
-    <div className='rounded-full bg-gray-200 p-3'>
-      <Icon src={require('@tabler/icons/eye-off.svg')} className='h-6 w-6 text-gray-600' />
+    <div className='rounded-full bg-danger-200 p-3 dark:bg-danger-400/20'>
+      <Icon
+        src={require('@tabler/icons/trash.svg')}
+        className='h-6 w-6 text-danger-600 dark:text-danger-400'
+      />
     </div>
 
     <Text theme='muted'>
-      Content is only visible to group members
+      <FormattedMessage
+        id='group.deleted.message'
+        defaultMessage='This group has been deleted.'
+      />
+    </Text>
+  </Stack>
+);
+
+const PrivacyBlankslate = () => (
+  <Stack space={4} className='py-10' alignItems='center'>
+    <div className='rounded-full bg-gray-200 p-3 dark:bg-gray-800'>
+      <Icon
+        src={require('@tabler/icons/eye-off.svg')}
+        className='h-6 w-6 text-gray-600 dark:text-gray-600'
+      />
+    </div>
+
+    <Text theme='muted'>
+      <FormattedMessage
+        id='group.private.message'
+        defaultMessage='Content is only visible to group members'
+      />
     </Text>
   </Stack>
 );
 
 const BlockedBlankslate = ({ group }: { group: Group }) => (
   <Stack space={4} className='py-10' alignItems='center'>
-    <div className='rounded-full bg-danger-200 p-3'>
-      <Icon src={require('@tabler/icons/eye-off.svg')} className='h-6 w-6 text-danger-600' />
+    <div className='rounded-full bg-danger-200 p-3 dark:bg-danger-400/20'>
+      <Icon
+        src={require('@tabler/icons/ban.svg')}
+        className='h-6 w-6 text-danger-600 dark:text-danger-400'
+      />
     </div>
 
     <Text theme='muted'>
-      You are banned from
+      <FormattedMessage
+        id='group.banned.message'
+        defaultMessage='You are banned from'
+      />
       {' '}
       <Text theme='inherit' tag='span' dangerouslySetInnerHTML={{ __html: group.display_name_html }} />
     </Text>
@@ -75,6 +105,7 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   const isMember = !!group?.relationship?.member;
   const isBlocked = group?.relationship?.blocked_by;
   const isPrivate = group?.locked;
+  const isDeleted = !!group?.deleted_at;
 
   const tabItems = useMemo(() => {
     const items = [];
@@ -108,7 +139,9 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   }, [features.groupsTags, pending.length]);
 
   const renderChildren = () => {
-    if (!isMember && isPrivate) {
+    if (isDeleted) {
+      return <DeletedBlankslate />;
+    } else if (!isMember && isPrivate) {
       return <PrivacyBlankslate />;
     } else if (isBlocked) {
       return <BlockedBlankslate group={group} />;
diff --git a/app/soapbox/schemas/group.ts b/app/soapbox/schemas/group.ts
index 746ae9d33..752846b42 100644
--- a/app/soapbox/schemas/group.ts
+++ b/app/soapbox/schemas/group.ts
@@ -16,6 +16,7 @@ const groupSchema = z.object({
   avatar: z.string().catch(avatarMissing),
   avatar_static: z.string().catch(''),
   created_at: z.string().datetime().catch(new Date().toUTCString()),
+  deleted_at: z.string().datetime().or(z.null()).catch(null),
   display_name: z.string().catch(''),
   domain: z.string().catch(''),
   emojis: filteredArray(customEmojiSchema).catch([]),

From f9b595406063daefedf3f64c49c11df100193db5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 26 Apr 2023 15:07:19 -0500
Subject: [PATCH 204/298] ComposeModal: allow passing a composeId

---
 app/soapbox/actions/compose.ts                         | 10 ++++++++++
 app/soapbox/features/ui/components/compose-button.tsx  |  7 ++++++-
 .../features/ui/components/modals/compose-modal.tsx    |  7 +++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/actions/compose.ts b/app/soapbox/actions/compose.ts
index 995f37c15..61303d15b 100644
--- a/app/soapbox/actions/compose.ts
+++ b/app/soapbox/actions/compose.ts
@@ -22,6 +22,7 @@ import { createStatus } from './statuses';
 
 import type { AutoSuggestion } from 'soapbox/components/autosuggest-input';
 import type { Emoji } from 'soapbox/features/emoji';
+import type { Group } from 'soapbox/schemas';
 import type { AppDispatch, RootState } from 'soapbox/store';
 import type { Account, APIEntity, Status, Tag } from 'soapbox/types/entities';
 import type { History } from 'soapbox/types/history';
@@ -168,6 +169,14 @@ 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,
@@ -829,6 +838,7 @@ export {
   uploadComposeFail,
   undoUploadCompose,
   groupCompose,
+  groupComposeModal,
   setGroupTimelineVisible,
   clearComposeSuggestions,
   fetchComposeSuggestions,
diff --git a/app/soapbox/features/ui/components/compose-button.tsx b/app/soapbox/features/ui/components/compose-button.tsx
index dc414647b..e16e2713c 100644
--- a/app/soapbox/features/ui/components/compose-button.tsx
+++ b/app/soapbox/features/ui/components/compose-button.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { useLocation, useRouteMatch } from 'react-router-dom';
 
+import { groupComposeModal } from 'soapbox/actions/compose';
 import { openModal } from 'soapbox/actions/modals';
 import { Avatar, Button, HStack } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
@@ -39,7 +40,11 @@ const GroupComposeButton = () => {
   const match = useRouteMatch<{ groupSlug: string }>('/group/:groupSlug');
   const { entity: group } = useGroupLookup(match?.params.groupSlug || '');
 
-  const onOpenCompose = () => dispatch(openModal('COMPOSE'));
+  const onOpenCompose = () => {
+    if (group) {
+      dispatch(groupComposeModal(group));
+    }
+  };
 
   if (group) {
     return (
diff --git a/app/soapbox/features/ui/components/modals/compose-modal.tsx b/app/soapbox/features/ui/components/modals/compose-modal.tsx
index 72a06fb7c..079bedc42 100644
--- a/app/soapbox/features/ui/components/modals/compose-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/compose-modal.tsx
@@ -18,14 +18,13 @@ const messages = defineMessages({
 
 interface IComposeModal {
   onClose: (type?: string) => void
+  composeId?: string
 }
 
-const ComposeModal: React.FC<IComposeModal> = ({ onClose }) => {
+const ComposeModal: React.FC<IComposeModal> = ({ onClose, composeId = 'compose-modal' }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const node = useRef<HTMLDivElement>(null);
-
-  const composeId = 'compose-modal';
   const compose = useCompose(composeId);
 
   const { id: statusId, privacy, in_reply_to: inReplyTo, quote } = compose!;
@@ -79,7 +78,7 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose }) => {
         'ring-2 ring-offset-2 ring-primary-600': isDraggedOver,
       })}
     >
-      <ComposeForm id='compose-modal' />
+      <ComposeForm id={composeId} />
     </Modal>
   );
 };

From a193108ef8efabe98948861f4b10842986212b19 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 26 Apr 2023 15:14:54 -0500
Subject: [PATCH 205/298] ComposeModal: become group-aware

---
 app/soapbox/features/ui/components/modals/compose-modal.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/modals/compose-modal.tsx b/app/soapbox/features/ui/components/modals/compose-modal.tsx
index 079bedc42..f29df9042 100644
--- a/app/soapbox/features/ui/components/modals/compose-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/compose-modal.tsx
@@ -27,7 +27,7 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose, composeId = 'compose-m
   const node = useRef<HTMLDivElement>(null);
   const compose = useCompose(composeId);
 
-  const { id: statusId, privacy, in_reply_to: inReplyTo, quote } = compose!;
+  const { id: statusId, privacy, in_reply_to: inReplyTo, quote, group_id: groupId } = compose!;
 
   const { isDragging, isDraggedOver } = useDraggedFiles(node, (files) => {
     dispatch(uploadCompose(composeId, files, intl));
@@ -59,6 +59,10 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose, composeId = 'compose-m
       return <FormattedMessage id='navigation_bar.compose_edit' defaultMessage='Edit post' />;
     } else if (privacy === 'direct') {
       return <FormattedMessage id='navigation_bar.compose_direct' defaultMessage='Direct message' />;
+    } else if (inReplyTo && groupId) {
+      return <FormattedMessage id='navigation_bar.compose_group_reply' defaultMessage='Reply to group post' />;
+    } else if (groupId) {
+      return <FormattedMessage id='navigation_bar.compose_group' defaultMessage='Compose to group' />;
     } else if (inReplyTo) {
       return <FormattedMessage id='navigation_bar.compose_reply' defaultMessage='Reply to post' />;
     } else if (quote) {

From 506cad3b706b6cc98afb5ce68d41a460012a54bc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 26 Apr 2023 15:33:34 -0500
Subject: [PATCH 206/298] FloatingActionButton: contextual group support

---
 .../features/ui/components/compose-button.tsx | 40 +++++++-------
 .../ui/components/floating-action-button.tsx  | 53 +++++++++++++++++--
 2 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/app/soapbox/features/ui/components/compose-button.tsx b/app/soapbox/features/ui/components/compose-button.tsx
index e16e2713c..a2944f699 100644
--- a/app/soapbox/features/ui/components/compose-button.tsx
+++ b/app/soapbox/features/ui/components/compose-button.tsx
@@ -40,31 +40,27 @@ const GroupComposeButton = () => {
   const match = useRouteMatch<{ groupSlug: string }>('/group/:groupSlug');
   const { entity: group } = useGroupLookup(match?.params.groupSlug || '');
 
+  if (!group) return null;
+
   const onOpenCompose = () => {
-    if (group) {
-      dispatch(groupComposeModal(group));
-    }
+    dispatch(groupComposeModal(group));
   };
 
-  if (group) {
-    return (
-      <Button
-        theme='accent'
-        size='lg'
-        onClick={onOpenCompose}
-        block
-      >
-        <HStack space={3} alignItems='center'>
-          <Avatar className='-my-1 border-2 border-white' size={30} src={group.avatar} />
-          <span>
-            <FormattedMessage id='navigation.compose_group' defaultMessage='Compose to Group' />
-          </span>
-        </HStack>
-      </Button>
-    );
-  }
-
-  return null;
+  return (
+    <Button
+      theme='accent'
+      size='lg'
+      onClick={onOpenCompose}
+      block
+    >
+      <HStack space={3} alignItems='center'>
+        <Avatar className='-my-1 border-2 border-white' size={30} src={group.avatar} />
+        <span>
+          <FormattedMessage id='navigation.compose_group' defaultMessage='Compose to Group' />
+        </span>
+      </HStack>
+    </Button>
+  );
 };
 
 export default ComposeButton;
diff --git a/app/soapbox/features/ui/components/floating-action-button.tsx b/app/soapbox/features/ui/components/floating-action-button.tsx
index 8800cf444..0e972ef40 100644
--- a/app/soapbox/features/ui/components/floating-action-button.tsx
+++ b/app/soapbox/features/ui/components/floating-action-button.tsx
@@ -1,20 +1,30 @@
 import clsx from 'clsx';
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
+import { useLocation, useRouteMatch } from 'react-router-dom';
 
+import { groupComposeModal } from 'soapbox/actions/compose';
 import { openModal } from 'soapbox/actions/modals';
-import { Icon } from 'soapbox/components/ui';
+import { Avatar, HStack, Icon } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
+import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 const messages = defineMessages({
   publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
 });
 
-interface IFloatingActionButton {
-}
-
 /** FloatingActionButton (aka FAB), a composer button that floats in the corner on mobile. */
-const FloatingActionButton: React.FC<IFloatingActionButton> = () => {
+const FloatingActionButton: React.FC = () => {
+  const location = useLocation();
+
+  if (location.pathname.startsWith('/group/')) {
+    return <GroupFAB />;
+  }
+
+  return <HomeFAB />;
+};
+
+const HomeFAB: React.FC = () => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
@@ -39,4 +49,37 @@ const FloatingActionButton: React.FC<IFloatingActionButton> = () => {
   );
 };
 
+const GroupFAB: React.FC = () => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const match = useRouteMatch<{ groupSlug: string }>('/group/:groupSlug');
+  const { entity: group } = useGroupLookup(match?.params.groupSlug || '');
+
+  if (!group) return null;
+
+  const handleOpenComposeModal = () => {
+    dispatch(groupComposeModal(group));
+  };
+
+  return (
+    <button
+      onClick={handleOpenComposeModal}
+      className={clsx(
+        'inline-flex appearance-none items-center rounded-full border p-4 font-medium transition-all focus:outline-none focus:ring-2 focus:ring-offset-2',
+        'border-transparent bg-secondary-500 text-gray-100 hover:bg-secondary-400 focus:bg-secondary-500 focus:ring-secondary-300',
+      )}
+      aria-label={intl.formatMessage(messages.publish)}
+    >
+      <HStack space={3} alignItems='center'>
+        <Avatar className='-my-3 -ml-2 border-white' size={42} src={group.avatar} />
+        <Icon
+          src={require('@tabler/icons/pencil-plus.svg')}
+          className='h-6 w-6'
+        />
+      </HStack>
+    </button>
+  );
+};
+
 export default FloatingActionButton;

From 8ee5727cd896ac8f76c6134f6f690a6d869f97bf Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 26 Apr 2023 15:53:06 -0500
Subject: [PATCH 207/298] ComposeModal: add share to group toggle

---
 .../ui/components/modals/compose-modal.tsx    | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/ui/components/modals/compose-modal.tsx b/app/soapbox/features/ui/components/modals/compose-modal.tsx
index f29df9042..358a6d648 100644
--- a/app/soapbox/features/ui/components/modals/compose-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/compose-modal.tsx
@@ -2,11 +2,12 @@ import clsx from 'clsx';
 import React, { useRef } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { cancelReplyCompose, uploadCompose } from 'soapbox/actions/compose';
+import { cancelReplyCompose, setGroupTimelineVisible, uploadCompose } from 'soapbox/actions/compose';
 import { openModal, closeModal } from 'soapbox/actions/modals';
 import { checkComposeContent } from 'soapbox/components/modal-root';
-import { Modal } from 'soapbox/components/ui';
-import { useAppDispatch, useCompose, useDraggedFiles } from 'soapbox/hooks';
+import { HStack, Modal, Text, Toggle } from 'soapbox/components/ui';
+import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles } from 'soapbox/hooks';
+import { useGroup } from 'soapbox/hooks/api';
 
 import ComposeForm from '../../../compose/components/compose-form';
 
@@ -82,9 +83,49 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose, composeId = 'compose-m
         'ring-2 ring-offset-2 ring-primary-600': isDraggedOver,
       })}
     >
-      <ComposeForm id={composeId} />
+      <ComposeForm
+        id={composeId}
+        extra={<ComposeFormGroupToggle composeId={composeId} groupId={groupId} />}
+      />
     </Modal>
   );
 };
 
+interface IComposeFormGroupToggle {
+  composeId: string
+  groupId: string | null
+}
+
+const ComposeFormGroupToggle: React.FC<IComposeFormGroupToggle> = ({ composeId, groupId }) => {
+  const dispatch = useAppDispatch();
+  const { group } = useGroup(groupId || '', false);
+
+  const groupTimelineVisible = useAppSelector((state) => !!state.compose.get(composeId)?.group_timeline_visible);
+
+  const handleToggleChange = () => {
+    dispatch(setGroupTimelineVisible(composeId, !groupTimelineVisible));
+  };
+
+  const labelId = `group-timeline-visible+${composeId}`;
+
+  if (!group) return null;
+  if (group.locked) return null;
+
+  return (
+    <HStack alignItems='center' space={4}>
+      <label className='ml-auto cursor-pointer' htmlFor={labelId}>
+        <Text theme='muted'>
+          <FormattedMessage id='compose_group.share_to_followers' defaultMessage='Share with my followers' />
+        </Text>
+      </label>
+      <Toggle
+        id={labelId}
+        checked={groupTimelineVisible}
+        onChange={handleToggleChange}
+        size='sm'
+      />
+    </HStack>
+  );
+};
+
 export default ComposeModal;

From 21b6ad1cbd3cb746f1cf1135e6cfd4519a63bf61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 26 Apr 2023 23:28:57 +0200
Subject: [PATCH 208/298] Add dismiss button instead of menu in fediverse
 explanation box
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../components/ui/accordion/accordion.tsx     | 20 ++++++++++++++++++-
 .../features/public-timeline/index.tsx        |  8 +++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/components/ui/accordion/accordion.tsx b/app/soapbox/components/ui/accordion/accordion.tsx
index f83a011be..842032242 100644
--- a/app/soapbox/components/ui/accordion/accordion.tsx
+++ b/app/soapbox/components/ui/accordion/accordion.tsx
@@ -21,13 +21,16 @@ interface IAccordion {
   menu?: Menu
   expanded?: boolean
   onToggle?: (value: boolean) => void
+  action?: () => void
+  actionIcon?: string
+  actionLabel?: string
 }
 
 /**
  * Accordion
  * An accordion is a vertically stacked group of collapsible sections.
  */
-const Accordion: React.FC<IAccordion> = ({ headline, children, menu, expanded = false, onToggle = () => {} }) => {
+const Accordion: React.FC<IAccordion> = ({ headline, children, menu, expanded = false, onToggle = () => {}, action, actionIcon, actionLabel }) => {
   const intl = useIntl();
 
   const handleToggle = (e: React.MouseEvent<HTMLButtonElement>) => {
@@ -35,6 +38,13 @@ const Accordion: React.FC<IAccordion> = ({ headline, children, menu, expanded =
     e.preventDefault();
   };
 
+  const handleAction = (e: React.MouseEvent<HTMLButtonElement>) => {
+    if (!action) return;
+
+    action();
+    e.preventDefault();
+  };
+
   return (
     <div className='rounded-lg bg-white text-gray-900 shadow dark:bg-primary-800 dark:text-gray-100 dark:shadow-none'>
       <button
@@ -53,6 +63,14 @@ const Accordion: React.FC<IAccordion> = ({ headline, children, menu, expanded =
               src={require('@tabler/icons/dots-vertical.svg')}
             />
           )}
+          {action && actionIcon && (
+            <button onClick={handleAction} title={actionLabel}>
+              <Icon
+                src={actionIcon}
+                className='h-5 w-5 text-gray-700 dark:text-gray-600'
+              />
+            </button>
+          )}
           <Icon
             src={expanded ? require('@tabler/icons/chevron-up.svg') : require('@tabler/icons/chevron-down.svg')}
             className='h-5 w-5 text-gray-700 dark:text-gray-600'
diff --git a/app/soapbox/features/public-timeline/index.tsx b/app/soapbox/features/public-timeline/index.tsx
index b62c5495c..8f96e432d 100644
--- a/app/soapbox/features/public-timeline/index.tsx
+++ b/app/soapbox/features/public-timeline/index.tsx
@@ -30,10 +30,6 @@ const CommunityTimeline = () => {
   const explanationBoxExpanded = settings.get('explanationBox');
   const showExplanationBox = settings.get('showExplanationBox');
 
-  const explanationBoxMenu = () => {
-    return [{ text: intl.formatMessage(messages.dismiss), action: dismissExplanationBox }];
-  };
-
   const dismissExplanationBox = () => {
     dispatch(changeSetting(['showExplanationBox'], false));
   };
@@ -66,7 +62,9 @@ const CommunityTimeline = () => {
       {showExplanationBox && <div className='mb-4'>
         <Accordion
           headline={<FormattedMessage id='fediverse_tab.explanation_box.title' defaultMessage='What is the Fediverse?' />}
-          menu={explanationBoxMenu()}
+          action={dismissExplanationBox}
+          actionIcon={require('@tabler/icons/x.svg')}
+          actionLabel={intl.formatMessage(messages.dismiss)}
           expanded={explanationBoxExpanded}
           onToggle={toggleExplanationBox}
         >

From 44300539d53307556725e8f1bbd8a2990b7b7dd0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 26 Apr 2023 16:41:20 -0500
Subject: [PATCH 209/298] yarn i18n

---
 app/soapbox/locales/en.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 3f6c24526..8c378c652 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1039,6 +1039,7 @@
   "navbar.login.username.placeholder": "Email or username",
   "navigation.chats": "Chats",
   "navigation.compose": "Compose",
+  "navigation.compose_group": "Compose to Group",
   "navigation.dashboard": "Dashboard",
   "navigation.developers": "Developers",
   "navigation.direct_messages": "Messages",
@@ -1052,6 +1053,8 @@
   "navigation_bar.compose_direct": "Direct message",
   "navigation_bar.compose_edit": "Edit post",
   "navigation_bar.compose_event": "Manage event",
+  "navigation_bar.compose_group": "Compose to group",
+  "navigation_bar.compose_group_reply": "Reply to group post",
   "navigation_bar.compose_quote": "Quote post",
   "navigation_bar.compose_reply": "Reply to post",
   "navigation_bar.create_event": "Create new event",

From a1b9d8a682a6f8216c185429b8fdce6c8fc86214 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 27 Apr 2023 13:20:53 -0500
Subject: [PATCH 210/298] Fix ComposeButton tests

---
 .../features/ui/components/__tests__/compose-button.test.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/__tests__/compose-button.test.tsx b/app/soapbox/features/ui/components/__tests__/compose-button.test.tsx
index c98b7aa50..11d9bdea1 100644
--- a/app/soapbox/features/ui/components/__tests__/compose-button.test.tsx
+++ b/app/soapbox/features/ui/components/__tests__/compose-button.test.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
 import '@testing-library/jest-dom';
+import { MemoryRouter } from 'react-router-dom';
 
 import { MODAL_OPEN } from 'soapbox/actions/modals';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
@@ -14,7 +15,9 @@ const renderComposeButton = () => {
   render(
     <Provider store={store}>
       <IntlProvider locale='en'>
-        <ComposeButton />
+        <MemoryRouter>
+          <ComposeButton />
+        </MemoryRouter>
       </IntlProvider>
     </Provider>,
   );

From d8a3f51e4a95c791e9b17790d36b1377433f5916 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 27 Apr 2023 14:11:45 -0500
Subject: [PATCH 211/298] useGroupMembershipRequests: dismiss instead of
 decrement

---
 app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts b/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts
index 78a59ced6..171510338 100644
--- a/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts
+++ b/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts
@@ -1,5 +1,5 @@
 import { Entities } from 'soapbox/entity-store/entities';
-import { useEntities, useIncrementEntity } from 'soapbox/entity-store/hooks';
+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';
@@ -23,13 +23,13 @@ function useGroupMembershipRequests(groupId: string) {
     },
   );
 
-  const { incrementEntity: authorize } = useIncrementEntity(path, -1, async (accountId: string) => {
+  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 { incrementEntity: reject } = useIncrementEntity(path, -1, async (accountId: string) => {
+  const { dismissEntity: reject } = useDismissEntity(path, async (accountId: string) => {
     const response = await api.post(`/api/v1/groups/${groupId}/membership_requests/${accountId}/reject`);
     invalidate();
     return response;

From 97dd235de35720725166278c48b1cf090c2b7fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sat, 29 Apr 2023 13:55:43 +0200
Subject: [PATCH 212/298] Use note_plain on group edit page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/features/group/edit-group.tsx | 2 +-
 app/soapbox/schemas/group.ts              | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index 4176f6106..184df76d5 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -44,7 +44,7 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { groupId } }) => {
   const header = useImageField({ maxPixels: 1920 * 1080, preview: nonDefaultHeader(group?.header) });
 
   const displayName = useTextField(group?.display_name);
-  const note = useTextField(group?.note);
+  const note = useTextField(group?.note_plain);
 
   const maxName = Number(instance.configuration.getIn(['groups', 'max_characters_name']));
   const maxNote = Number(instance.configuration.getIn(['groups', 'max_characters_description']));
diff --git a/app/soapbox/schemas/group.ts b/app/soapbox/schemas/group.ts
index 746ae9d33..38139ca42 100644
--- a/app/soapbox/schemas/group.ts
+++ b/app/soapbox/schemas/group.ts
@@ -29,6 +29,9 @@ const groupSchema = z.object({
   note: z.string().transform(note => note === '<p></p>' ? '' : note).catch(''),
   relationship: groupRelationshipSchema.nullable().catch(null), // Dummy field to be overwritten later
   slug: z.string().catch(''), // TruthSocial
+  source: z.object({
+    note: z.string(),
+  }).optional(), // TruthSocial
   statuses_visibility: z.string().catch('public'),
   tags: z.array(groupTagSchema).catch([]),
   uri: z.string().catch(''),
@@ -43,10 +46,10 @@ const groupSchema = z.object({
     ...group,
     display_name_html: emojify(escapeTextContentForBrowser(group.display_name), customEmojiMap),
     note_emojified: emojify(group.note, customEmojiMap),
-    note_plain: unescapeHTML(group.note),
+    note_plain: group.source?.note || unescapeHTML(group.note),
   };
 });
 
 type Group = z.infer<typeof groupSchema>;
 
-export { groupSchema, type Group };
\ No newline at end of file
+export { groupSchema, type Group };

From 4d609b57d61b36530b6cda9c5728590521eb82cc Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 1 May 2023 12:01:39 -0400
Subject: [PATCH 213/298] Add tests for Groups discover components

---
 .../groups/__tests__/discover.test.tsx        | 77 +++++++++++++++++++
 .../__tests__/group-grid-item.test.tsx        | 21 +++++
 .../__tests__/group-list-item.test.tsx        | 21 +++++
 .../__tests__/layout-buttons.test.tsx         | 38 +++++++++
 .../discover/__tests__/tag-list-item.test.tsx | 16 ++++
 .../components/discover/group-grid-item.tsx   |  1 +
 .../components/discover/group-list-item.tsx   |  1 +
 .../components/discover/layout-buttons.tsx    | 10 ++-
 .../components/discover/popular-groups.tsx    |  2 +-
 .../components/discover/popular-tags.tsx      |  2 +-
 .../search/__tests__/blankslate.test.tsx      | 30 ++++++++
 .../search/__tests__/results.test.tsx         | 67 ++++++++++++++++
 .../components/discover/suggested-groups.tsx  |  2 +-
 .../components/discover/tag-list-item.tsx     |  6 +-
 app/soapbox/features/groups/discover.tsx      |  1 +
 app/soapbox/jest/factory.ts                   | 17 +++-
 16 files changed, 304 insertions(+), 8 deletions(-)
 create mode 100644 app/soapbox/features/groups/__tests__/discover.test.tsx
 create mode 100644 app/soapbox/features/groups/components/discover/__tests__/group-grid-item.test.tsx
 create mode 100644 app/soapbox/features/groups/components/discover/__tests__/group-list-item.test.tsx
 create mode 100644 app/soapbox/features/groups/components/discover/__tests__/layout-buttons.test.tsx
 create mode 100644 app/soapbox/features/groups/components/discover/__tests__/tag-list-item.test.tsx
 create mode 100644 app/soapbox/features/groups/components/discover/search/__tests__/blankslate.test.tsx
 create mode 100644 app/soapbox/features/groups/components/discover/search/__tests__/results.test.tsx

diff --git a/app/soapbox/features/groups/__tests__/discover.test.tsx b/app/soapbox/features/groups/__tests__/discover.test.tsx
new file mode 100644
index 000000000..b2485cdde
--- /dev/null
+++ b/app/soapbox/features/groups/__tests__/discover.test.tsx
@@ -0,0 +1,77 @@
+import userEvent from '@testing-library/user-event';
+import { Map as ImmutableMap } from 'immutable';
+import React from 'react';
+
+import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
+import { normalizeAccount, normalizeInstance } from 'soapbox/normalizers';
+
+import Discover from '../discover';
+
+jest.mock('../../../hooks/useDimensions', () => ({
+  useDimensions: () => [{ scrollWidth: 190 }, null, { width: 300 }],
+}));
+
+(window as any).ResizeObserver = class ResizeObserver {
+
+  observe() { }
+  disconnect() { }
+
+};
+
+const userId = '1';
+const store: any = {
+  me: userId,
+  accounts: ImmutableMap({
+    [userId]: normalizeAccount({
+      id: userId,
+      acct: 'justin-username',
+      display_name: 'Justin L',
+      avatar: 'test.jpg',
+      chats_onboarded: false,
+    }),
+  }),
+  instance: normalizeInstance({
+    version: '3.4.1 (compatible; TruthSocial 1.0.0)',
+    software: 'TRUTHSOCIAL',
+  }),
+};
+
+const renderApp = () => (
+  render(
+    <Discover />,
+    undefined,
+    store,
+  )
+);
+
+describe('<Discover />', () => {
+  describe('before the user starts searching', () => {
+    it('it should render popular groups', async () => {
+      renderApp();
+
+      await waitFor(() => {
+        expect(screen.getByTestId('popular-groups')).toBeInTheDocument();
+        expect(screen.getByTestId('suggested-groups')).toBeInTheDocument();
+        expect(screen.getByTestId('popular-tags')).toBeInTheDocument();
+        expect(screen.queryAllByTestId('recent-searches')).toHaveLength(0);
+        expect(screen.queryAllByTestId('group-search-icon')).toHaveLength(0);
+
+      });
+    });
+  });
+
+  describe('when the user focuses on the input', () => {
+    it('should render the search experience', async () => {
+      const user = userEvent.setup();
+      renderApp();
+
+      await user.click(screen.getByTestId('search'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('group-search-icon')).toBeInTheDocument();
+        expect(screen.getByTestId('recent-searches')).toBeInTheDocument();
+        expect(screen.queryAllByTestId('popular-groups')).toHaveLength(0);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/__tests__/group-grid-item.test.tsx b/app/soapbox/features/groups/components/discover/__tests__/group-grid-item.test.tsx
new file mode 100644
index 000000000..09be8da84
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/__tests__/group-grid-item.test.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+import { buildGroup } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import GroupGridItem from '../group-grid-item';
+
+describe('<GroupGridItem', () => {
+  it('should render correctly', () => {
+    const group = buildGroup({
+      display_name: 'group name here',
+      locked: false,
+      members_count: 6,
+    });
+    render(<GroupGridItem group={group} />);
+
+    expect(screen.getByTestId('group-grid-item')).toHaveTextContent(group.display_name);
+    expect(screen.getByTestId('group-grid-item')).toHaveTextContent('Public');
+    expect(screen.getByTestId('group-grid-item')).toHaveTextContent('6 members');
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/__tests__/group-list-item.test.tsx b/app/soapbox/features/groups/components/discover/__tests__/group-list-item.test.tsx
new file mode 100644
index 000000000..f78b9da43
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/__tests__/group-list-item.test.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+import { buildGroup } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import GroupListItem from '../group-list-item';
+
+describe('<GroupListItem', () => {
+  it('should render correctly', () => {
+    const group = buildGroup({
+      display_name: 'group name here',
+      locked: false,
+      members_count: 6,
+    });
+    render(<GroupListItem group={group} />);
+
+    expect(screen.getByTestId('group-list-item')).toHaveTextContent(group.display_name);
+    expect(screen.getByTestId('group-list-item')).toHaveTextContent('Public');
+    expect(screen.getByTestId('group-list-item')).toHaveTextContent('6 members');
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/__tests__/layout-buttons.test.tsx b/app/soapbox/features/groups/components/discover/__tests__/layout-buttons.test.tsx
new file mode 100644
index 000000000..c6d1ea514
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/__tests__/layout-buttons.test.tsx
@@ -0,0 +1,38 @@
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { render, screen, within } from 'soapbox/jest/test-helpers';
+
+import LayoutButtons, { GroupLayout } from '../layout-buttons';
+
+describe('<LayoutButtons', () => {
+  describe('when LIST view', () => {
+    it('should render correctly', async () => {
+      const onSelectFn = jest.fn();
+      const user = userEvent.setup();
+
+      render(<LayoutButtons layout={GroupLayout.LIST} onSelect={onSelectFn} />);
+
+      expect(within(screen.getByTestId('layout-list-action')).getByTestId('svg-icon-loader')).toHaveClass('text-primary-600');
+      expect(within(screen.getByTestId('layout-grid-action')).getByTestId('svg-icon-loader')).not.toHaveClass('text-primary-600');
+
+      await user.click(screen.getByTestId('layout-grid-action'));
+      expect(onSelectFn).toHaveBeenCalled();
+    });
+  });
+
+  describe('when GRID view', () => {
+    it('should render correctly', async () => {
+      const onSelectFn = jest.fn();
+      const user = userEvent.setup();
+
+      render(<LayoutButtons layout={GroupLayout.GRID} onSelect={onSelectFn} />);
+
+      expect(within(screen.getByTestId('layout-list-action')).getByTestId('svg-icon-loader')).not.toHaveClass('text-primary-600');
+      expect(within(screen.getByTestId('layout-grid-action')).getByTestId('svg-icon-loader')).toHaveClass('text-primary-600');
+
+      await user.click(screen.getByTestId('layout-grid-action'));
+      expect(onSelectFn).toHaveBeenCalled();
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/__tests__/tag-list-item.test.tsx b/app/soapbox/features/groups/components/discover/__tests__/tag-list-item.test.tsx
new file mode 100644
index 000000000..c180c9234
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/__tests__/tag-list-item.test.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import { buildGroupTag } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import TagListItem from '../tag-list-item';
+
+describe('<TagListItem', () => {
+  it('should render correctly', () => {
+    const tag = buildGroupTag({ name: 'tag 1', groups: 5 });
+    render(<TagListItem tag={tag} />);
+
+    expect(screen.getByTestId('tag-list-item')).toHaveTextContent(tag.name);
+    expect(screen.getByTestId('tag-list-item')).toHaveTextContent('Number of groups: 5');
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/group-grid-item.tsx b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
index c30055971..1f4920bde 100644
--- a/app/soapbox/features/groups/components/discover/group-grid-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
@@ -25,6 +25,7 @@ const GroupGridItem = forwardRef((props: IGroup, ref: React.ForwardedRef<HTMLDiv
       style={{
         width,
       }}
+      data-testid='group-grid-item'
     >
       <Link to={`/group/${group.slug}`}>
         <Stack
diff --git a/app/soapbox/features/groups/components/discover/group-list-item.tsx b/app/soapbox/features/groups/components/discover/group-list-item.tsx
index 9747eb8b7..fc2aedcf5 100644
--- a/app/soapbox/features/groups/components/discover/group-list-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-list-item.tsx
@@ -20,6 +20,7 @@ const GroupListItem = (props: IGroup) => {
     <HStack
       alignItems='center'
       justifyContent='between'
+      data-testid='group-list-item'
     >
       <Link key={group.id} to={`/group/${group.slug}`}>
         <HStack alignItems='center' space={2}>
diff --git a/app/soapbox/features/groups/components/discover/layout-buttons.tsx b/app/soapbox/features/groups/components/discover/layout-buttons.tsx
index eecdfaf83..9b98ba5e7 100644
--- a/app/soapbox/features/groups/components/discover/layout-buttons.tsx
+++ b/app/soapbox/features/groups/components/discover/layout-buttons.tsx
@@ -15,7 +15,10 @@ interface ILayoutButtons {
 
 const LayoutButtons = ({ layout, onSelect }: ILayoutButtons) => (
   <HStack alignItems='center' space={1}>
-    <button onClick={() => onSelect(GroupLayout.LIST)}>
+    <button
+      data-testid='layout-list-action'
+      onClick={() => onSelect(GroupLayout.LIST)}
+    >
       <Icon
         src={require('@tabler/icons/layout-list.svg')}
         className={
@@ -26,7 +29,10 @@ const LayoutButtons = ({ layout, onSelect }: ILayoutButtons) => (
       />
     </button>
 
-    <button onClick={() => onSelect(GroupLayout.GRID)}>
+    <button
+      data-testid='layout-grid-action'
+      onClick={() => onSelect(GroupLayout.GRID)}
+    >
       <Icon
         src={require('@tabler/icons/layout-grid.svg')}
         className={
diff --git a/app/soapbox/features/groups/components/discover/popular-groups.tsx b/app/soapbox/features/groups/components/discover/popular-groups.tsx
index 6395ea3b0..894542eb8 100644
--- a/app/soapbox/features/groups/components/discover/popular-groups.tsx
+++ b/app/soapbox/features/groups/components/discover/popular-groups.tsx
@@ -15,7 +15,7 @@ const PopularGroups = () => {
   const [groupCover, setGroupCover] = useState<HTMLDivElement | null>(null);
 
   return (
-    <Stack space={4}>
+    <Stack space={4} data-testid='popular-groups'>
       <HStack alignItems='center' justifyContent='between'>
         <Text size='xl' weight='bold'>
           <FormattedMessage
diff --git a/app/soapbox/features/groups/components/discover/popular-tags.tsx b/app/soapbox/features/groups/components/discover/popular-tags.tsx
index 3b0296191..4cfed0bee 100644
--- a/app/soapbox/features/groups/components/discover/popular-tags.tsx
+++ b/app/soapbox/features/groups/components/discover/popular-tags.tsx
@@ -12,7 +12,7 @@ const PopularTags = () => {
   const isEmpty = (isFetched && tags.length === 0) || isError;
 
   return (
-    <Stack space={4}>
+    <Stack space={4} data-testid='popular-tags'>
       <HStack alignItems='center' justifyContent='between'>
         <Text size='xl' weight='bold'>
           <FormattedMessage
diff --git a/app/soapbox/features/groups/components/discover/search/__tests__/blankslate.test.tsx b/app/soapbox/features/groups/components/discover/search/__tests__/blankslate.test.tsx
new file mode 100644
index 000000000..6b1166477
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/search/__tests__/blankslate.test.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import Blankslate from '../blankslate';
+
+
+describe('<Blankslate />', () => {
+  describe('with string props', () => {
+    it('should render correctly', () => {
+      render(<Blankslate title='Title' subtitle='Subtitle' />);
+
+      expect(screen.getByTestId('no-results')).toHaveTextContent('Title');
+      expect(screen.getByTestId('no-results')).toHaveTextContent('Subtitle');
+    });
+  });
+
+  describe('with node props', () => {
+    it('should render correctly', () => {
+      render(
+        <Blankslate
+          title={<span>Title</span>}
+          subtitle={<span>Subtitle</span>}
+        />);
+
+      expect(screen.getByTestId('no-results')).toHaveTextContent('Title');
+      expect(screen.getByTestId('no-results')).toHaveTextContent('Subtitle');
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/search/__tests__/results.test.tsx b/app/soapbox/features/groups/components/discover/search/__tests__/results.test.tsx
new file mode 100644
index 000000000..66523ec5d
--- /dev/null
+++ b/app/soapbox/features/groups/components/discover/search/__tests__/results.test.tsx
@@ -0,0 +1,67 @@
+import userEvent from '@testing-library/user-event';
+import { Map as ImmutableMap } from 'immutable';
+import React from 'react';
+import { VirtuosoGridMockContext, VirtuosoMockContext } from 'react-virtuoso';
+
+import { buildGroup } from 'soapbox/jest/factory';
+import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
+import { normalizeAccount } from 'soapbox/normalizers';
+
+import Results from '../results';
+
+const userId = '1';
+const store = {
+  me: userId,
+  accounts: ImmutableMap({
+    [userId]: normalizeAccount({
+      id: userId,
+      acct: 'justin-username',
+      display_name: 'Justin L',
+      avatar: 'test.jpg',
+      chats_onboarded: false,
+    }),
+  }),
+};
+
+const renderApp = (children: React.ReactNode) => (
+  render(
+    <VirtuosoMockContext.Provider value={{ viewportHeight: 300, itemHeight: 100 }}>
+      <VirtuosoGridMockContext.Provider value={{ viewportHeight: 300, viewportWidth: 300, itemHeight: 100, itemWidth: 100 }}>
+        {children}
+      </VirtuosoGridMockContext.Provider>
+    </VirtuosoMockContext.Provider>,
+    undefined,
+    store,
+  )
+);
+
+const groupSearchResult = {
+  groups: [buildGroup()],
+  hasNextPage: false,
+  isFetching: false,
+  fetchNextPage: jest.fn(),
+} as any;
+
+describe('<Results />', () => {
+  describe('with a list layout', () => {
+    it('should render the GroupListItem components', async () => {
+      renderApp(<Results groupSearchResult={groupSearchResult} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('group-list-item')).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('with a grid layout', () => {
+    it('should render the GroupGridItem components', async () => {
+      const user = userEvent.setup();
+      renderApp(<Results groupSearchResult={groupSearchResult} />);
+
+      await user.click(screen.getByTestId('layout-grid-action'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('group-grid-item')).toBeInTheDocument();
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/groups/components/discover/suggested-groups.tsx b/app/soapbox/features/groups/components/discover/suggested-groups.tsx
index 1e6c2514e..e0e26e874 100644
--- a/app/soapbox/features/groups/components/discover/suggested-groups.tsx
+++ b/app/soapbox/features/groups/components/discover/suggested-groups.tsx
@@ -15,7 +15,7 @@ const SuggestedGroups = () => {
   const [groupCover, setGroupCover] = useState<HTMLDivElement | null>(null);
 
   return (
-    <Stack space={4}>
+    <Stack space={4} data-testid='suggested-groups'>
       <HStack alignItems='center' justifyContent='between'>
         <Text size='xl' weight='bold'>
           <FormattedMessage
diff --git a/app/soapbox/features/groups/components/discover/tag-list-item.tsx b/app/soapbox/features/groups/components/discover/tag-list-item.tsx
index fc71f7144..1d11ce267 100644
--- a/app/soapbox/features/groups/components/discover/tag-list-item.tsx
+++ b/app/soapbox/features/groups/components/discover/tag-list-item.tsx
@@ -14,7 +14,11 @@ const TagListItem = (props: ITagListItem) => {
   const { tag } = props;
 
   return (
-    <Link to={`/groups/discover/tags/${tag.id}`} className='group'>
+    <Link
+      to={`/groups/discover/tags/${tag.id}`}
+      className='group'
+      data-testid='tag-list-item'
+    >
       <Stack>
         <Text
           weight='bold'
diff --git a/app/soapbox/features/groups/discover.tsx b/app/soapbox/features/groups/discover.tsx
index 6e26c0671..47273d2ed 100644
--- a/app/soapbox/features/groups/discover.tsx
+++ b/app/soapbox/features/groups/discover.tsx
@@ -39,6 +39,7 @@ const Discover: React.FC = () => {
               src={require('@tabler/icons/arrow-left.svg')}
               iconClassName='mr-2 h-5 w-5 fill-current text-gray-600'
               onClick={cancelSearch}
+              data-testid='group-search-icon'
             />
           ) : null}
 
diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index 4f2eb145c..e5bdd796b 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -1,6 +1,13 @@
 import { v4 as uuidv4 } from 'uuid';
 
-import { groupSchema, Group, groupRelationshipSchema, GroupRelationship } from 'soapbox/schemas';
+import {
+  groupSchema,
+  groupRelationshipSchema,
+  groupTagSchema,
+  type Group,
+  type GroupRelationship,
+  type GroupTag,
+} from 'soapbox/schemas';
 
 // TODO: there's probably a better way to create these factory functions.
 // This looks promising but didn't work on my first attempt: https://github.com/anatine/zod-plugins/tree/main/packages/zod-mock
@@ -17,4 +24,10 @@ function buildGroupRelationship(props: Record<string, any> = {}): GroupRelations
   }, props));
 }
 
-export { buildGroup, buildGroupRelationship };
\ No newline at end of file
+function buildGroupTag(props: Record<string, any> = {}): GroupTag {
+  return groupTagSchema.parse(Object.assign({
+    id: uuidv4(),
+  }, props));
+}
+
+export { buildGroup, buildGroupRelationship, buildGroupTag };
\ No newline at end of file

From e0af6c4b2e78ec010973d279fc620e6299e5741a Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 1 May 2023 14:58:40 -0400
Subject: [PATCH 214/298] Move Group hooks to api folder

---
 .../{hooks/api => api/hooks/accounts}/useAccount.ts      | 2 +-
 .../api => api/hooks/accounts}/useRelationships.ts       | 3 +--
 .../api => api/hooks}/groups/useBlockGroupMember.ts      | 0
 .../hooks}/groups/useCancelMembershipRequest.ts          | 0
 .../{hooks/api => api/hooks}/groups/useCreateGroup.ts    | 0
 .../{hooks/api => api/hooks}/groups/useDeleteGroup.ts    | 0
 .../api => api/hooks}/groups/useDemoteGroupMember.ts     | 0
 .../{hooks/api => api/hooks}/groups/useGroupLookup.ts    | 0
 .../{hooks/api => api/hooks}/groups/useGroupMedia.ts     | 0
 .../{hooks/api => api/hooks/groups}/useGroupMembers.ts   | 2 +-
 .../hooks}/groups/useGroupMembershipRequests.ts          | 0
 .../{hooks/api => api/hooks}/groups/useGroupSearch.ts    | 4 +---
 .../{hooks/api => api/hooks}/groups/useGroupTag.ts       | 0
 .../{hooks/api => api/hooks}/groups/useGroupTags.ts      | 0
 .../api => api/hooks}/groups/useGroupValidation.ts       | 0
 app/soapbox/{hooks/api => api/hooks}/groups/useGroups.ts | 3 +--
 .../{hooks/api => api/hooks}/groups/useGroupsFromTag.ts  | 4 +---
 .../{hooks/api => api/hooks}/groups/useJoinGroup.ts      | 0
 .../{hooks/api => api/hooks}/groups/useLeaveGroup.ts     | 0
 .../{hooks/api => api/hooks/groups}/usePopularGroups.ts  | 7 ++++---
 .../{hooks/api => api/hooks}/groups/usePopularTags.ts    | 6 ++----
 .../api => api/hooks}/groups/usePromoteGroupMember.ts    | 0
 .../api => api/hooks/groups}/useSuggestedGroups.ts       | 7 +++----
 .../{hooks/api => api/hooks}/groups/useUpdateGroup.ts    | 0
 .../{hooks/api => api/hooks}/groups/useUpdateGroupTag.ts | 0
 app/soapbox/{hooks/api => api/hooks}/index.ts            | 9 +++++++--
 app/soapbox/components/hoc/group-lookup-hoc.tsx          | 2 +-
 .../features/group/components/group-action-button.tsx    | 2 +-
 .../features/group/components/group-member-list-item.tsx | 2 +-
 .../features/group/components/group-options-button.tsx   | 2 +-
 .../features/group/components/group-tag-list-item.tsx    | 2 +-
 app/soapbox/features/group/edit-group.tsx                | 2 +-
 app/soapbox/features/group/group-blocked-members.tsx     | 2 +-
 app/soapbox/features/group/group-gallery.tsx             | 2 +-
 app/soapbox/features/group/group-members.tsx             | 5 ++---
 app/soapbox/features/group/group-membership-requests.tsx | 3 +--
 app/soapbox/features/group/group-tag-timeline.tsx        | 2 +-
 app/soapbox/features/group/group-tags.tsx                | 2 +-
 app/soapbox/features/group/group-timeline.tsx            | 2 +-
 app/soapbox/features/group/manage-group.tsx              | 2 +-
 .../groups/components/discover/popular-groups.tsx        | 2 +-
 .../features/groups/components/discover/popular-tags.tsx | 2 +-
 .../groups/components/discover/search/results.tsx        | 2 +-
 .../groups/components/discover/search/search.tsx         | 2 +-
 .../groups/components/discover/suggested-groups.tsx      | 2 +-
 app/soapbox/features/groups/index.tsx                    | 2 +-
 app/soapbox/features/groups/popular.tsx                  | 2 +-
 app/soapbox/features/groups/suggested.tsx                | 2 +-
 app/soapbox/features/groups/tag.tsx                      | 2 +-
 app/soapbox/features/groups/tags.tsx                     | 2 +-
 .../modals/manage-group-modal/create-group-modal.tsx     | 2 +-
 .../modals/manage-group-modal/steps/details-step.tsx     | 2 +-
 .../modals/manage-group-modal/steps/privacy-step.tsx     | 2 +-
 .../features/ui/components/panels/my-groups-panel.tsx    | 2 +-
 .../ui/components/panels/suggested-groups-panel.tsx      | 2 +-
 app/soapbox/hooks/useGroupsPath.ts                       | 3 ++-
 app/soapbox/pages/group-page.tsx                         | 6 +++---
 57 files changed, 57 insertions(+), 61 deletions(-)
 rename app/soapbox/{hooks/api => api/hooks/accounts}/useAccount.ts (91%)
 rename app/soapbox/{hooks/api => api/hooks/accounts}/useRelationships.ts (88%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useBlockGroupMember.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useCancelMembershipRequest.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useCreateGroup.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useDeleteGroup.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useDemoteGroupMember.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupLookup.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupMedia.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks/groups}/useGroupMembers.ts (89%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupMembershipRequests.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupSearch.ts (88%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupTag.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupTags.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupValidation.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroups.ts (97%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useGroupsFromTag.ts (87%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useJoinGroup.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useLeaveGroup.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks/groups}/usePopularGroups.ts (79%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/usePopularTags.ts (73%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/usePromoteGroupMember.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks/groups}/useSuggestedGroups.ts (74%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useUpdateGroup.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/groups/useUpdateGroupTag.ts (100%)
 rename app/soapbox/{hooks/api => api/hooks}/index.ts (77%)

diff --git a/app/soapbox/hooks/api/useAccount.ts b/app/soapbox/api/hooks/accounts/useAccount.ts
similarity index 91%
rename from app/soapbox/hooks/api/useAccount.ts
rename to app/soapbox/api/hooks/accounts/useAccount.ts
index a222d8de4..2442ad642 100644
--- a/app/soapbox/hooks/api/useAccount.ts
+++ b/app/soapbox/api/hooks/accounts/useAccount.ts
@@ -1,8 +1,8 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
 import { type Account, accountSchema } from 'soapbox/schemas';
 
-import { useApi } from '../useApi';
 
 import { useRelationships } from './useRelationships';
 
diff --git a/app/soapbox/hooks/api/useRelationships.ts b/app/soapbox/api/hooks/accounts/useRelationships.ts
similarity index 88%
rename from app/soapbox/hooks/api/useRelationships.ts
rename to app/soapbox/api/hooks/accounts/useRelationships.ts
index fde5f1017..2103e2438 100644
--- a/app/soapbox/hooks/api/useRelationships.ts
+++ b/app/soapbox/api/hooks/accounts/useRelationships.ts
@@ -1,9 +1,8 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
 import { type Relationship, relationshipSchema } from 'soapbox/schemas';
 
-import { useApi } from '../useApi';
-
 function useRelationships(ids: string[]) {
   const api = useApi();
 
diff --git a/app/soapbox/hooks/api/groups/useBlockGroupMember.ts b/app/soapbox/api/hooks/groups/useBlockGroupMember.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useBlockGroupMember.ts
rename to app/soapbox/api/hooks/groups/useBlockGroupMember.ts
diff --git a/app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts b/app/soapbox/api/hooks/groups/useCancelMembershipRequest.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useCancelMembershipRequest.ts
rename to app/soapbox/api/hooks/groups/useCancelMembershipRequest.ts
diff --git a/app/soapbox/hooks/api/groups/useCreateGroup.ts b/app/soapbox/api/hooks/groups/useCreateGroup.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useCreateGroup.ts
rename to app/soapbox/api/hooks/groups/useCreateGroup.ts
diff --git a/app/soapbox/hooks/api/groups/useDeleteGroup.ts b/app/soapbox/api/hooks/groups/useDeleteGroup.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useDeleteGroup.ts
rename to app/soapbox/api/hooks/groups/useDeleteGroup.ts
diff --git a/app/soapbox/hooks/api/groups/useDemoteGroupMember.ts b/app/soapbox/api/hooks/groups/useDemoteGroupMember.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useDemoteGroupMember.ts
rename to app/soapbox/api/hooks/groups/useDemoteGroupMember.ts
diff --git a/app/soapbox/hooks/api/groups/useGroupLookup.ts b/app/soapbox/api/hooks/groups/useGroupLookup.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useGroupLookup.ts
rename to app/soapbox/api/hooks/groups/useGroupLookup.ts
diff --git a/app/soapbox/hooks/api/groups/useGroupMedia.ts b/app/soapbox/api/hooks/groups/useGroupMedia.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useGroupMedia.ts
rename to app/soapbox/api/hooks/groups/useGroupMedia.ts
diff --git a/app/soapbox/hooks/api/useGroupMembers.ts b/app/soapbox/api/hooks/groups/useGroupMembers.ts
similarity index 89%
rename from app/soapbox/hooks/api/useGroupMembers.ts
rename to app/soapbox/api/hooks/groups/useGroupMembers.ts
index 3a1c99af5..a9b03e7f2 100644
--- a/app/soapbox/hooks/api/useGroupMembers.ts
+++ b/app/soapbox/api/hooks/groups/useGroupMembers.ts
@@ -3,7 +3,7 @@ import { useEntities } from 'soapbox/entity-store/hooks';
 import { GroupMember, groupMemberSchema } from 'soapbox/schemas';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-import { useApi } from '../useApi';
+import { useApi } from '../../../hooks/useApi';
 
 function useGroupMembers(groupId: string, role: GroupRoles) {
   const api = useApi();
diff --git a/app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts b/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useGroupMembershipRequests.ts
rename to app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
diff --git a/app/soapbox/hooks/api/groups/useGroupSearch.ts b/app/soapbox/api/hooks/groups/useGroupSearch.ts
similarity index 88%
rename from app/soapbox/hooks/api/groups/useGroupSearch.ts
rename to app/soapbox/api/hooks/groups/useGroupSearch.ts
index 17c10e90f..508310911 100644
--- a/app/soapbox/hooks/api/groups/useGroupSearch.ts
+++ b/app/soapbox/api/hooks/groups/useGroupSearch.ts
@@ -1,10 +1,8 @@
 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 { useApi } from '../../useApi';
-import { useFeatures } from '../../useFeatures';
-
 import { useGroupRelationships } from './useGroups';
 
 import type { Group } from 'soapbox/schemas';
diff --git a/app/soapbox/hooks/api/groups/useGroupTag.ts b/app/soapbox/api/hooks/groups/useGroupTag.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useGroupTag.ts
rename to app/soapbox/api/hooks/groups/useGroupTag.ts
diff --git a/app/soapbox/hooks/api/groups/useGroupTags.ts b/app/soapbox/api/hooks/groups/useGroupTags.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useGroupTags.ts
rename to app/soapbox/api/hooks/groups/useGroupTags.ts
diff --git a/app/soapbox/hooks/api/groups/useGroupValidation.ts b/app/soapbox/api/hooks/groups/useGroupValidation.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useGroupValidation.ts
rename to app/soapbox/api/hooks/groups/useGroupValidation.ts
diff --git a/app/soapbox/hooks/api/groups/useGroups.ts b/app/soapbox/api/hooks/groups/useGroups.ts
similarity index 97%
rename from app/soapbox/hooks/api/groups/useGroups.ts
rename to app/soapbox/api/hooks/groups/useGroups.ts
index 9db3001ce..42904c142 100644
--- a/app/soapbox/hooks/api/groups/useGroups.ts
+++ b/app/soapbox/api/hooks/groups/useGroups.ts
@@ -5,11 +5,10 @@ import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities, useEntity } from 'soapbox/entity-store/hooks';
 import { useApi, useAppDispatch } from 'soapbox/hooks';
+import { useFeatures } from 'soapbox/hooks/useFeatures';
 import { groupSchema, Group } from 'soapbox/schemas/group';
 import { groupRelationshipSchema, GroupRelationship } from 'soapbox/schemas/group-relationship';
 
-import { useFeatures } from '../../useFeatures';
-
 function useGroups(q: string = '') {
   const api = useApi();
   const features = useFeatures();
diff --git a/app/soapbox/hooks/api/groups/useGroupsFromTag.ts b/app/soapbox/api/hooks/groups/useGroupsFromTag.ts
similarity index 87%
rename from app/soapbox/hooks/api/groups/useGroupsFromTag.ts
rename to app/soapbox/api/hooks/groups/useGroupsFromTag.ts
index a6b8540dc..f579c719e 100644
--- a/app/soapbox/hooks/api/groups/useGroupsFromTag.ts
+++ b/app/soapbox/api/hooks/groups/useGroupsFromTag.ts
@@ -1,10 +1,8 @@
 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 { useApi } from '../../useApi';
-import { useFeatures } from '../../useFeatures';
-
 import { useGroupRelationships } from './useGroups';
 
 import type { Group } from 'soapbox/schemas';
diff --git a/app/soapbox/hooks/api/groups/useJoinGroup.ts b/app/soapbox/api/hooks/groups/useJoinGroup.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useJoinGroup.ts
rename to app/soapbox/api/hooks/groups/useJoinGroup.ts
diff --git a/app/soapbox/hooks/api/groups/useLeaveGroup.ts b/app/soapbox/api/hooks/groups/useLeaveGroup.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useLeaveGroup.ts
rename to app/soapbox/api/hooks/groups/useLeaveGroup.ts
diff --git a/app/soapbox/hooks/api/usePopularGroups.ts b/app/soapbox/api/hooks/groups/usePopularGroups.ts
similarity index 79%
rename from app/soapbox/hooks/api/usePopularGroups.ts
rename to app/soapbox/api/hooks/groups/usePopularGroups.ts
index 385322500..ead72a79b 100644
--- a/app/soapbox/hooks/api/usePopularGroups.ts
+++ b/app/soapbox/api/hooks/groups/usePopularGroups.ts
@@ -2,9 +2,10 @@ import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
 import { Group, groupSchema } from 'soapbox/schemas';
 
-import { useGroupRelationships } from '../api/groups/useGroups';
-import { useApi } from '../useApi';
-import { useFeatures } from '../useFeatures';
+import { useApi } from '../../../hooks/useApi';
+import { useFeatures } from '../../../hooks/useFeatures';
+
+import { useGroupRelationships } from './useGroups';
 
 function usePopularGroups() {
   const api = useApi();
diff --git a/app/soapbox/hooks/api/groups/usePopularTags.ts b/app/soapbox/api/hooks/groups/usePopularTags.ts
similarity index 73%
rename from app/soapbox/hooks/api/groups/usePopularTags.ts
rename to app/soapbox/api/hooks/groups/usePopularTags.ts
index 0bd272a2d..e0ec2c550 100644
--- a/app/soapbox/hooks/api/groups/usePopularTags.ts
+++ b/app/soapbox/api/hooks/groups/usePopularTags.ts
@@ -1,9 +1,7 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
-import { GroupTag, groupTagSchema } from 'soapbox/schemas';
-
-import { useApi } from '../../useApi';
-import { useFeatures } from '../../useFeatures';
+import { useApi, useFeatures } from 'soapbox/hooks';
+import { type GroupTag, groupTagSchema } from 'soapbox/schemas';
 
 function usePopularTags() {
   const api = useApi();
diff --git a/app/soapbox/hooks/api/groups/usePromoteGroupMember.ts b/app/soapbox/api/hooks/groups/usePromoteGroupMember.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/usePromoteGroupMember.ts
rename to app/soapbox/api/hooks/groups/usePromoteGroupMember.ts
diff --git a/app/soapbox/hooks/api/useSuggestedGroups.ts b/app/soapbox/api/hooks/groups/useSuggestedGroups.ts
similarity index 74%
rename from app/soapbox/hooks/api/useSuggestedGroups.ts
rename to app/soapbox/api/hooks/groups/useSuggestedGroups.ts
index 49f60c2b1..78b1ddb79 100644
--- a/app/soapbox/hooks/api/useSuggestedGroups.ts
+++ b/app/soapbox/api/hooks/groups/useSuggestedGroups.ts
@@ -1,10 +1,9 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
-import { Group, groupSchema } from 'soapbox/schemas';
+import { useApi, useFeatures } from 'soapbox/hooks';
+import { type Group, groupSchema } from 'soapbox/schemas';
 
-import { useGroupRelationships } from '../api/groups/useGroups';
-import { useApi } from '../useApi';
-import { useFeatures } from '../useFeatures';
+import { useGroupRelationships } from './useGroups';
 
 function useSuggestedGroups() {
   const api = useApi();
diff --git a/app/soapbox/hooks/api/groups/useUpdateGroup.ts b/app/soapbox/api/hooks/groups/useUpdateGroup.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useUpdateGroup.ts
rename to app/soapbox/api/hooks/groups/useUpdateGroup.ts
diff --git a/app/soapbox/hooks/api/groups/useUpdateGroupTag.ts b/app/soapbox/api/hooks/groups/useUpdateGroupTag.ts
similarity index 100%
rename from app/soapbox/hooks/api/groups/useUpdateGroupTag.ts
rename to app/soapbox/api/hooks/groups/useUpdateGroupTag.ts
diff --git a/app/soapbox/hooks/api/index.ts b/app/soapbox/api/hooks/index.ts
similarity index 77%
rename from app/soapbox/hooks/api/index.ts
rename to app/soapbox/api/hooks/index.ts
index c8e1f67c3..eba4f0d84 100644
--- a/app/soapbox/hooks/api/index.ts
+++ b/app/soapbox/api/hooks/index.ts
@@ -1,7 +1,8 @@
+
 /**
  * Accounts
  */
-export { useAccount } from './useAccount';
+export { useAccount } from './accounts/useAccount';
 
 /**
  * Groups
@@ -12,7 +13,9 @@ export { useCreateGroup, type CreateGroupParams } from './groups/useCreateGroup'
 export { useDeleteGroup } from './groups/useDeleteGroup';
 export { useDemoteGroupMember } from './groups/useDemoteGroupMember';
 export { useGroup, useGroups } from './groups/useGroups';
+export { useGroupLookup } from './groups/useGroupLookup';
 export { useGroupMedia } from './groups/useGroupMedia';
+export { useGroupMembers } from './groups/useGroupMembers';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
 export { useGroupSearch } from './groups/useGroupSearch';
 export { useGroupTag } from './groups/useGroupTag';
@@ -21,12 +24,14 @@ export { useGroupValidation } from './groups/useGroupValidation';
 export { useGroupsFromTag } from './groups/useGroupsFromTag';
 export { useJoinGroup } from './groups/useJoinGroup';
 export { useLeaveGroup } from './groups/useLeaveGroup';
+export { usePopularGroups } from './groups/usePopularGroups';
 export { usePopularTags } from './groups/usePopularTags';
 export { usePromoteGroupMember } from './groups/usePromoteGroupMember';
+export { useSuggestedGroups } from './groups/useSuggestedGroups';
 export { useUpdateGroup } from './groups/useUpdateGroup';
 export { useUpdateGroupTag } from './groups/useUpdateGroupTag';
 
 /**
  * Relationships
  */
-export { useRelationships } from './useRelationships';
+export { useRelationships } from './accounts/useRelationships';
\ No newline at end of file
diff --git a/app/soapbox/components/hoc/group-lookup-hoc.tsx b/app/soapbox/components/hoc/group-lookup-hoc.tsx
index a7c76eed6..07c2d475b 100644
--- a/app/soapbox/components/hoc/group-lookup-hoc.tsx
+++ b/app/soapbox/components/hoc/group-lookup-hoc.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
+import { useGroupLookup } from 'soapbox/api/hooks';
 import ColumnLoading from 'soapbox/features/ui/components/column-loading';
-import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 import { Layout } from '../ui';
 
diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index e9a47a962..005b9e245 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -3,11 +3,11 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
 import { openModal } from 'soapbox/actions/modals';
+import { useCancelMembershipRequest, useJoinGroup, useLeaveGroup } from 'soapbox/api/hooks';
 import { Button } from 'soapbox/components/ui';
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useAppDispatch, useOwnAccount } from 'soapbox/hooks';
-import { useCancelMembershipRequest, useJoinGroup, useLeaveGroup } from 'soapbox/hooks/api';
 import { queryClient } from 'soapbox/queries/client';
 import { GroupKeys } from 'soapbox/queries/groups';
 import { GroupRoles } from 'soapbox/schemas/group-member';
diff --git a/app/soapbox/features/group/components/group-member-list-item.tsx b/app/soapbox/features/group/components/group-member-list-item.tsx
index c88f4e58d..d2226879a 100644
--- a/app/soapbox/features/group/components/group-member-list-item.tsx
+++ b/app/soapbox/features/group/components/group-member-list-item.tsx
@@ -4,6 +4,7 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import { groupKick } from 'soapbox/actions/groups';
 import { openModal } from 'soapbox/actions/modals';
+import { useAccount, useBlockGroupMember, useDemoteGroupMember, usePromoteGroupMember } from 'soapbox/api/hooks';
 import Account from 'soapbox/components/account';
 import DropdownMenu from 'soapbox/components/dropdown-menu/dropdown-menu';
 import { HStack } from 'soapbox/components/ui';
@@ -11,7 +12,6 @@ import { deleteEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder-account';
 import { useAppDispatch, useFeatures } from 'soapbox/hooks';
-import { useAccount, useBlockGroupMember, useDemoteGroupMember, usePromoteGroupMember } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
diff --git a/app/soapbox/features/group/components/group-options-button.tsx b/app/soapbox/features/group/components/group-options-button.tsx
index 7f24a3668..597a751d7 100644
--- a/app/soapbox/features/group/components/group-options-button.tsx
+++ b/app/soapbox/features/group/components/group-options-button.tsx
@@ -3,10 +3,10 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals';
 import { initReport, ReportableEntities } from 'soapbox/actions/reports';
+import { useLeaveGroup } from 'soapbox/api/hooks';
 import DropdownMenu, { Menu } from 'soapbox/components/dropdown-menu';
 import { IconButton } from 'soapbox/components/ui';
 import { useAppDispatch, useOwnAccount } from 'soapbox/hooks';
-import { useLeaveGroup } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index eab096747..7908bb13d 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -2,11 +2,11 @@ import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
+import { useUpdateGroupTag } from 'soapbox/api/hooks';
 import { HStack, IconButton, Stack, Text, Tooltip } from 'soapbox/components/ui';
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useUpdateGroupTag } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 import { shortNumberFormat } from 'soapbox/utils/numbers';
diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index 184df76d5..c0e972604 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { useGroup, useUpdateGroup } from 'soapbox/api/hooks';
 import { Button, Column, Form, FormActions, FormGroup, Icon, Input, Spinner, Textarea } from 'soapbox/components/ui';
 import { useAppSelector, useInstance } from 'soapbox/hooks';
-import { useGroup, useUpdateGroup } from 'soapbox/hooks/api';
 import { useImageField, useTextField } from 'soapbox/hooks/forms';
 import toast from 'soapbox/toast';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
diff --git a/app/soapbox/features/group/group-blocked-members.tsx b/app/soapbox/features/group/group-blocked-members.tsx
index 988b90b1b..f45e8259f 100644
--- a/app/soapbox/features/group/group-blocked-members.tsx
+++ b/app/soapbox/features/group/group-blocked-members.tsx
@@ -2,11 +2,11 @@ import React, { useCallback, useEffect } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { fetchGroupBlocks, groupUnblock } from 'soapbox/actions/groups';
+import { useGroup } from 'soapbox/api/hooks';
 import Account from 'soapbox/components/account';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Button, Column, HStack, Spinner } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
 import { makeGetAccount } from 'soapbox/selectors';
 import toast from 'soapbox/toast';
 
diff --git a/app/soapbox/features/group/group-gallery.tsx b/app/soapbox/features/group/group-gallery.tsx
index 70a77680d..f0b2b95c7 100644
--- a/app/soapbox/features/group/group-gallery.tsx
+++ b/app/soapbox/features/group/group-gallery.tsx
@@ -2,11 +2,11 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals';
+import { useGroup, useGroupMedia } from 'soapbox/api/hooks';
 import LoadMore from 'soapbox/components/load-more';
 import MissingIndicator from 'soapbox/components/missing-indicator';
 import { Column, Spinner } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroup, useGroupMedia } from 'soapbox/hooks/api';
 
 import MediaItem from '../account-gallery/components/media-item';
 
diff --git a/app/soapbox/features/group/group-members.tsx b/app/soapbox/features/group/group-members.tsx
index 36ccd05b7..1c2a892f3 100644
--- a/app/soapbox/features/group/group-members.tsx
+++ b/app/soapbox/features/group/group-members.tsx
@@ -1,12 +1,10 @@
 import clsx from 'clsx';
 import React, { useMemo } from 'react';
 
+import { useGroup, useGroupMembers, useGroupMembershipRequests } from 'soapbox/api/hooks';
 import { PendingItemsRow } from 'soapbox/components/pending-items-row';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { useFeatures } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
-import { useGroupMembershipRequests } from 'soapbox/hooks/api/groups/useGroupMembershipRequests';
-import { useGroupMembers } from 'soapbox/hooks/api/useGroupMembers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
 import PlaceholderAccount from '../placeholder/components/placeholder-account';
@@ -15,6 +13,7 @@ import GroupMemberListItem from './components/group-member-list-item';
 
 import type { Group } from 'soapbox/types/entities';
 
+
 interface IGroupMembers {
   params: { groupId: string }
 }
diff --git a/app/soapbox/features/group/group-membership-requests.tsx b/app/soapbox/features/group/group-membership-requests.tsx
index c83d45b06..e50092887 100644
--- a/app/soapbox/features/group/group-membership-requests.tsx
+++ b/app/soapbox/features/group/group-membership-requests.tsx
@@ -1,12 +1,11 @@
 import React, { useEffect } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
+import { useGroup, useGroupMembers, useGroupMembershipRequests } from 'soapbox/api/hooks';
 import Account from 'soapbox/components/account';
 import { AuthorizeRejectButtons } from 'soapbox/components/authorize-reject-buttons';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Column, HStack, Spinner } from 'soapbox/components/ui';
-import { useGroup, useGroupMembershipRequests } from 'soapbox/hooks/api';
-import { useGroupMembers } from 'soapbox/hooks/api/useGroupMembers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 
diff --git a/app/soapbox/features/group/group-tag-timeline.tsx b/app/soapbox/features/group/group-tag-timeline.tsx
index f2ddee382..e79092e7a 100644
--- a/app/soapbox/features/group/group-tag-timeline.tsx
+++ b/app/soapbox/features/group/group-tag-timeline.tsx
@@ -2,9 +2,9 @@ import React, { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { expandGroupTimelineFromTag } from 'soapbox/actions/timelines';
+import { useGroup, useGroupTag } from 'soapbox/api/hooks';
 import { Column, Icon, Stack, Text } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroup, useGroupTag } from 'soapbox/hooks/api';
 
 import Timeline from '../ui/components/timeline';
 
diff --git a/app/soapbox/features/group/group-tags.tsx b/app/soapbox/features/group/group-tags.tsx
index 516fb94df..710a4fdb5 100644
--- a/app/soapbox/features/group/group-tags.tsx
+++ b/app/soapbox/features/group/group-tags.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { useGroupTags } from 'soapbox/api/hooks';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Icon, Stack, Text } from 'soapbox/components/ui';
-import { useGroupTags } from 'soapbox/hooks/api';
 import { useGroup } from 'soapbox/queries/groups';
 
 import PlaceholderAccount from '../placeholder/components/placeholder-account';
diff --git a/app/soapbox/features/group/group-timeline.tsx b/app/soapbox/features/group/group-timeline.tsx
index d189fdb68..a920a862c 100644
--- a/app/soapbox/features/group/group-timeline.tsx
+++ b/app/soapbox/features/group/group-timeline.tsx
@@ -6,10 +6,10 @@ import { Link } from 'react-router-dom';
 import { groupCompose, setGroupTimelineVisible, uploadCompose } from 'soapbox/actions/compose';
 import { connectGroupStream } from 'soapbox/actions/streaming';
 import { expandGroupTimeline } from 'soapbox/actions/timelines';
+import { useGroup } from 'soapbox/api/hooks';
 import { Avatar, HStack, Icon, Stack, Text, Toggle } from 'soapbox/components/ui';
 import ComposeForm from 'soapbox/features/compose/components/compose-form';
 import { useAppDispatch, useAppSelector, useDraggedFiles, useOwnAccount } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
 
 import Timeline from '../ui/components/timeline';
 
diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 5c3ee5c24..648593318 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -3,10 +3,10 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 
 import { openModal } from 'soapbox/actions/modals';
+import { useDeleteGroup, useGroup } from 'soapbox/api/hooks';
 import List, { ListItem } from 'soapbox/components/list';
 import { CardBody, CardHeader, CardTitle, Column, Spinner, Text } from 'soapbox/components/ui';
 import { useAppDispatch, useBackend, useGroupsPath } from 'soapbox/hooks';
-import { useDeleteGroup, useGroup } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 import { TRUTHSOCIAL } from 'soapbox/utils/features';
diff --git a/app/soapbox/features/groups/components/discover/popular-groups.tsx b/app/soapbox/features/groups/components/discover/popular-groups.tsx
index 894542eb8..83426f553 100644
--- a/app/soapbox/features/groups/components/discover/popular-groups.tsx
+++ b/app/soapbox/features/groups/components/discover/popular-groups.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { usePopularGroups } from 'soapbox/api/hooks';
 import Link from 'soapbox/components/link';
 import { Carousel, HStack, Stack, Text } from 'soapbox/components/ui';
 import PlaceholderGroupDiscover from 'soapbox/features/placeholder/components/placeholder-group-discover';
-import { usePopularGroups } from 'soapbox/hooks/api/usePopularGroups';
 
 import GroupGridItem from './group-grid-item';
 
diff --git a/app/soapbox/features/groups/components/discover/popular-tags.tsx b/app/soapbox/features/groups/components/discover/popular-tags.tsx
index 4cfed0bee..75ff36628 100644
--- a/app/soapbox/features/groups/components/discover/popular-tags.tsx
+++ b/app/soapbox/features/groups/components/discover/popular-tags.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { usePopularTags } from 'soapbox/api/hooks';
 import Link from 'soapbox/components/link';
 import { HStack, Stack, Text } from 'soapbox/components/ui';
-import { usePopularTags } from 'soapbox/hooks/api';
 
 import TagListItem from './tag-list-item';
 
diff --git a/app/soapbox/features/groups/components/discover/search/results.tsx b/app/soapbox/features/groups/components/discover/search/results.tsx
index 2543f6ebc..3ae6b2179 100644
--- a/app/soapbox/features/groups/components/discover/search/results.tsx
+++ b/app/soapbox/features/groups/components/discover/search/results.tsx
@@ -3,8 +3,8 @@ import React, { useCallback, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { useGroupSearch } from 'soapbox/api/hooks';
 import { HStack, Stack, Text } from 'soapbox/components/ui';
-import { useGroupSearch } from 'soapbox/hooks/api';
 
 import GroupGridItem from '../group-grid-item';
 import GroupListItem from '../group-list-item';
diff --git a/app/soapbox/features/groups/components/discover/search/search.tsx b/app/soapbox/features/groups/components/discover/search/search.tsx
index 647f10fb5..0e2d7f00e 100644
--- a/app/soapbox/features/groups/components/discover/search/search.tsx
+++ b/app/soapbox/features/groups/components/discover/search/search.tsx
@@ -1,10 +1,10 @@
 import React, { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { useGroupSearch } from 'soapbox/api/hooks';
 import { Stack } from 'soapbox/components/ui';
 import PlaceholderGroupSearch from 'soapbox/features/placeholder/components/placeholder-group-search';
 import { useDebounce, useOwnAccount } from 'soapbox/hooks';
-import { useGroupSearch } from 'soapbox/hooks/api';
 import { saveGroupSearch } from 'soapbox/utils/groups';
 
 import Blankslate from './blankslate';
diff --git a/app/soapbox/features/groups/components/discover/suggested-groups.tsx b/app/soapbox/features/groups/components/discover/suggested-groups.tsx
index e0e26e874..5d73cc3f0 100644
--- a/app/soapbox/features/groups/components/discover/suggested-groups.tsx
+++ b/app/soapbox/features/groups/components/discover/suggested-groups.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { useSuggestedGroups } from 'soapbox/api/hooks';
 import Link from 'soapbox/components/link';
 import { Carousel, HStack, Stack, Text } from 'soapbox/components/ui';
 import PlaceholderGroupDiscover from 'soapbox/features/placeholder/components/placeholder-group-discover';
-import { useSuggestedGroups } from 'soapbox/hooks/api/useSuggestedGroups';
 
 import GroupGridItem from './group-grid-item';
 
diff --git a/app/soapbox/features/groups/index.tsx b/app/soapbox/features/groups/index.tsx
index 7528989f6..7b1c51c55 100644
--- a/app/soapbox/features/groups/index.tsx
+++ b/app/soapbox/features/groups/index.tsx
@@ -3,11 +3,11 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
 import { openModal } from 'soapbox/actions/modals';
+import { useGroups } from 'soapbox/api/hooks';
 import GroupCard from 'soapbox/components/group-card';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Button, Input, Stack, Text } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useDebounce, useFeatures } from 'soapbox/hooks';
-import { useGroups } from 'soapbox/hooks/api';
 import { PERMISSION_CREATE_GROUPS, hasPermission } from 'soapbox/utils/permissions';
 
 import PlaceholderGroupCard from '../placeholder/components/placeholder-group-card';
diff --git a/app/soapbox/features/groups/popular.tsx b/app/soapbox/features/groups/popular.tsx
index c2c11148c..2f417dd8f 100644
--- a/app/soapbox/features/groups/popular.tsx
+++ b/app/soapbox/features/groups/popular.tsx
@@ -3,8 +3,8 @@ import React, { useCallback, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { usePopularGroups } from 'soapbox/api/hooks';
 import { Column } from 'soapbox/components/ui';
-import { usePopularGroups } from 'soapbox/hooks/api/usePopularGroups';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';
diff --git a/app/soapbox/features/groups/suggested.tsx b/app/soapbox/features/groups/suggested.tsx
index 4d1843598..89833a9a8 100644
--- a/app/soapbox/features/groups/suggested.tsx
+++ b/app/soapbox/features/groups/suggested.tsx
@@ -3,8 +3,8 @@ import React, { useCallback, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { useSuggestedGroups } from 'soapbox/api/hooks';
 import { Column } from 'soapbox/components/ui';
-import { useSuggestedGroups } from 'soapbox/hooks/api/useSuggestedGroups';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';
diff --git a/app/soapbox/features/groups/tag.tsx b/app/soapbox/features/groups/tag.tsx
index 8b18053d3..ccc54bbb3 100644
--- a/app/soapbox/features/groups/tag.tsx
+++ b/app/soapbox/features/groups/tag.tsx
@@ -2,8 +2,8 @@ import clsx from 'clsx';
 import React, { useCallback, useState } from 'react';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { useGroupTag, useGroupsFromTag } from 'soapbox/api/hooks';
 import { Column, HStack, Icon } from 'soapbox/components/ui';
-import { useGroupTag, useGroupsFromTag } from 'soapbox/hooks/api';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';
diff --git a/app/soapbox/features/groups/tags.tsx b/app/soapbox/features/groups/tags.tsx
index 1484665e4..aa37a514b 100644
--- a/app/soapbox/features/groups/tags.tsx
+++ b/app/soapbox/features/groups/tags.tsx
@@ -3,8 +3,8 @@ import React from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { Virtuoso } from 'react-virtuoso';
 
+import { usePopularTags } from 'soapbox/api/hooks';
 import { Column, Text } from 'soapbox/components/ui';
-import { usePopularTags } from 'soapbox/hooks/api';
 
 import TagListItem from './components/discover/tag-list-item';
 
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
index f09232b42..d87126c74 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
@@ -2,9 +2,9 @@ import { AxiosError } from 'axios';
 import React, { useMemo, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/api/hooks';
 import { Modal, Stack } from 'soapbox/components/ui';
 import { useDebounce } from 'soapbox/hooks';
-import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/hooks/api';
 import { type Group } from 'soapbox/schemas';
 import toast from 'soapbox/toast';
 
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
index d5e59e575..02dbf3279 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { CreateGroupParams, useGroupValidation } from 'soapbox/api/hooks';
 import { Form, FormGroup, Input, Textarea } from 'soapbox/components/ui';
 import AvatarPicker from 'soapbox/features/group/components/group-avatar-picker';
 import HeaderPicker from 'soapbox/features/group/components/group-header-picker';
 import GroupTagsField from 'soapbox/features/group/components/group-tags-field';
 import { useAppSelector, useDebounce, useInstance } from 'soapbox/hooks';
-import { CreateGroupParams, useGroupValidation } from 'soapbox/hooks/api';
 import { usePreview } from 'soapbox/hooks/forms';
 import resizeImage from 'soapbox/utils/resize-image';
 
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
index 4e42d0b58..951b1ea67 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { type CreateGroupParams } from 'soapbox/api/hooks';
 import List, { ListItem } from 'soapbox/components/list';
 import { Form, FormGroup, Stack, Text } from 'soapbox/components/ui';
-import { type CreateGroupParams } from 'soapbox/hooks/api';
 
 interface IPrivacyStep {
   params: CreateGroupParams
diff --git a/app/soapbox/features/ui/components/panels/my-groups-panel.tsx b/app/soapbox/features/ui/components/panels/my-groups-panel.tsx
index e6434b1dd..c732f5ae7 100644
--- a/app/soapbox/features/ui/components/panels/my-groups-panel.tsx
+++ b/app/soapbox/features/ui/components/panels/my-groups-panel.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { useGroups } from 'soapbox/api/hooks';
 import { Widget } from 'soapbox/components/ui';
 import GroupListItem from 'soapbox/features/groups/components/discover/group-list-item';
 import PlaceholderGroupSearch from 'soapbox/features/placeholder/components/placeholder-group-search';
-import { useGroups } from 'soapbox/hooks/api';
 
 const MyGroupsPanel = () => {
   const { groups, isFetching, isFetched, isError } = useGroups();
diff --git a/app/soapbox/features/ui/components/panels/suggested-groups-panel.tsx b/app/soapbox/features/ui/components/panels/suggested-groups-panel.tsx
index 395a53f9c..5ef131047 100644
--- a/app/soapbox/features/ui/components/panels/suggested-groups-panel.tsx
+++ b/app/soapbox/features/ui/components/panels/suggested-groups-panel.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { useSuggestedGroups } from 'soapbox/api/hooks';
 import { Widget } from 'soapbox/components/ui';
 import GroupListItem from 'soapbox/features/groups/components/discover/group-list-item';
 import PlaceholderGroupSearch from 'soapbox/features/placeholder/components/placeholder-group-search';
-import { useSuggestedGroups } from 'soapbox/hooks/api/useSuggestedGroups';
 
 const SuggestedGroupsPanel = () => {
   const { groups, isFetching, isFetched, isError } = useSuggestedGroups();
diff --git a/app/soapbox/hooks/useGroupsPath.ts b/app/soapbox/hooks/useGroupsPath.ts
index a4c1efa19..7a101e463 100644
--- a/app/soapbox/hooks/useGroupsPath.ts
+++ b/app/soapbox/hooks/useGroupsPath.ts
@@ -1,4 +1,5 @@
-import { useGroups } from './api';
+import { useGroups } from 'soapbox/api/hooks';
+
 import { useFeatures } from './useFeatures';
 
 /**
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index 9e11c34a9..e2d6e5755 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { useRouteMatch } from 'react-router-dom';
 
+import { useGroup, useGroupMembershipRequests } from 'soapbox/api/hooks';
 import GroupLookupHoc from 'soapbox/components/hoc/group-lookup-hoc';
 import { Column, Icon, Layout, Stack, Text } from 'soapbox/components/ui';
 import GroupHeader from 'soapbox/features/group/components/group-header';
@@ -14,12 +15,11 @@ import {
   SuggestedGroupsPanel,
 } from 'soapbox/features/ui/util/async-components';
 import { useFeatures, useOwnAccount } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
-import { useGroupMembershipRequests } from 'soapbox/hooks/api/groups/useGroupMembershipRequests';
-import { Group } from 'soapbox/schemas';
 
 import { Tabs } from '../components/ui';
 
+import type { Group } from 'soapbox/schemas';
+
 const messages = defineMessages({
   all: { id: 'group.tabs.all', defaultMessage: 'All' },
   members: { id: 'group.tabs.members', defaultMessage: 'Members' },

From 0f1e7fb2a7b451e1d45612294ad68b738b43597a Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 2 May 2023 13:29:29 -0400
Subject: [PATCH 215/298] Support HTML version of note in Group Creation modal

---
 .../modals/manage-group-modal/steps/confirmation-step.tsx   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index 0b7a38d0e..4c388751f 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -54,7 +54,11 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
 
         <Stack>
           <Text size='2xl' weight='bold' align='center'>{group.display_name}</Text>
-          <Text size='md' className='mx-auto max-w-sm'>{group.note}</Text>
+          <Text
+            size='md'
+            className='mx-auto max-w-sm'
+            dangerouslySetInnerHTML={{ __html: group.note_emojified }}
+          />
         </Stack>
       </Stack>
 

From 4dd4ba212dcfbea6dac6a2b405e35dbe5c86b70a Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 2 May 2023 13:33:42 -0400
Subject: [PATCH 216/298] Remove pencil from Compose button

---
 app/soapbox/features/ui/components/compose-button.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/compose-button.tsx b/app/soapbox/features/ui/components/compose-button.tsx
index a2944f699..d36cb26b3 100644
--- a/app/soapbox/features/ui/components/compose-button.tsx
+++ b/app/soapbox/features/ui/components/compose-button.tsx
@@ -25,7 +25,6 @@ const HomeComposeButton = () => {
   return (
     <Button
       theme='accent'
-      icon={require('@tabler/icons/pencil-plus.svg')}
       size='lg'
       onClick={onOpenCompose}
       block

From 6aabad9df3b689e9e5ced6db2578e5bab34f47b4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 12:47:16 -0500
Subject: [PATCH 217/298] List: prevent long content overflow

---
 app/soapbox/components/list.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/components/list.tsx b/app/soapbox/components/list.tsx
index e1b8cdcd9..b56e0e6a7 100644
--- a/app/soapbox/components/list.tsx
+++ b/app/soapbox/components/list.tsx
@@ -56,8 +56,7 @@ const ListItem: React.FC<IListItem> = ({ label, hint, children, onClick, onSelec
 
   return (
     <Comp
-      className={clsx({
-        'flex items-center justify-between px-4 py-2 first:rounded-t-lg last:rounded-b-lg bg-gradient-to-r from-gradient-start/20 to-gradient-end/20 dark:from-gradient-start/10 dark:to-gradient-end/10': true,
+      className={clsx('flex items-center justify-between overflow-hidden bg-gradient-to-r from-gradient-start/20 to-gradient-end/20 px-4 py-2 first:rounded-t-lg last:rounded-b-lg dark:from-gradient-start/10 dark:to-gradient-end/10', {
         'cursor-pointer hover:from-gradient-start/30 hover:to-gradient-end/30 dark:hover:from-gradient-start/5 dark:hover:to-gradient-end/5': typeof onClick !== 'undefined' || typeof onSelect !== 'undefined',
       })}
       {...linkProps}
@@ -71,7 +70,7 @@ const ListItem: React.FC<IListItem> = ({ label, hint, children, onClick, onSelec
       </div>
 
       {onClick ? (
-        <HStack space={1} alignItems='center' className='text-gray-700 dark:text-gray-600'>
+        <HStack space={1} alignItems='center' className='overflow-hidden text-gray-700 dark:text-gray-600'>
           {children}
 
           <Icon src={require('@tabler/icons/chevron-right.svg')} className='ml-1 rtl:rotate-180' />

From 238c30acf8434791b669507ce19fffd138b6a1e5 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 2 May 2023 13:25:32 -0400
Subject: [PATCH 218/298] Split out hooks from 'useGroups'

---
 app/soapbox/api/hooks/groups/useGroup.ts      | 24 ++++++
 .../groups/useGroupMembershipRequests.ts      |  2 +-
 .../api/hooks/groups/useGroupRelationship.ts  | 32 ++++++++
 .../api/hooks/groups/useGroupRelationships.ts | 27 +++++++
 .../api/hooks/groups/useGroupSearch.ts        |  2 +-
 app/soapbox/api/hooks/groups/useGroups.ts     | 73 ++-----------------
 .../api/hooks/groups/useGroupsFromTag.ts      |  2 +-
 .../api/hooks/groups/usePopularGroups.ts      |  2 +-
 .../api/hooks/groups/useSuggestedGroups.ts    |  2 +-
 app/soapbox/api/hooks/index.ts                |  5 +-
 .../features/ui/components/compose-button.tsx |  2 +-
 .../ui/components/floating-action-button.tsx  |  2 +-
 .../ui/components/modals/compose-modal.tsx    |  2 +-
 13 files changed, 101 insertions(+), 76 deletions(-)
 create mode 100644 app/soapbox/api/hooks/groups/useGroup.ts
 create mode 100644 app/soapbox/api/hooks/groups/useGroupRelationship.ts
 create mode 100644 app/soapbox/api/hooks/groups/useGroupRelationships.ts

diff --git a/app/soapbox/api/hooks/groups/useGroup.ts b/app/soapbox/api/hooks/groups/useGroup.ts
new file mode 100644
index 000000000..b66c0fee7
--- /dev/null
+++ b/app/soapbox/api/hooks/groups/useGroup.ts
@@ -0,0 +1,24 @@
+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 { entity: group, ...result } = useEntity<Group>(
+    [Entities.GROUPS, groupId],
+    () => api.get(`/api/v1/groups/${groupId}`),
+    { schema: groupSchema, refetch },
+  );
+  const { entity: relationship } = useGroupRelationship(groupId);
+
+  return {
+    ...result,
+    group: group ? { ...group, relationship: relationship || null } : undefined,
+  };
+}
+
+export { useGroup };
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts b/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
index 171510338..16ff924c7 100644
--- a/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
+++ b/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
@@ -4,7 +4,7 @@ import { useApi } from 'soapbox/hooks/useApi';
 import { accountSchema } from 'soapbox/schemas';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-import { useGroupRelationship } from './useGroups';
+import { useGroupRelationship } from './useGroupRelationship';
 
 import type { ExpandedEntitiesPath } from 'soapbox/entity-store/hooks/types';
 
diff --git a/app/soapbox/api/hooks/groups/useGroupRelationship.ts b/app/soapbox/api/hooks/groups/useGroupRelationship.ts
new file mode 100644
index 000000000..6b24c463c
--- /dev/null
+++ b/app/soapbox/api/hooks/groups/useGroupRelationship.ts
@@ -0,0 +1,32 @@
+import { useEffect } from 'react';
+import { z } from 'zod';
+
+import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi, useAppDispatch } from 'soapbox/hooks';
+import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
+
+function useGroupRelationship(groupId: string) {
+  const api = useApi();
+  const dispatch = useAppDispatch();
+
+  const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
+    [Entities.GROUP_RELATIONSHIPS, groupId],
+    () => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
+    { schema: z.array(groupRelationshipSchema).transform(arr => arr[0]) },
+  );
+
+  useEffect(() => {
+    if (groupRelationship?.id) {
+      dispatch(fetchGroupRelationshipsSuccess([groupRelationship]));
+    }
+  }, [groupRelationship?.id]);
+
+  return {
+    entity: groupRelationship,
+    ...result,
+  };
+}
+
+export { useGroupRelationship };
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/useGroupRelationships.ts b/app/soapbox/api/hooks/groups/useGroupRelationships.ts
new file mode 100644
index 000000000..c4106adda
--- /dev/null
+++ b/app/soapbox/api/hooks/groups/useGroupRelationships.ts
@@ -0,0 +1,27 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
+
+function useGroupRelationships(groupIds: string[]) {
+  const api = useApi();
+  const q = groupIds.map(id => `id[]=${id}`).join('&');
+
+  const { entities, ...result } = useEntities<GroupRelationship>(
+    [Entities.GROUP_RELATIONSHIPS, ...groupIds],
+    () => api.get(`/api/v1/groups/relationships?${q}`),
+    { schema: groupRelationshipSchema, enabled: groupIds.length > 0 },
+  );
+
+  const relationships = entities.reduce<Record<string, GroupRelationship>>((map, relationship) => {
+    map[relationship.id] = relationship;
+    return map;
+  }, {});
+
+  return {
+    ...result,
+    relationships,
+  };
+}
+
+export { useGroupRelationships };
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/useGroupSearch.ts b/app/soapbox/api/hooks/groups/useGroupSearch.ts
index 508310911..d1d8acf9c 100644
--- a/app/soapbox/api/hooks/groups/useGroupSearch.ts
+++ b/app/soapbox/api/hooks/groups/useGroupSearch.ts
@@ -3,7 +3,7 @@ import { useEntities } from 'soapbox/entity-store/hooks';
 import { useApi, useFeatures } from 'soapbox/hooks';
 import { groupSchema } from 'soapbox/schemas';
 
-import { useGroupRelationships } from './useGroups';
+import { useGroupRelationships } from './useGroupRelationships';
 
 import type { Group } from 'soapbox/schemas';
 
diff --git a/app/soapbox/api/hooks/groups/useGroups.ts b/app/soapbox/api/hooks/groups/useGroups.ts
index 42904c142..13ca45713 100644
--- a/app/soapbox/api/hooks/groups/useGroups.ts
+++ b/app/soapbox/api/hooks/groups/useGroups.ts
@@ -1,13 +1,10 @@
-import { useEffect } from 'react';
-import { z } from 'zod';
-
-import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
 import { Entities } from 'soapbox/entity-store/entities';
-import { useEntities, useEntity } from 'soapbox/entity-store/hooks';
-import { useApi, useAppDispatch } from 'soapbox/hooks';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
 import { useFeatures } from 'soapbox/hooks/useFeatures';
-import { groupSchema, Group } from 'soapbox/schemas/group';
-import { groupRelationshipSchema, GroupRelationship } from 'soapbox/schemas/group-relationship';
+import { groupSchema, type Group } from 'soapbox/schemas/group';
+
+import { useGroupRelationships } from './useGroupRelationships';
 
 function useGroups(q: string = '') {
   const api = useApi();
@@ -31,62 +28,4 @@ function useGroups(q: string = '') {
   };
 }
 
-function useGroup(groupId: string, refetch = true) {
-  const api = useApi();
-
-  const { entity: group, ...result } = useEntity<Group>(
-    [Entities.GROUPS, groupId],
-    () => api.get(`/api/v1/groups/${groupId}`),
-    { schema: groupSchema, refetch },
-  );
-  const { entity: relationship } = useGroupRelationship(groupId);
-
-  return {
-    ...result,
-    group: group ? { ...group, relationship: relationship || null } : undefined,
-  };
-}
-
-function useGroupRelationship(groupId: string) {
-  const api = useApi();
-  const dispatch = useAppDispatch();
-
-  const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
-    [Entities.GROUP_RELATIONSHIPS, groupId],
-    () => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
-    { schema: z.array(groupRelationshipSchema).transform(arr => arr[0]) },
-  );
-
-  useEffect(() => {
-    if (groupRelationship?.id) {
-      dispatch(fetchGroupRelationshipsSuccess([groupRelationship]));
-    }
-  }, [groupRelationship?.id]);
-
-  return {
-    entity: groupRelationship,
-    ...result,
-  };
-}
-
-function useGroupRelationships(groupIds: string[]) {
-  const api = useApi();
-  const q = groupIds.map(id => `id[]=${id}`).join('&');
-  const { entities, ...result } = useEntities<GroupRelationship>(
-    [Entities.GROUP_RELATIONSHIPS, ...groupIds],
-    () => api.get(`/api/v1/groups/relationships?${q}`),
-    { schema: groupRelationshipSchema, enabled: groupIds.length > 0 },
-  );
-
-  const relationships = entities.reduce<Record<string, GroupRelationship>>((map, relationship) => {
-    map[relationship.id] = relationship;
-    return map;
-  }, {});
-
-  return {
-    ...result,
-    relationships,
-  };
-}
-
-export { useGroup, useGroups, useGroupRelationship, useGroupRelationships };
+export { useGroups };
diff --git a/app/soapbox/api/hooks/groups/useGroupsFromTag.ts b/app/soapbox/api/hooks/groups/useGroupsFromTag.ts
index f579c719e..2c7e5a94f 100644
--- a/app/soapbox/api/hooks/groups/useGroupsFromTag.ts
+++ b/app/soapbox/api/hooks/groups/useGroupsFromTag.ts
@@ -3,7 +3,7 @@ import { useEntities } from 'soapbox/entity-store/hooks';
 import { useApi, useFeatures } from 'soapbox/hooks';
 import { groupSchema } from 'soapbox/schemas';
 
-import { useGroupRelationships } from './useGroups';
+import { useGroupRelationships } from './useGroupRelationships';
 
 import type { Group } from 'soapbox/schemas';
 
diff --git a/app/soapbox/api/hooks/groups/usePopularGroups.ts b/app/soapbox/api/hooks/groups/usePopularGroups.ts
index ead72a79b..b5959a335 100644
--- a/app/soapbox/api/hooks/groups/usePopularGroups.ts
+++ b/app/soapbox/api/hooks/groups/usePopularGroups.ts
@@ -5,7 +5,7 @@ import { Group, groupSchema } from 'soapbox/schemas';
 import { useApi } from '../../../hooks/useApi';
 import { useFeatures } from '../../../hooks/useFeatures';
 
-import { useGroupRelationships } from './useGroups';
+import { useGroupRelationships } from './useGroupRelationships';
 
 function usePopularGroups() {
   const api = useApi();
diff --git a/app/soapbox/api/hooks/groups/useSuggestedGroups.ts b/app/soapbox/api/hooks/groups/useSuggestedGroups.ts
index 78b1ddb79..be9b5a78e 100644
--- a/app/soapbox/api/hooks/groups/useSuggestedGroups.ts
+++ b/app/soapbox/api/hooks/groups/useSuggestedGroups.ts
@@ -3,7 +3,7 @@ import { useEntities } from 'soapbox/entity-store/hooks';
 import { useApi, useFeatures } from 'soapbox/hooks';
 import { type Group, groupSchema } from 'soapbox/schemas';
 
-import { useGroupRelationships } from './useGroups';
+import { useGroupRelationships } from './useGroupRelationships';
 
 function useSuggestedGroups() {
   const api = useApi();
diff --git a/app/soapbox/api/hooks/index.ts b/app/soapbox/api/hooks/index.ts
index eba4f0d84..ade03f799 100644
--- a/app/soapbox/api/hooks/index.ts
+++ b/app/soapbox/api/hooks/index.ts
@@ -12,15 +12,18 @@ export { useCancelMembershipRequest } from './groups/useCancelMembershipRequest'
 export { useCreateGroup, type CreateGroupParams } from './groups/useCreateGroup';
 export { useDeleteGroup } from './groups/useDeleteGroup';
 export { useDemoteGroupMember } from './groups/useDemoteGroupMember';
-export { useGroup, useGroups } from './groups/useGroups';
+export { useGroup } from './groups/useGroup';
 export { useGroupLookup } from './groups/useGroupLookup';
 export { useGroupMedia } from './groups/useGroupMedia';
 export { useGroupMembers } from './groups/useGroupMembers';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
+export { useGroupRelationship } from './groups/useGroupRelationship';
+export { useGroupRelationships } from './groups/useGroupRelationships';
 export { useGroupSearch } from './groups/useGroupSearch';
 export { useGroupTag } from './groups/useGroupTag';
 export { useGroupTags } from './groups/useGroupTags';
 export { useGroupValidation } from './groups/useGroupValidation';
+export { useGroups } from './groups/useGroups';
 export { useGroupsFromTag } from './groups/useGroupsFromTag';
 export { useJoinGroup } from './groups/useJoinGroup';
 export { useLeaveGroup } from './groups/useLeaveGroup';
diff --git a/app/soapbox/features/ui/components/compose-button.tsx b/app/soapbox/features/ui/components/compose-button.tsx
index a2944f699..b862d83fb 100644
--- a/app/soapbox/features/ui/components/compose-button.tsx
+++ b/app/soapbox/features/ui/components/compose-button.tsx
@@ -4,9 +4,9 @@ import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { groupComposeModal } from 'soapbox/actions/compose';
 import { openModal } from 'soapbox/actions/modals';
+import { useGroupLookup } from 'soapbox/api/hooks';
 import { Avatar, Button, HStack } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 const ComposeButton = () => {
   const location = useLocation();
diff --git a/app/soapbox/features/ui/components/floating-action-button.tsx b/app/soapbox/features/ui/components/floating-action-button.tsx
index 0e972ef40..ea6bd64ee 100644
--- a/app/soapbox/features/ui/components/floating-action-button.tsx
+++ b/app/soapbox/features/ui/components/floating-action-button.tsx
@@ -5,9 +5,9 @@ import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { groupComposeModal } from 'soapbox/actions/compose';
 import { openModal } from 'soapbox/actions/modals';
+import { useGroupLookup } from 'soapbox/api/hooks';
 import { Avatar, HStack, Icon } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 const messages = defineMessages({
   publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
diff --git a/app/soapbox/features/ui/components/modals/compose-modal.tsx b/app/soapbox/features/ui/components/modals/compose-modal.tsx
index 358a6d648..2bbdb4a2e 100644
--- a/app/soapbox/features/ui/components/modals/compose-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/compose-modal.tsx
@@ -4,10 +4,10 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { cancelReplyCompose, setGroupTimelineVisible, uploadCompose } from 'soapbox/actions/compose';
 import { openModal, closeModal } from 'soapbox/actions/modals';
+import { useGroup } from 'soapbox/api/hooks';
 import { checkComposeContent } from 'soapbox/components/modal-root';
 import { HStack, Modal, Text, Toggle } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
 
 import ComposeForm from '../../../compose/components/compose-form';
 

From 9776cc9623f7268360400ec220de25214e0bb04d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 12:50:55 -0500
Subject: [PATCH 219/298] Settings: truncate long usernames

---
 app/soapbox/features/settings/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/settings/index.tsx b/app/soapbox/features/settings/index.tsx
index 77bb22ef8..6ebc8eacf 100644
--- a/app/soapbox/features/settings/index.tsx
+++ b/app/soapbox/features/settings/index.tsx
@@ -74,7 +74,7 @@ const Settings = () => {
         <CardBody>
           <List>
             <ListItem label={intl.formatMessage(messages.editProfile)} onClick={navigateToEditProfile}>
-              <span>{displayName}</span>
+              <span className='max-w-full truncate'>{displayName}</span>
             </ListItem>
           </List>
         </CardBody>

From a38bc912c74a106f8f82665438503a13584353c1 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 12:51:12 -0500
Subject: [PATCH 220/298] EditProfile: prevent crash with account.source is not
 available

---
 app/soapbox/features/edit-profile/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/edit-profile/index.tsx b/app/soapbox/features/edit-profile/index.tsx
index 8483a171e..f45d75afa 100644
--- a/app/soapbox/features/edit-profile/index.tsx
+++ b/app/soapbox/features/edit-profile/index.tsx
@@ -124,7 +124,7 @@ const accountToCredentials = (account: Account): AccountCredentials => {
     discoverable: account.discoverable,
     bot: account.bot,
     display_name: account.display_name,
-    note: account.source.get('note'),
+    note: account.source.get('note', ''),
     locked: account.locked,
     fields_attributes: [...account.source.get<Iterable<AccountCredentialsField>>('fields', ImmutableList()).toJS()],
     stranger_notifications: account.getIn(['pleroma', 'notification_settings', 'block_from_strangers']) === true,

From be41c78030e0c85363a8fc289cbabcfa4bbeaca5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:08:11 -0500
Subject: [PATCH 221/298] UserPanel: truncate long acct

---
 app/soapbox/features/ui/components/user-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/user-panel.tsx b/app/soapbox/features/ui/components/user-panel.tsx
index 68165ba24..b6af761a1 100644
--- a/app/soapbox/features/ui/components/user-panel.tsx
+++ b/app/soapbox/features/ui/components/user-panel.tsx
@@ -71,7 +71,7 @@ const UserPanel: React.FC<IUserPanel> = ({ accountId, action, badges, domain })
             </HStack>
           </Link>
 
-          <Text size='sm' theme='muted'>
+          <Text size='sm' theme='muted' truncate>
             @{getAcct(account, fqn)}
           </Text>
         </Stack>

From ca2dffd9c34023810636f8fa598893fb1862c6dd Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:09:58 -0500
Subject: [PATCH 222/298] ProfileInfoPanel: truncate long username while
 loading

---
 app/soapbox/features/ui/components/profile-info-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/profile-info-panel.tsx b/app/soapbox/features/ui/components/profile-info-panel.tsx
index 6d407eaab..39128561d 100644
--- a/app/soapbox/features/ui/components/profile-info-panel.tsx
+++ b/app/soapbox/features/ui/components/profile-info-panel.tsx
@@ -120,7 +120,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
         <Stack space={2}>
           <Stack>
             <HStack space={1} alignItems='center'>
-              <Text size='sm' theme='muted' direction='ltr'>
+              <Text size='sm' theme='muted' direction='ltr' truncate>
                 @{username}
               </Text>
             </HStack>

From ac9653a89f5e502e803cfd627b6ef7273b635220 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:12:57 -0500
Subject: [PATCH 223/298] UserPanel: truncate long display name

---
 app/soapbox/features/ui/components/user-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/user-panel.tsx b/app/soapbox/features/ui/components/user-panel.tsx
index b6af761a1..08642d801 100644
--- a/app/soapbox/features/ui/components/user-panel.tsx
+++ b/app/soapbox/features/ui/components/user-panel.tsx
@@ -59,7 +59,7 @@ const UserPanel: React.FC<IUserPanel> = ({ accountId, action, badges, domain })
         <Stack>
           <Link to={`/@${account.acct}`}>
             <HStack space={1} alignItems='center'>
-              <Text size='lg' weight='bold' dangerouslySetInnerHTML={displayNameHtml} />
+              <Text size='lg' weight='bold' dangerouslySetInnerHTML={displayNameHtml} truncate />
 
               {verified && <VerificationBadge />}
 

From 9f2540c5c3c96f08fbae47da8d61357a4697dfdb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:14:45 -0500
Subject: [PATCH 224/298] Modal: truncate long title

---
 app/soapbox/components/ui/modal/modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/components/ui/modal/modal.tsx b/app/soapbox/components/ui/modal/modal.tsx
index 98b001f4c..d7f29303f 100644
--- a/app/soapbox/components/ui/modal/modal.tsx
+++ b/app/soapbox/components/ui/modal/modal.tsx
@@ -102,7 +102,7 @@ const Modal = React.forwardRef<HTMLDivElement, IModal>(({
                 'flex-row-reverse': closePosition === 'left',
               })}
             >
-              <h3 className='grow text-lg font-bold leading-6 text-gray-900 dark:text-white'>
+              <h3 className='grow truncate text-lg font-bold leading-6 text-gray-900 dark:text-white'>
                 {title}
               </h3>
 

From 626ddfda807d958e4f5d05ef9b394233c9dcde16 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:28:42 -0500
Subject: [PATCH 225/298] Truncate long usernames in modals

---
 app/soapbox/actions/moderation.tsx                     |  2 +-
 app/soapbox/components/status-action-bar.tsx           | 10 +++++-----
 app/soapbox/features/account/components/header.tsx     |  4 ++--
 .../features/compose/components/search-results.tsx     |  4 ++--
 .../features/ui/components/modals/mute-modal.tsx       |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/actions/moderation.tsx b/app/soapbox/actions/moderation.tsx
index c236a2986..cd08fcd2f 100644
--- a/app/soapbox/actions/moderation.tsx
+++ b/app/soapbox/actions/moderation.tsx
@@ -142,7 +142,7 @@ const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = ()
     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(() => {
diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx
index 585cc32d9..0f4adb552 100644
--- a/app/soapbox/components/status-action-bar.tsx
+++ b/app/soapbox/components/status-action-bar.tsx
@@ -258,8 +258,8 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
     dispatch(openModal('CONFIRM', {
       icon: require('@tabler/icons/ban.svg'),
-      heading: <FormattedMessage id='confirmations.block.heading' defaultMessage='Block @{name}' values={{ name: account.get('acct') }} />,
-      message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+      heading: <FormattedMessage id='confirmations.block.heading' defaultMessage='Block @{name}' values={{ name: account.acct }} />,
+      message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong className='break-words'>@{account.acct}</strong> }} />,
       confirm: intl.formatMessage(messages.blockConfirm),
       onConfirm: () => dispatch(blockAccount(account.id)),
       secondary: intl.formatMessage(messages.blockAndReport),
@@ -313,7 +313,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
     dispatch(openModal('CONFIRM', {
       heading: intl.formatMessage(messages.deleteHeading),
-      message: intl.formatMessage(messages.deleteFromGroupMessage, { name: account.username }),
+      message: intl.formatMessage(messages.deleteFromGroupMessage, { name: <strong className='break-words'>{account.username}</strong> }),
       confirm: intl.formatMessage(messages.deleteConfirm),
       onConfirm: () => dispatch(groupDeleteStatus((status.group as Group).id, status.id)),
     }));
@@ -324,7 +324,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
     dispatch(openModal('CONFIRM', {
       heading: intl.formatMessage(messages.kickFromGroupHeading),
-      message: intl.formatMessage(messages.kickFromGroupMessage, { name: account.username }),
+      message: intl.formatMessage(messages.kickFromGroupMessage, { name: <strong className='break-words'>{account.username}</strong> }),
       confirm: intl.formatMessage(messages.kickFromGroupConfirm),
       onConfirm: () => dispatch(groupKick((status.group as Group).id, account.id)),
     }));
@@ -335,7 +335,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
     dispatch(openModal('CONFIRM', {
       heading: intl.formatMessage(messages.blockFromGroupHeading),
-      message: intl.formatMessage(messages.blockFromGroupMessage, { name: account.username }),
+      message: intl.formatMessage(messages.blockFromGroupMessage, { name: <strong className='break-words'>{account.username}</strong> }),
       confirm: intl.formatMessage(messages.blockFromGroupConfirm),
       onConfirm: () => dispatch(groupBlock((status.group as Group).id, account.id)),
     }));
diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx
index 4a589a328..fbdfc3181 100644
--- a/app/soapbox/features/account/components/header.tsx
+++ b/app/soapbox/features/account/components/header.tsx
@@ -130,7 +130,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
       dispatch(openModal('CONFIRM', {
         icon: require('@tabler/icons/ban.svg'),
         heading: <FormattedMessage id='confirmations.block.heading' defaultMessage='Block @{name}' values={{ name: account.acct }} />,
-        message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.acct}</strong> }} />,
+        message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong className='break-words'>@{account.acct}</strong> }} />,
         confirm: intl.formatMessage(messages.blockConfirm),
         onConfirm: () => dispatch(blockAccount(account.id)),
         secondary: intl.formatMessage(messages.blockAndReport),
@@ -215,7 +215,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
       const unfollowModal = getSettings(getState()).get('unfollowModal');
       if (unfollowModal) {
         dispatch(openModal('CONFIRM', {
-          message: <FormattedMessage id='confirmations.remove_from_followers.message' defaultMessage='Are you sure you want to remove {name} from your followers?' values={{ name: <strong>@{account.acct}</strong> }} />,
+          message: <FormattedMessage id='confirmations.remove_from_followers.message' defaultMessage='Are you sure you want to remove {name} from your followers?' values={{ name: <strong className='break-words'>@{account.acct}</strong> }} />,
           confirm: intl.formatMessage(messages.removeFromFollowersConfirm),
           onConfirm: () => dispatch(removeFromFollowers(account.id)),
         }));
diff --git a/app/soapbox/features/compose/components/search-results.tsx b/app/soapbox/features/compose/components/search-results.tsx
index 1729def21..0962f7429 100644
--- a/app/soapbox/features/compose/components/search-results.tsx
+++ b/app/soapbox/features/compose/components/search-results.tsx
@@ -238,11 +238,11 @@ const SearchResults = () => {
       {filterByAccount ? (
         <HStack className='mb-4 border-b border-solid border-gray-200 px-2 pb-4 dark:border-gray-800' space={2}>
           <IconButton iconClassName='h-5 w-5' src={require('@tabler/icons/x.svg')} onClick={handleUnsetAccount} />
-          <Text>
+          <Text truncate>
             <FormattedMessage
               id='search_results.filter_message'
               defaultMessage='You are searching for posts from @{acct}.'
-              values={{ acct: account }}
+              values={{ acct: <strong className='break-words'>{account}</strong> }}
             />
           </Text>
         </HStack>
diff --git a/app/soapbox/features/ui/components/modals/mute-modal.tsx b/app/soapbox/features/ui/components/modals/mute-modal.tsx
index 5c8dd603e..90f32ec35 100644
--- a/app/soapbox/features/ui/components/modals/mute-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/mute-modal.tsx
@@ -60,7 +60,7 @@ const MuteModal = () => {
           <FormattedMessage
             id='confirmations.mute.message'
             defaultMessage='Are you sure you want to mute {name}?'
-            values={{ name: <strong>@{account.acct}</strong> }}
+            values={{ name: <strong className='break-words'>@{account.acct}</strong> }}
           />
         </Text>
 

From a065df0941a959e8810000896b5e694e15136f41 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:32:31 -0500
Subject: [PATCH 226/298] ReplyIndicator: use Markup component, horizontal
 scrolling of code blocks, etc

---
 .../features/compose/components/reply-indicator.tsx        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/compose/components/reply-indicator.tsx b/app/soapbox/features/compose/components/reply-indicator.tsx
index a7b762778..fdc7c359b 100644
--- a/app/soapbox/features/compose/components/reply-indicator.tsx
+++ b/app/soapbox/features/compose/components/reply-indicator.tsx
@@ -2,7 +2,8 @@ import clsx from 'clsx';
 import React from 'react';
 
 import AttachmentThumbs from 'soapbox/components/attachment-thumbs';
-import { Stack, Text } from 'soapbox/components/ui';
+import Markup from 'soapbox/components/markup';
+import { Stack } from 'soapbox/components/ui';
 import AccountContainer from 'soapbox/containers/account-container';
 import { isRtl } from 'soapbox/rtl';
 
@@ -45,8 +46,8 @@ const ReplyIndicator: React.FC<IReplyIndicator> = ({ className, status, hideActi
         hideActions={hideActions}
       />
 
-      <Text
-        className='status__content break-words'
+      <Markup
+        className='break-words'
         size='sm'
         dangerouslySetInnerHTML={{ __html: status.contentHtml }}
         direction={isRtl(status.search_index) ? 'rtl' : 'ltr'}

From 61283a81799681eb32a2b1d74738793304b178ab Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:33:55 -0500
Subject: [PATCH 227/298] CHANGELOG: overflow fixes

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b27bae103..9932eeb1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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.
 
 ## [3.2.0] - 2023-02-15
 

From 7aac5ccc3404b63291bf5eb544114f6645477110 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 13:38:47 -0500
Subject: [PATCH 228/298] Add support for Ditto

---
 CHANGELOG.md                  | 1 +
 app/soapbox/utils/features.ts | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9932eeb1f..f83896efc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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.
 - Posts: Support dislikes on Friendica.
 - UI: added a character counter to some textareas.
 
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 9c5a68bda..04749b5db 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -16,6 +16,12 @@ const overrides = custom('features');
 /** Truthy array convenience function */
 const any = (arr: Array<any>): boolean => arr.some(Boolean);
 
+/**
+ * Ditto, a Nostr server with Mastodon API.
+ * @see {@link https://gitlab.com/soapbox-pub/ditto}
+ */
+export const DITTO = 'Ditto';
+
 /**
  * Friendica, decentralized social platform implementing multiple federation protocols.
  * @see {@link https://friendi.ca/}
@@ -137,6 +143,7 @@ const getInstanceFeatures = (instance: Instance) => {
       v.software === PLEROMA && gte(v.version, '2.4.50'),
       v.software === TAKAHE && gte(v.version, '0.6.1'),
       v.software === TRUTHSOCIAL,
+      v.software === DITTO,
     ]),
 
     /**

From c1922900ab2aded77eafe9d60def41c3323af568 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 14:23:04 -0500
Subject: [PATCH 229/298] asdf: nodejs 20.0.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index ab43e6ab2..6de89a83a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-nodejs 18.14.0
+nodejs 20.0.0

From 6b68388d64eb92140be500dd668f4c706cdf85e1 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 14:23:25 -0500
Subject: [PATCH 230/298] Upgrade eslint-plugin-jsdoc for Node 20 support

---
 package.json |  2 +-
 yarn.lock    | 54 +++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index ddd13f24a..a63b469fb 100644
--- a/package.json
+++ b/package.json
@@ -219,7 +219,7 @@
     "eslint": "^8.0.0",
     "eslint-plugin-compat": "^4.0.2",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsdoc": "^40.0.0",
+    "eslint-plugin-jsdoc": "^43.1.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-react": "^7.25.1",
diff --git a/yarn.lock b/yarn.lock
index 5220b11d1..0750088a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1708,14 +1708,14 @@
   resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.1.2.tgz#777c976f8f143df47cbb23a7077c9ca9fe5fc513"
   integrity sha512-1HP8BxD2azjqWJvxIaWAMyTySeZY0Osr83ukYjltPVkNXeJvTz7yDrPLBtnrD5uqJ3tg4CcLuuBW09wahqL/fg==
 
-"@es-joy/jsdoccomment@~0.36.1":
-  version "0.36.1"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz#c37db40da36e4b848da5fd427a74bae3b004a30f"
-  integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
+"@es-joy/jsdoccomment@~0.37.1":
+  version "0.37.1"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz#fa32a41ba12097452693343e09ad4d26d157aedd"
+  integrity sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==
   dependencies:
     comment-parser "1.3.1"
-    esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~3.1.0"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
 "@eslint/eslintrc@^1.4.1":
   version "1.4.1"
@@ -5359,6 +5359,11 @@ aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
 are-we-there-yet@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
@@ -8297,17 +8302,18 @@ eslint-plugin-import@^2.25.4:
     resolve "^1.20.0"
     tsconfig-paths "^3.12.0"
 
-eslint-plugin-jsdoc@^40.0.0:
-  version "40.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.0.1.tgz#5f028b4928d5c77f54bfd3c42c00acb61d27bb9f"
-  integrity sha512-KkiRInury7YrjjV5aCHDxwsPy6XFt5p2b2CnpDMITnWs8patNPf5kj24+VXIWw45kP6z/B0GOKfrYczB56OjQQ==
+eslint-plugin-jsdoc@^43.1.1:
+  version "43.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-43.1.1.tgz#fc72ba21597cc99b1a0dc988aebb9bb57d0ec492"
+  integrity sha512-J2kjjsJ5vBXSyNzqJhceeSGTAgVgZHcPSJKo3vD4tNjUdfky98rR2VfZUDsS1GKL6isyVa8GWvr+Az7Vyg2HXA==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.36.1"
+    "@es-joy/jsdoccomment" "~0.37.1"
+    are-docs-informative "^0.0.2"
     comment-parser "1.3.1"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
-    semver "^7.3.8"
+    esquery "^1.5.0"
+    semver "^7.5.0"
     spdx-expression-parse "^3.0.1"
 
 eslint-plugin-jsx-a11y@^6.4.1:
@@ -8471,6 +8477,13 @@ esquery@^1.4.0:
   dependencies:
     estraverse "^5.1.0"
 
+esquery@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.1.0, esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -11523,10 +11536,10 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdoc-type-pratt-parser@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e"
-  integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
 jsdom@^20.0.0:
   version "20.0.3"
@@ -15577,6 +15590,13 @@ semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
+  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"

From 19b77db295edf9fc627eba271cf52ed59ba46a51 Mon Sep 17 00:00:00 2001
From: Soapbox Bot <soapbox+bot@alexgleason.me>
Date: Tue, 2 May 2023 20:06:31 +0000
Subject: [PATCH 231/298] fix(deps): update dependency @floating-ui/react to
 ^0.24.0

---
 package.json |  2 +-
 yarn.lock    | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index a63b469fb..99b79a449 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@babel/runtime": "^7.20.13",
     "@emoji-mart/data": "^1.1.2",
-    "@floating-ui/react": "^0.23.0",
+    "@floating-ui/react": "^0.24.0",
     "@fontsource/inter": "^4.5.1",
     "@fontsource/roboto-mono": "^4.5.8",
     "@gamestdio/websocket": "^0.3.2",
diff --git a/yarn.lock b/yarn.lock
index 0750088a0..c7e6e38e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1732,31 +1732,31 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@floating-ui/core@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.2.tgz#66f62cf1b7de2ed23a09c101808536e68caffaec"
-  integrity sha512-FaO9KVLFnxknZaGWGmNtjD2CVFuc0u4yeGEofoyXO2wgRA7fLtkngT6UB0vtWQWuhH3iMTZZ/Y89CMeyGfn8pA==
+"@floating-ui/core@^1.2.6":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.6.tgz#d21ace437cc919cdd8f1640302fa8851e65e75c0"
+  integrity sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg==
 
-"@floating-ui/dom@^1.2.1":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.3.tgz#8dc6fbf799fbb5c29f705b54bdd51f3ab0ee03a2"
-  integrity sha512-lK9cZUrHSJLMVAdCvDqs6Ug8gr0wmqksYiaoj/bxj2gweRQkSuhg2/V6Jswz2KiQ0RAULbqw1oQDJIMpQ5GfGA==
+"@floating-ui/dom@^1.2.7":
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.7.tgz#c123e4db014b07b97e996cd459245fa217049c6b"
+  integrity sha512-DyqylONj1ZaBnzj+uBnVfzdjjCkFCL2aA9ESHLyUOGSqb03RpbLMImP1ekIQXYs4KLk9jAjJfZAU8hXfWSahEg==
   dependencies:
-    "@floating-ui/core" "^1.2.2"
+    "@floating-ui/core" "^1.2.6"
 
-"@floating-ui/react-dom@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-1.3.0.tgz#4d35d416eb19811c2b0e9271100a6aa18c1579b3"
-  integrity sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==
+"@floating-ui/react-dom@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.0.tgz#7514baac526c818892bbcc84e1c3115008c029f9"
+  integrity sha512-Ke0oU3SeuABC2C4OFu2mSAwHIP5WUiV98O9YWoHV4Q5aT6E9k06DV0Khi5uYspR8xmmBk08t8ZDcz3TR3ARkEg==
   dependencies:
-    "@floating-ui/dom" "^1.2.1"
+    "@floating-ui/dom" "^1.2.7"
 
-"@floating-ui/react@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.23.0.tgz#8b548235ac4478537757c90a66a3bac9068e29d8"
-  integrity sha512-Id9zTLSjHtcCjBQm0Stc/fRUBGrnHurL/a1HrtQg8LvL6Ciw9KHma2WT++F17kEfhsPkA0UHYxmp+ijmAy0TCw==
+"@floating-ui/react@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.24.0.tgz#d835f7041b9b4ed1b7daa83f33af412ae0c6c946"
+  integrity sha512-/UxcKFV5WtD+CbInbosDmUwVpcKlTTo6sVllSWMYXiX/HHXWeMxbcUNIkilsj5EDlbKiw7nHQtHYHYQLQMsVdQ==
   dependencies:
-    "@floating-ui/react-dom" "^1.3.0"
+    "@floating-ui/react-dom" "^2.0.0"
     aria-hidden "^1.1.3"
     tabbable "^6.0.1"
 

From c61368821a4b4d77916142256d6c8381a5479013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Tue, 2 May 2023 23:33:53 +0200
Subject: [PATCH 232/298] Use ListItem for 'Follow hashtag' setting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/components/ui/column/column.tsx   |  6 ++++--
 .../features/hashtag-timeline/index.tsx       | 21 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx
index 8813b107b..8d7c2da39 100644
--- a/app/soapbox/components/ui/column/column.tsx
+++ b/app/soapbox/components/ui/column/column.tsx
@@ -51,6 +51,8 @@ export interface IColumn {
   withHeader?: boolean
   /** Extra class name for top <div> element. */
   className?: string
+  /** Extra class name for the <CardBody> element. */
+  bodyClassName?: string
   /** Ref forwarded to column. */
   ref?: React.Ref<HTMLDivElement>
   /** Children to display in the column. */
@@ -63,7 +65,7 @@ export interface IColumn {
 
 /** A backdrop for the main section of the UI. */
 const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedRef<HTMLDivElement>): JSX.Element => {
-  const { backHref, children, label, transparent = false, withHeader = true, className, action, size } = props;
+  const { backHref, children, label, transparent = false, withHeader = true, className, bodyClassName, action, size } = props;
   const soapboxConfig = useSoapboxConfig();
   const [isScrolled, setIsScrolled] = useState(false);
 
@@ -109,7 +111,7 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
           />
         )}
 
-        <CardBody>
+        <CardBody className={bodyClassName}>
           {children}
         </CardBody>
       </Card>
diff --git a/app/soapbox/features/hashtag-timeline/index.tsx b/app/soapbox/features/hashtag-timeline/index.tsx
index 960b699df..e448bef8a 100644
--- a/app/soapbox/features/hashtag-timeline/index.tsx
+++ b/app/soapbox/features/hashtag-timeline/index.tsx
@@ -1,10 +1,11 @@
 import React, { useEffect, useRef } from 'react';
-import { useIntl, defineMessages } from 'react-intl';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
 import { connectHashtagStream } from 'soapbox/actions/streaming';
 import { fetchHashtag, followHashtag, unfollowHashtag } from 'soapbox/actions/tags';
 import { expandHashtagTimeline, clearTimeline } from 'soapbox/actions/timelines';
-import { Column } from 'soapbox/components/ui';
+import List, { ListItem } from 'soapbox/components/list';
+import { Column, Toggle } from 'soapbox/components/ui';
 import Timeline from 'soapbox/features/ui/components/timeline';
 import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
 
@@ -19,8 +20,6 @@ const messages = defineMessages({
   any: { id: 'hashtag.column_header.tag_mode.any', defaultMessage: 'or {additional}' },
   all: { id: 'hashtag.column_header.tag_mode.all', defaultMessage: 'and {additional}' },
   none: { id: 'hashtag.column_header.tag_mode.none', defaultMessage: 'without {additional}' },
-  followHashtag: { id: 'hashtag.follow', defaultMessage: 'Follow hashtag' },
-  unfollowHashtag: { id: 'hashtag.unfollow', defaultMessage: 'Unfollow hashtag' },
   empty: { id: 'empty_column.hashtag', defaultMessage: 'There is nothing in this hashtag yet.' },
 });
 
@@ -119,7 +118,19 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   }, [id]);
 
   return (
-    <Column label={title()} transparent>
+    <Column bodyClassName='space-y-3' label={title()} transparent>
+      {features.followHashtags && (
+        <List>
+          <ListItem
+            label={<FormattedMessage id='hashtag.follow' defaultMessage='Follow hashtag' />}
+          >
+            <Toggle
+              checked={tag?.following}
+              onChange={handleFollow}
+            />
+          </ListItem>
+        </List>
+      )}
       <Timeline
         scrollKey='hashtag_timeline'
         timelineId={`hashtag:${id}`}

From 7e3ab33dc52c474dbef234854f890166d32408db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Tue, 2 May 2023 23:34:46 +0200
Subject: [PATCH 233/298] Follow hashtags: Support Akkoma
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/utils/features.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 04e5cc6e8..9fd16017d 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -491,7 +491,10 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see POST /api/v1/tags/:name/follow
      * @see POST /api/v1/tags/:name/unfollow
      */
-    followHashtags: v.software === MASTODON && gte(v.compatVersion, '4.0.0'),
+    followHashtags: any([
+      v.software === MASTODON && gte(v.compatVersion, '4.0.0'),
+      v.software === PLEROMA && v.build === AKKOMA,
+    ]),
 
     /**
      * Ability to lock accounts and manually approve followers.

From 610864d5a9b5fbbb858ce7f307c74ab594204adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 3 May 2023 00:21:53 +0200
Subject: [PATCH 234/298] Add followed tags list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/features/followed_tags/index.tsx | 52 ++++++++++++++++++++
 app/soapbox/reducers/followed_tags.ts        | 47 ++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 app/soapbox/features/followed_tags/index.tsx
 create mode 100644 app/soapbox/reducers/followed_tags.ts

diff --git a/app/soapbox/features/followed_tags/index.tsx b/app/soapbox/features/followed_tags/index.tsx
new file mode 100644
index 000000000..6745f5fc0
--- /dev/null
+++ b/app/soapbox/features/followed_tags/index.tsx
@@ -0,0 +1,52 @@
+import debounce from 'lodash/debounce';
+import React, { useEffect } from 'react';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { fetchFollowedHashtags, expandFollowedHashtags } from 'soapbox/actions/tags';
+import Hashtag from 'soapbox/components/hashtag';
+import ScrollableList from 'soapbox/components/scrollable-list';
+import { Column } from 'soapbox/components/ui';
+import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder-hashtag';
+import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
+
+const messages = defineMessages({
+  heading: { id: 'column.followed_tags', defaultMessage: 'Followed hashtags' },
+});
+
+const handleLoadMore = debounce((dispatch) => {
+  dispatch(expandFollowedHashtags());
+}, 300, { leading: true });
+
+const FollowedTags = () => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  useEffect(() => {
+    dispatch(fetchFollowedHashtags());
+  }, []);
+
+  const tags = useAppSelector((state => state.followed_tags.items));
+  const isLoading = useAppSelector((state => state.followed_tags.isLoading));
+  const hasMore = useAppSelector((state => !!state.followed_tags.next));
+
+  const emptyMessage = <FormattedMessage id='empty_column.followed_tags' defaultMessage="You haven't followed any hashtag yet." />;
+
+  return (
+    <Column label={intl.formatMessage(messages.heading)}>
+      <ScrollableList
+        scrollKey='followed_tags'
+        emptyMessage={emptyMessage}
+        isLoading={isLoading}
+        hasMore={hasMore}
+        onLoadMore={() => handleLoadMore(dispatch)}
+        placeholderComponent={PlaceholderHashtag}
+        placeholderCount={5}
+        itemClassName='pb-3'
+      >
+        {tags.map(tag => <Hashtag key={tag.name} hashtag={tag} />)}
+      </ScrollableList>
+    </Column>
+  );
+};
+
+export default FollowedTags;
diff --git a/app/soapbox/reducers/followed_tags.ts b/app/soapbox/reducers/followed_tags.ts
new file mode 100644
index 000000000..4f30a3f3a
--- /dev/null
+++ b/app/soapbox/reducers/followed_tags.ts
@@ -0,0 +1,47 @@
+import { List as ImmutableList, Record as ImmutableRecord } from 'immutable';
+
+import {
+  FOLLOWED_HASHTAGS_FETCH_REQUEST,
+  FOLLOWED_HASHTAGS_FETCH_SUCCESS,
+  FOLLOWED_HASHTAGS_FETCH_FAIL,
+  FOLLOWED_HASHTAGS_EXPAND_REQUEST,
+  FOLLOWED_HASHTAGS_EXPAND_SUCCESS,
+  FOLLOWED_HASHTAGS_EXPAND_FAIL,
+} from 'soapbox/actions/tags';
+import { normalizeTag } from 'soapbox/normalizers';
+
+import type { AnyAction } from 'redux';
+import type { APIEntity, Tag } from 'soapbox/types/entities';
+
+const ReducerRecord = ImmutableRecord({
+  items: ImmutableList<Tag>(),
+  isLoading: false,
+  next: null,
+});
+
+export default function followed_tags(state = ReducerRecord(), action: AnyAction) {
+  switch (action.type) {
+    case FOLLOWED_HASHTAGS_FETCH_REQUEST:
+      return state.set('isLoading', true);
+    case FOLLOWED_HASHTAGS_FETCH_SUCCESS:
+      return state.withMutations(map => {
+        map.set('items', ImmutableList(action.followed_tags.map((item: APIEntity) => normalizeTag(item))));
+        map.set('isLoading', false);
+        map.set('next', action.next);
+      });
+    case FOLLOWED_HASHTAGS_FETCH_FAIL:
+      return state.set('isLoading', false);
+    case FOLLOWED_HASHTAGS_EXPAND_REQUEST:
+      return state.set('isLoading', true);
+    case FOLLOWED_HASHTAGS_EXPAND_SUCCESS:
+      return state.withMutations(map => {
+        map.update('items', list => list.concat(action.followed_tags.map((item: APIEntity) => normalizeTag(item))));
+        map.set('isLoading', false);
+        map.set('next', action.next);
+      });
+    case FOLLOWED_HASHTAGS_EXPAND_FAIL:
+      return state.set('isLoading', false);
+    default:
+      return state;
+  }
+}

From 586f536329e31e9a3bd8429f952bfa64184d4668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 3 May 2023 00:26:29 +0200
Subject: [PATCH 235/298] Update changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 CHANGELOG.md                | 4 +---
 app/soapbox/locales/en.json | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47e5b2de2..179bee42b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-- Admin: redirect the homepage to any URL.
-- Compatibility: added compatibility with Friendica.
-- Hashtags: let users follow hashtags (Mastodon).
+- 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.
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 7f2cfadd5..0576f8576 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -673,6 +673,7 @@
   "empty_column.filters": "You haven't created any muted words yet.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.followed_tags": "You haven't followed any hashtag yet.",
   "empty_column.group": "There are no posts in this group yet.",
   "empty_column.group_blocks": "The group hasn't banned any users yet.",
   "empty_column.group_membership_requests": "There are no pending membership requests for this group.",

From 741da9208466d3c8f9a18b03de745b655fe76034 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 17:47:19 -0500
Subject: [PATCH 236/298] Card: normalize with zod

---
 app/soapbox/normalizers/card.ts       | 97 ++++++---------------------
 app/soapbox/normalizers/index.ts      |  2 +-
 app/soapbox/normalizers/soapbox/ad.ts |  6 +-
 app/soapbox/normalizers/status.ts     |  9 +--
 app/soapbox/schemas/card.ts           | 69 +++++++++++++++++++
 app/soapbox/schemas/index.ts          |  1 +
 app/soapbox/types/entities.ts         |  4 +-
 7 files changed, 100 insertions(+), 88 deletions(-)
 create mode 100644 app/soapbox/schemas/card.ts

diff --git a/app/soapbox/normalizers/card.ts b/app/soapbox/normalizers/card.ts
index 5d0af42cf..c29a0c40b 100644
--- a/app/soapbox/normalizers/card.ts
+++ b/app/soapbox/normalizers/card.ts
@@ -1,82 +1,25 @@
-/**
- * Card normalizer:
- * Converts API cards into our internal format.
- * @see {@link https://docs.joinmastodon.org/entities/card/}
- */
-import punycode from 'punycode';
+import { cardSchema, type Card } from 'soapbox/schemas/card';
 
-import { Record as ImmutableRecord, Map as ImmutableMap, fromJS } from 'immutable';
-
-import { groupSchema, type Group } from 'soapbox/schemas';
-import { mergeDefined } from 'soapbox/utils/normalizers';
-
-// https://docs.joinmastodon.org/entities/card/
-export const CardRecord = ImmutableRecord({
-  author_name: '',
-  author_url: '',
-  blurhash: null as string | null,
-  description: '',
-  embed_url: '',
-  group: null as null | Group,
-  height: 0,
-  html: '',
-  image: null as string | null,
-  provider_name: '',
-  provider_url: '',
-  title: '',
-  type: 'link',
-  url: '',
-  width: 0,
-});
-
-const IDNA_PREFIX = 'xn--';
-
-const decodeIDNA = (domain: string): string => {
-  return domain
-    .split('.')
-    .map(part => part.indexOf(IDNA_PREFIX) === 0 ? punycode.decode(part.slice(IDNA_PREFIX.length)) : part)
-    .join('.');
-};
-
-const getHostname = (url: string): string => {
-  const parser = document.createElement('a');
-  parser.href = url;
-  return parser.hostname;
-};
-
-/** Fall back to Pleroma's OG data */
-const normalizePleromaOpengraph = (card: ImmutableMap<string, any>) => {
-  const opengraph = ImmutableMap({
-    width:  card.getIn(['pleroma', 'opengraph', 'width']),
-    height: card.getIn(['pleroma', 'opengraph', 'height']),
-    html:   card.getIn(['pleroma', 'opengraph', 'html']),
-    image:  card.getIn(['pleroma', 'opengraph', 'thumbnail_url']),
-  });
-
-  return card.mergeWith(mergeDefined, opengraph);
-};
-
-/** Set provider from URL if not found */
-const normalizeProviderName = (card: ImmutableMap<string, any>) => {
-  const providerName = card.get('provider_name') || decodeIDNA(getHostname(card.get('url')));
-  return card.set('provider_name', providerName);
-};
-
-const normalizeGroup = (card: ImmutableMap<string, any>) => {
+export const normalizeCard = (card: unknown): Card => {
   try {
-    const group = groupSchema.parse(card.get('group').toJS());
-    return card.set('group', group);
+    return cardSchema.parse(card);
   } catch (_e) {
-    return card.set('group', null);
+    return {
+      author_name: '',
+      author_url: '',
+      blurhash: null,
+      description: '',
+      embed_url: '',
+      group: null,
+      height: 0,
+      html: '',
+      image: null,
+      provider_name: '',
+      provider_url: '',
+      title: '',
+      type: 'link',
+      url: '',
+      width: 0,
+    };
   }
 };
-
-export const normalizeCard = (card: Record<string, any>) => {
-  return CardRecord(
-    ImmutableMap(fromJS(card)).withMutations(card => {
-      normalizePleromaOpengraph(card);
-      normalizeProviderName(card);
-      normalizeGroup(card);
-    }),
-  );
-};
diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts
index 004049988..7f1d76a01 100644
--- a/app/soapbox/normalizers/index.ts
+++ b/app/soapbox/normalizers/index.ts
@@ -4,7 +4,7 @@ export { AdminReportRecord, normalizeAdminReport } from './admin-report';
 export { AnnouncementRecord, normalizeAnnouncement } from './announcement';
 export { AnnouncementReactionRecord, normalizeAnnouncementReaction } from './announcement-reaction';
 export { AttachmentRecord, normalizeAttachment } from './attachment';
-export { CardRecord, normalizeCard } from './card';
+export { normalizeCard } from './card';
 export { ChatRecord, normalizeChat } from './chat';
 export { ChatMessageRecord, normalizeChatMessage } from './chat-message';
 export { EmojiRecord, normalizeEmoji } from './emoji';
diff --git a/app/soapbox/normalizers/soapbox/ad.ts b/app/soapbox/normalizers/soapbox/ad.ts
index 85dbcc8c6..10ae96d60 100644
--- a/app/soapbox/normalizers/soapbox/ad.ts
+++ b/app/soapbox/normalizers/soapbox/ad.ts
@@ -4,12 +4,12 @@ import {
   fromJS,
 } from 'immutable';
 
-import { CardRecord, normalizeCard } from '../card';
+import { normalizeCard } from '../card';
 
 import type { Ad } from 'soapbox/features/ads/providers';
 
 export const AdRecord = ImmutableRecord<Ad>({
-  card: CardRecord(),
+  card: normalizeCard({}),
   impression: undefined as string | undefined,
   expires_at: undefined as string | undefined,
   reason: undefined as string | undefined,
@@ -18,7 +18,7 @@ export const AdRecord = ImmutableRecord<Ad>({
 /** Normalizes an ad from Soapbox Config. */
 export const normalizeAd = (ad: Record<string, any>) => {
   const map = ImmutableMap<string, any>(fromJS(ad));
-  const card = normalizeCard(map.get('card'));
+  const card = normalizeCard(map.get('card').toJS());
   const expiresAt = map.get('expires_at') || map.get('expires');
 
   return AdRecord(map.merge({
diff --git a/app/soapbox/normalizers/status.ts b/app/soapbox/normalizers/status.ts
index 7a71f24a8..64a00b316 100644
--- a/app/soapbox/normalizers/status.ts
+++ b/app/soapbox/normalizers/status.ts
@@ -11,10 +11,10 @@ import {
 } from 'immutable';
 
 import { normalizeAttachment } from 'soapbox/normalizers/attachment';
-import { normalizeCard } from 'soapbox/normalizers/card';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
 import { normalizeMention } from 'soapbox/normalizers/mention';
 import { normalizePoll } from 'soapbox/normalizers/poll';
+import { cardSchema } from 'soapbox/schemas/card';
 
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity } from 'soapbox/types/entities';
@@ -118,9 +118,10 @@ const normalizeStatusPoll = (status: ImmutableMap<string, any>) => {
 
 // Normalize card
 const normalizeStatusCard = (status: ImmutableMap<string, any>) => {
-  if (status.get('card')) {
-    return status.update('card', ImmutableMap(), normalizeCard);
-  } else {
+  try {
+    const card = cardSchema.parse(status.get('card').toJS());
+    return status.set('card', card);
+  } catch (e) {
     return status.set('card', null);
   }
 };
diff --git a/app/soapbox/schemas/card.ts b/app/soapbox/schemas/card.ts
new file mode 100644
index 000000000..c3826fa1d
--- /dev/null
+++ b/app/soapbox/schemas/card.ts
@@ -0,0 +1,69 @@
+import punycode from 'punycode';
+
+import { z } from 'zod';
+
+import { groupSchema } from './group';
+
+const IDNA_PREFIX = 'xn--';
+
+/**
+ * Card (aka link preview).
+ * https://docs.joinmastodon.org/entities/card/
+ */
+const cardSchema = z.object({
+  author_name: z.string().catch(''),
+  author_url: z.string().url().catch(''),
+  blurhash: z.string().nullable().catch(null),
+  description: z.string().catch(''),
+  embed_url: z.string().url().catch(''),
+  group: groupSchema.nullable().catch(null), // TruthSocial
+  height: z.number().catch(0),
+  html: z.string().catch(''),
+  image: z.string().nullable().catch(null),
+  pleroma: z.object({
+    opengraph: z.object({
+      width: z.number(),
+      height: z.number(),
+      html: z.string(),
+      thumbnail_url: z.string().url(),
+    }).optional().catch(undefined),
+  }).optional().catch(undefined),
+  provider_name: z.string().catch(''),
+  provider_url: z.string().url().catch(''),
+  title: z.string().catch(''),
+  type: z.enum(['link', 'photo', 'video', 'rich']).catch('link'),
+  url: z.string().url(),
+  width: z.number().catch(0),
+}).transform((card) => {
+  if (!card.provider_name) {
+    card.provider_name = decodeIDNA(new URL(card.url).hostname);
+  }
+
+  if (card.pleroma?.opengraph) {
+    if (!card.width && !card.height) {
+      card.width = card.pleroma.opengraph.width;
+      card.height = card.pleroma.opengraph.height;
+    }
+
+    if (!card.html) {
+      card.html = card.pleroma.opengraph.html;
+    }
+
+    if (!card.image) {
+      card.image = card.pleroma.opengraph.thumbnail_url;
+    }
+  }
+
+  return card;
+});
+
+const decodeIDNA = (domain: string): string => {
+  return domain
+    .split('.')
+    .map(part => part.indexOf(IDNA_PREFIX) === 0 ? punycode.decode(part.slice(IDNA_PREFIX.length)) : part)
+    .join('.');
+};
+
+type Card = z.infer<typeof cardSchema>;
+
+export { cardSchema, type Card };
\ No newline at end of file
diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index a675b52d2..23f6067c8 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -13,6 +13,7 @@ export { relationshipSchema } from './relationship';
  * Entity Types
  */
 export type { Account } from './account';
+export type { Card } from './card';
 export type { CustomEmoji } from './custom-emoji';
 export type { Group } from './group';
 export type { GroupMember } from './group-member';
diff --git a/app/soapbox/types/entities.ts b/app/soapbox/types/entities.ts
index c4d8907c5..ebbdd197d 100644
--- a/app/soapbox/types/entities.ts
+++ b/app/soapbox/types/entities.ts
@@ -5,7 +5,6 @@ import {
   AnnouncementRecord,
   AnnouncementReactionRecord,
   AttachmentRecord,
-  CardRecord,
   ChatRecord,
   ChatMessageRecord,
   EmojiRecord,
@@ -37,7 +36,6 @@ type AdminReport = ReturnType<typeof AdminReportRecord>;
 type Announcement = ReturnType<typeof AnnouncementRecord>;
 type AnnouncementReaction = ReturnType<typeof AnnouncementReactionRecord>;
 type Attachment = ReturnType<typeof AttachmentRecord>;
-type Card = ReturnType<typeof CardRecord>;
 type Chat = ReturnType<typeof ChatRecord>;
 type ChatMessage = ReturnType<typeof ChatMessageRecord>;
 type Emoji = ReturnType<typeof EmojiRecord>;
@@ -82,7 +80,6 @@ export {
   Announcement,
   AnnouncementReaction,
   Attachment,
-  Card,
   Chat,
   ChatMessage,
   Emoji,
@@ -110,6 +107,7 @@ export {
 };
 
 export type {
+  Card,
   Group,
   GroupMember,
   GroupRelationship,

From 81de7c268eec7d1c86e6c78d86594f4387cca346 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 17:56:25 -0500
Subject: [PATCH 237/298] Refactor ad providers to not use normalizeCard

---
 app/soapbox/features/ads/providers/index.ts  |  1 -
 app/soapbox/features/ads/providers/rumble.ts | 58 --------------------
 app/soapbox/features/ads/providers/truth.ts  | 26 ++++-----
 3 files changed, 12 insertions(+), 73 deletions(-)
 delete mode 100644 app/soapbox/features/ads/providers/rumble.ts

diff --git a/app/soapbox/features/ads/providers/index.ts b/app/soapbox/features/ads/providers/index.ts
index 8ff7d5219..63067b81d 100644
--- a/app/soapbox/features/ads/providers/index.ts
+++ b/app/soapbox/features/ads/providers/index.ts
@@ -6,7 +6,6 @@ import type { Card } from 'soapbox/types/entities';
 /** Map of available provider modules. */
 const PROVIDERS: Record<string, () => Promise<AdProvider>> = {
   soapbox: async() => (await import(/* webpackChunkName: "features/ads/soapbox" */'./soapbox-config')).default,
-  rumble: async() => (await import(/* webpackChunkName: "features/ads/rumble" */'./rumble')).default,
   truth: async() => (await import(/* webpackChunkName: "features/ads/truth" */'./truth')).default,
 };
 
diff --git a/app/soapbox/features/ads/providers/rumble.ts b/app/soapbox/features/ads/providers/rumble.ts
deleted file mode 100644
index 21dc6e7f3..000000000
--- a/app/soapbox/features/ads/providers/rumble.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import axios from 'axios';
-
-import { getSettings } from 'soapbox/actions/settings';
-import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import { normalizeAd, normalizeCard } from 'soapbox/normalizers';
-
-import type { AdProvider } from '.';
-
-/** Rumble ad API entity. */
-interface RumbleAd {
-  type: number
-  impression: string
-  click: string
-  asset: string
-  expires: number
-}
-
-/** Response from Rumble ad server. */
-interface RumbleApiResponse {
-  count: number
-  ads: RumbleAd[]
-}
-
-/** Provides ads from Soapbox Config. */
-const RumbleAdProvider: AdProvider = {
-  getAds: async(getState) => {
-    const state = getState();
-    const settings = getSettings(state);
-    const soapboxConfig = getSoapboxConfig(state);
-    const endpoint = soapboxConfig.extensions.getIn(['ads', 'endpoint']) as string | undefined;
-
-    if (endpoint) {
-      try {
-        const { data } = await axios.get<RumbleApiResponse>(endpoint, {
-          headers: {
-            'Accept-Language': settings.get('locale', '*') as string,
-          },
-        });
-
-        return data.ads.map(item => normalizeAd({
-          impression: item.impression,
-          card: normalizeCard({
-            type: item.type === 1 ? 'link' : 'rich',
-            image: item.asset,
-            url: item.click,
-          }),
-          expires_at: new Date(item.expires * 1000),
-        }));
-      } catch (e) {
-        // do nothing
-      }
-    }
-
-    return [];
-  },
-};
-
-export default RumbleAdProvider;
diff --git a/app/soapbox/features/ads/providers/truth.ts b/app/soapbox/features/ads/providers/truth.ts
index 9207db522..5582bd3cf 100644
--- a/app/soapbox/features/ads/providers/truth.ts
+++ b/app/soapbox/features/ads/providers/truth.ts
@@ -1,18 +1,19 @@
 import axios from 'axios';
+import { z } from 'zod';
 
 import { getSettings } from 'soapbox/actions/settings';
-import { normalizeCard } from 'soapbox/normalizers';
+import { cardSchema } from 'soapbox/schemas/card';
+import { filteredArray } from 'soapbox/schemas/utils';
 
 import type { AdProvider } from '.';
-import type { Card } from 'soapbox/types/entities';
 
 /** TruthSocial ad API entity. */
-interface TruthAd {
-  impression: string
-  card: Card
-  expires_at: string
-  reason: string
-}
+const truthAdSchema = z.object({
+  impression: z.string(),
+  card: cardSchema,
+  expires_at: z.string(),
+  reason: z.string().catch(''),
+});
 
 /** Provides ads from the TruthSocial API. */
 const TruthAdProvider: AdProvider = {
@@ -21,16 +22,13 @@ const TruthAdProvider: AdProvider = {
     const settings = getSettings(state);
 
     try {
-      const { data } = await axios.get<TruthAd[]>('/api/v2/truth/ads?device=desktop', {
+      const { data } = await axios.get('/api/v2/truth/ads?device=desktop', {
         headers: {
-          'Accept-Language': settings.get('locale', '*') as string,
+          'Accept-Language': z.string().catch('*').parse(settings.get('locale')),
         },
       });
 
-      return data.map(item => ({
-        ...item,
-        card: normalizeCard(item.card),
-      }));
+      return filteredArray(truthAdSchema).parse(data);
     } catch (e) {
       // do nothing
     }

From 54d8d120549598f0d8b693142571dec7fb2baa6a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 18:30:21 -0500
Subject: [PATCH 238/298] Remove normalizeAd

---
 app/soapbox/actions/importer/index.ts         |  2 +-
 .../__tests__/group-action-button.test.tsx    |  7 +++--
 .../__tests__/group-options-button.test.tsx   |  2 +-
 app/soapbox/jest/factory.ts                   | 24 +++++++++++---
 app/soapbox/normalizers/index.ts              |  1 -
 app/soapbox/normalizers/soapbox/ad.ts         | 28 -----------------
 .../normalizers/soapbox/soapbox-config.ts     | 12 ++++---
 app/soapbox/queries/ads.ts                    |  7 +++--
 app/soapbox/schemas/account.ts                |  2 +-
 app/soapbox/schemas/group.ts                  |  2 +-
 app/soapbox/schemas/index.ts                  | 31 ++++++-------------
 app/soapbox/schemas/soapbox/ad.ts             | 14 +++++++++
 app/soapbox/schemas/utils.ts                  |  2 +-
 app/soapbox/types/soapbox.ts                  |  7 +++--
 app/soapbox/utils/__tests__/ads.test.ts       | 10 +++---
 app/soapbox/utils/ads.ts                      |  2 +-
 16 files changed, 76 insertions(+), 77 deletions(-)
 delete mode 100644 app/soapbox/normalizers/soapbox/ad.ts
 create mode 100644 app/soapbox/schemas/soapbox/ad.ts

diff --git a/app/soapbox/actions/importer/index.ts b/app/soapbox/actions/importer/index.ts
index ec0ec3121..fc9ad63bd 100644
--- a/app/soapbox/actions/importer/index.ts
+++ b/app/soapbox/actions/importer/index.ts
@@ -74,7 +74,7 @@ const importFetchedGroup = (group: APIEntity) =>
   importFetchedGroups([group]);
 
 const importFetchedGroups = (groups: APIEntity[]) => {
-  const entities = filteredArray(groupSchema).catch([]).parse(groups);
+  const entities = filteredArray(groupSchema).parse(groups);
   return importGroups(entities);
 };
 
diff --git a/app/soapbox/features/group/components/__tests__/group-action-button.test.tsx b/app/soapbox/features/group/components/__tests__/group-action-button.test.tsx
index 6809ea009..a0df6affe 100644
--- a/app/soapbox/features/group/components/__tests__/group-action-button.test.tsx
+++ b/app/soapbox/features/group/components/__tests__/group-action-button.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import { buildGroup, buildGroupRelationship } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
+import { GroupRoles } from 'soapbox/schemas/group-member';
 import { Group } from 'soapbox/types/entities';
 
 import GroupActionButton from '../group-action-button';
@@ -45,7 +46,7 @@ describe('<GroupActionButton />', () => {
     beforeEach(() => {
       group = buildGroup({
         relationship: buildGroupRelationship({
-          member: null,
+          member: false,
         }),
       });
     });
@@ -98,7 +99,7 @@ describe('<GroupActionButton />', () => {
         relationship: buildGroupRelationship({
           requested: false,
           member: true,
-          role: 'owner',
+          role: GroupRoles.OWNER,
         }),
       });
     });
@@ -116,7 +117,7 @@ describe('<GroupActionButton />', () => {
         relationship: buildGroupRelationship({
           requested: false,
           member: true,
-          role: 'user',
+          role: GroupRoles.USER,
         }),
       });
     });
diff --git a/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx b/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx
index 8704b9351..e3171bb81 100644
--- a/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx
+++ b/app/soapbox/features/group/components/__tests__/group-options-button.test.tsx
@@ -17,7 +17,7 @@ describe('<GroupOptionsButton />', () => {
           requested: false,
           member: true,
           blocked_by: true,
-          role: 'user',
+          role: GroupRoles.USER,
         }),
       });
     });
diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index e5bdd796b..ca9f2b8f0 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -1,9 +1,13 @@
 import { v4 as uuidv4 } from 'uuid';
 
 import {
+  adSchema,
+  cardSchema,
   groupSchema,
   groupRelationshipSchema,
   groupTagSchema,
+  type Ad,
+  type Card,
   type Group,
   type GroupRelationship,
   type GroupTag,
@@ -12,22 +16,34 @@ import {
 // TODO: there's probably a better way to create these factory functions.
 // This looks promising but didn't work on my first attempt: https://github.com/anatine/zod-plugins/tree/main/packages/zod-mock
 
-function buildGroup(props: Record<string, any> = {}): Group {
+function buildCard(props: Partial<Card> = {}): Card {
+  return cardSchema.parse(Object.assign({
+    url: 'https://soapbox.test',
+  }, props));
+}
+
+function buildGroup(props: Partial<Group> = {}): Group {
   return groupSchema.parse(Object.assign({
     id: uuidv4(),
   }, props));
 }
 
-function buildGroupRelationship(props: Record<string, any> = {}): GroupRelationship {
+function buildGroupRelationship(props: Partial<GroupRelationship> = {}): GroupRelationship {
   return groupRelationshipSchema.parse(Object.assign({
     id: uuidv4(),
   }, props));
 }
 
-function buildGroupTag(props: Record<string, any> = {}): GroupTag {
+function buildGroupTag(props: Partial<GroupTag> = {}): GroupTag {
   return groupTagSchema.parse(Object.assign({
     id: uuidv4(),
   }, props));
 }
 
-export { buildGroup, buildGroupRelationship, buildGroupTag };
\ No newline at end of file
+function buildAd(props: Partial<Ad> = {}): Ad {
+  return adSchema.parse(Object.assign({
+    card: buildCard(),
+  }, props));
+}
+
+export { buildCard, buildGroup, buildGroupRelationship, buildGroupTag, buildAd };
\ No newline at end of file
diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts
index 7f1d76a01..42c075daf 100644
--- a/app/soapbox/normalizers/index.ts
+++ b/app/soapbox/normalizers/index.ts
@@ -26,5 +26,4 @@ export { StatusRecord, normalizeStatus } from './status';
 export { StatusEditRecord, normalizeStatusEdit } from './status-edit';
 export { TagRecord, normalizeTag } from './tag';
 
-export { AdRecord, normalizeAd } from './soapbox/ad';
 export { SoapboxConfigRecord, normalizeSoapboxConfig } from './soapbox/soapbox-config';
diff --git a/app/soapbox/normalizers/soapbox/ad.ts b/app/soapbox/normalizers/soapbox/ad.ts
deleted file mode 100644
index 10ae96d60..000000000
--- a/app/soapbox/normalizers/soapbox/ad.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import {
-  Map as ImmutableMap,
-  Record as ImmutableRecord,
-  fromJS,
-} from 'immutable';
-
-import { normalizeCard } from '../card';
-
-import type { Ad } from 'soapbox/features/ads/providers';
-
-export const AdRecord = ImmutableRecord<Ad>({
-  card: normalizeCard({}),
-  impression: undefined as string | undefined,
-  expires_at: undefined as string | undefined,
-  reason: undefined as string | undefined,
-});
-
-/** Normalizes an ad from Soapbox Config. */
-export const normalizeAd = (ad: Record<string, any>) => {
-  const map = ImmutableMap<string, any>(fromJS(ad));
-  const card = normalizeCard(map.get('card').toJS());
-  const expiresAt = map.get('expires_at') || map.get('expires');
-
-  return AdRecord(map.merge({
-    card,
-    expires_at: expiresAt,
-  }));
-};
diff --git a/app/soapbox/normalizers/soapbox/soapbox-config.ts b/app/soapbox/normalizers/soapbox/soapbox-config.ts
index 3b8b2ea91..f73111611 100644
--- a/app/soapbox/normalizers/soapbox/soapbox-config.ts
+++ b/app/soapbox/normalizers/soapbox/soapbox-config.ts
@@ -6,12 +6,12 @@ import {
 } from 'immutable';
 import trimStart from 'lodash/trimStart';
 
+import { adSchema } from 'soapbox/schemas';
+import { filteredArray } from 'soapbox/schemas/utils';
 import { normalizeUsername } from 'soapbox/utils/input';
 import { toTailwind } from 'soapbox/utils/tailwind';
 import { generateAccent } from 'soapbox/utils/theme';
 
-import { normalizeAd } from './ad';
-
 import type {
   Ad,
   PromoPanelItem,
@@ -125,8 +125,12 @@ export const SoapboxConfigRecord = ImmutableRecord({
 type SoapboxConfigMap = ImmutableMap<string, any>;
 
 const normalizeAds = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => {
-  const ads = ImmutableList<Record<string, any>>(soapboxConfig.get('ads'));
-  return soapboxConfig.set('ads', ads.map(normalizeAd));
+  if (soapboxConfig.has('ads')) {
+    const ads = filteredArray(adSchema).parse(soapboxConfig.get('ads').toJS());
+    return soapboxConfig.set('ads', ads);
+  } else {
+    return soapboxConfig;
+  }
 };
 
 const normalizeCryptoAddress = (address: unknown): CryptoAddress => {
diff --git a/app/soapbox/queries/ads.ts b/app/soapbox/queries/ads.ts
index 722f6a38a..c45bf8b33 100644
--- a/app/soapbox/queries/ads.ts
+++ b/app/soapbox/queries/ads.ts
@@ -2,7 +2,8 @@ import { useQuery } from '@tanstack/react-query';
 
 import { Ad, getProvider } from 'soapbox/features/ads/providers';
 import { useAppDispatch } from 'soapbox/hooks';
-import { normalizeAd } from 'soapbox/normalizers';
+import { adSchema } from 'soapbox/schemas';
+import { filteredArray } from 'soapbox/schemas/utils';
 import { isExpired } from 'soapbox/utils/ads';
 
 const AdKeys = {
@@ -28,7 +29,9 @@ function useAds() {
   });
 
   // Filter out expired ads.
-  const data = result.data?.map(normalizeAd).filter(ad => !isExpired(ad));
+  const data = filteredArray(adSchema)
+    .parse(result.data)
+    .filter(ad => !isExpired(ad));
 
   return {
     ...result,
diff --git a/app/soapbox/schemas/account.ts b/app/soapbox/schemas/account.ts
index d8eb7f79c..a6fb6b4c3 100644
--- a/app/soapbox/schemas/account.ts
+++ b/app/soapbox/schemas/account.ts
@@ -22,7 +22,7 @@ const accountSchema = z.object({
   created_at: z.string().datetime().catch(new Date().toUTCString()),
   discoverable: z.boolean().catch(false),
   display_name: z.string().catch(''),
-  emojis: filteredArray(customEmojiSchema).catch([]),
+  emojis: filteredArray(customEmojiSchema),
   favicon: z.string().catch(''),
   fields: z.any(), // TODO
   followers_count: z.number().catch(0),
diff --git a/app/soapbox/schemas/group.ts b/app/soapbox/schemas/group.ts
index d627ace22..d5ee7f2ee 100644
--- a/app/soapbox/schemas/group.ts
+++ b/app/soapbox/schemas/group.ts
@@ -19,7 +19,7 @@ const groupSchema = z.object({
   deleted_at: z.string().datetime().or(z.null()).catch(null),
   display_name: z.string().catch(''),
   domain: z.string().catch(''),
-  emojis: filteredArray(customEmojiSchema).catch([]),
+  emojis: filteredArray(customEmojiSchema),
   group_visibility: z.string().catch(''), // TruthSocial
   header: z.string().catch(headerMissing),
   header_static: z.string().catch(''),
diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index 23f6067c8..a64ab2942 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -1,22 +1,11 @@
-/**
- * Schemas
- */
-export { accountSchema } from './account';
-export { customEmojiSchema  } from './custom-emoji';
-export { groupSchema } from './group';
-export { groupMemberSchema } from './group-member';
-export { groupRelationshipSchema } from './group-relationship';
-export { groupTagSchema } from './group-tag';
-export { relationshipSchema } from './relationship';
+export { accountSchema, type Account } from './account';
+export { cardSchema, type Card } from './card';
+export { customEmojiSchema, type CustomEmoji } from './custom-emoji';
+export { groupSchema, type Group } from './group';
+export { groupMemberSchema, type GroupMember } from './group-member';
+export { groupRelationshipSchema, type GroupRelationship } from './group-relationship';
+export { groupTagSchema, type GroupTag } from './group-tag';
+export { relationshipSchema, type Relationship } from './relationship';
 
-/**
- * Entity Types
- */
-export type { Account } from './account';
-export type { Card } from './card';
-export type { CustomEmoji } from './custom-emoji';
-export type { Group } from './group';
-export type { GroupMember } from './group-member';
-export type { GroupRelationship } from './group-relationship';
-export type { GroupTag } from './group-tag';
-export type { Relationship } from './relationship';
+// Soapbox
+export { adSchema, type Ad } from './soapbox/ad';
\ No newline at end of file
diff --git a/app/soapbox/schemas/soapbox/ad.ts b/app/soapbox/schemas/soapbox/ad.ts
new file mode 100644
index 000000000..343b519b2
--- /dev/null
+++ b/app/soapbox/schemas/soapbox/ad.ts
@@ -0,0 +1,14 @@
+import { z } from 'zod';
+
+import { cardSchema } from '../card';
+
+const adSchema = z.object({
+  card: cardSchema,
+  impression: z.string().optional().catch(undefined),
+  expires_at: z.string().optional().catch(undefined),
+  reason: z.string().optional().catch(undefined),
+});
+
+type Ad = z.infer<typeof adSchema>;
+
+export { adSchema, type Ad };
\ No newline at end of file
diff --git a/app/soapbox/schemas/utils.ts b/app/soapbox/schemas/utils.ts
index 72f5f49d9..5a62fa0c6 100644
--- a/app/soapbox/schemas/utils.ts
+++ b/app/soapbox/schemas/utils.ts
@@ -4,7 +4,7 @@ import type { CustomEmoji } from './custom-emoji';
 
 /** Validates individual items in an array, dropping any that aren't valid. */
 function filteredArray<T extends z.ZodTypeAny>(schema: T) {
-  return z.any().array()
+  return z.any().array().catch([])
     .transform((arr) => (
       arr.map((item) => {
         const parsed = schema.safeParse(item);
diff --git a/app/soapbox/types/soapbox.ts b/app/soapbox/types/soapbox.ts
index 3b8b247a6..e9baff635 100644
--- a/app/soapbox/types/soapbox.ts
+++ b/app/soapbox/types/soapbox.ts
@@ -1,4 +1,3 @@
-import { AdRecord } from 'soapbox/normalizers/soapbox/ad';
 import {
   PromoPanelItemRecord,
   FooterItemRecord,
@@ -8,7 +7,6 @@ import {
 
 type Me = string | null | false | undefined;
 
-type Ad = ReturnType<typeof AdRecord>;
 type PromoPanelItem = ReturnType<typeof PromoPanelItemRecord>;
 type FooterItem = ReturnType<typeof FooterItemRecord>;
 type CryptoAddress = ReturnType<typeof CryptoAddressRecord>;
@@ -16,9 +14,12 @@ type SoapboxConfig = ReturnType<typeof SoapboxConfigRecord>;
 
 export {
   Me,
-  Ad,
   PromoPanelItem,
   FooterItem,
   CryptoAddress,
   SoapboxConfig,
 };
+
+export type {
+  Ad,
+} from 'soapbox/schemas';
\ No newline at end of file
diff --git a/app/soapbox/utils/__tests__/ads.test.ts b/app/soapbox/utils/__tests__/ads.test.ts
index f96f29936..5ceb9d45b 100644
--- a/app/soapbox/utils/__tests__/ads.test.ts
+++ b/app/soapbox/utils/__tests__/ads.test.ts
@@ -1,4 +1,4 @@
-import { normalizeAd } from 'soapbox/normalizers';
+import { buildAd } from 'soapbox/jest/factory';
 
 import { isExpired } from '../ads';
 
@@ -14,10 +14,10 @@ test('isExpired()', () => {
   const epoch = now.getTime();
 
   // Sanity tests.
-  expect(isExpired(normalizeAd({ expires_at: iso }))).toBe(true);
-  expect(isExpired(normalizeAd({ expires_at: new Date(epoch + 999999).toISOString() }))).toBe(false);
+  expect(isExpired(buildAd({ expires_at: iso }))).toBe(true);
+  expect(isExpired(buildAd({ expires_at: new Date(epoch + 999999).toISOString() }))).toBe(false);
 
   // Testing the 5-minute mark.
-  expect(isExpired(normalizeAd({ expires_at: new Date(epoch + threeMins).toISOString() }), fiveMins)).toBe(true);
-  expect(isExpired(normalizeAd({ expires_at: new Date(epoch + fiveMins + 1000).toISOString() }), fiveMins)).toBe(false);
+  expect(isExpired(buildAd({ expires_at: new Date(epoch + threeMins).toISOString() }), fiveMins)).toBe(true);
+  expect(isExpired(buildAd({ expires_at: new Date(epoch + fiveMins + 1000).toISOString() }), fiveMins)).toBe(false);
 });
diff --git a/app/soapbox/utils/ads.ts b/app/soapbox/utils/ads.ts
index 949315191..b59cf430b 100644
--- a/app/soapbox/utils/ads.ts
+++ b/app/soapbox/utils/ads.ts
@@ -1,4 +1,4 @@
-import type { Ad } from 'soapbox/types/soapbox';
+import type { Ad } from 'soapbox/schemas';
 
 /** Time (ms) window to not display an ad if it's about to expire. */
 const AD_EXPIRY_THRESHOLD = 5 * 60 * 1000;

From 489145ffb8c456a7fa58162a7fe28454a3042064 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 18:33:41 -0500
Subject: [PATCH 239/298] Remove normalizeCard()

---
 .../normalizers/__tests__/card.test.ts        | 14 -----------
 .../normalizers/__tests__/status.test.ts      |  1 -
 app/soapbox/normalizers/card.ts               | 25 -------------------
 app/soapbox/normalizers/index.ts              |  1 -
 app/soapbox/schemas/__tests__/card.test.ts    | 11 ++++++++
 5 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 app/soapbox/normalizers/__tests__/card.test.ts
 delete mode 100644 app/soapbox/normalizers/card.ts
 create mode 100644 app/soapbox/schemas/__tests__/card.test.ts

diff --git a/app/soapbox/normalizers/__tests__/card.test.ts b/app/soapbox/normalizers/__tests__/card.test.ts
deleted file mode 100644
index fc8d06221..000000000
--- a/app/soapbox/normalizers/__tests__/card.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Record as ImmutableRecord } from 'immutable';
-
-import { normalizeCard } from '../card';
-
-describe('normalizeCard()', () => {
-  it('adds base fields', () => {
-    const card = {};
-    const result = normalizeCard(card);
-
-    expect(ImmutableRecord.isRecord(result)).toBe(true);
-    expect(result.type).toEqual('link');
-    expect(result.url).toEqual('');
-  });
-});
diff --git a/app/soapbox/normalizers/__tests__/status.test.ts b/app/soapbox/normalizers/__tests__/status.test.ts
index 5ad29d926..5c66a4b9b 100644
--- a/app/soapbox/normalizers/__tests__/status.test.ts
+++ b/app/soapbox/normalizers/__tests__/status.test.ts
@@ -195,7 +195,6 @@ describe('normalizeStatus()', () => {
     const result = normalizeStatus(status);
     const card = result.card as Card;
 
-    expect(ImmutableRecord.isRecord(card)).toBe(true);
     expect(card.type).toEqual('link');
     expect(card.provider_url).toEqual('https://soapbox.pub');
   });
diff --git a/app/soapbox/normalizers/card.ts b/app/soapbox/normalizers/card.ts
deleted file mode 100644
index c29a0c40b..000000000
--- a/app/soapbox/normalizers/card.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { cardSchema, type Card } from 'soapbox/schemas/card';
-
-export const normalizeCard = (card: unknown): Card => {
-  try {
-    return cardSchema.parse(card);
-  } catch (_e) {
-    return {
-      author_name: '',
-      author_url: '',
-      blurhash: null,
-      description: '',
-      embed_url: '',
-      group: null,
-      height: 0,
-      html: '',
-      image: null,
-      provider_name: '',
-      provider_url: '',
-      title: '',
-      type: 'link',
-      url: '',
-      width: 0,
-    };
-  }
-};
diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts
index 42c075daf..ef7dbd7ca 100644
--- a/app/soapbox/normalizers/index.ts
+++ b/app/soapbox/normalizers/index.ts
@@ -4,7 +4,6 @@ export { AdminReportRecord, normalizeAdminReport } from './admin-report';
 export { AnnouncementRecord, normalizeAnnouncement } from './announcement';
 export { AnnouncementReactionRecord, normalizeAnnouncementReaction } from './announcement-reaction';
 export { AttachmentRecord, normalizeAttachment } from './attachment';
-export { normalizeCard } from './card';
 export { ChatRecord, normalizeChat } from './chat';
 export { ChatMessageRecord, normalizeChatMessage } from './chat-message';
 export { EmojiRecord, normalizeEmoji } from './emoji';
diff --git a/app/soapbox/schemas/__tests__/card.test.ts b/app/soapbox/schemas/__tests__/card.test.ts
new file mode 100644
index 000000000..d66730c21
--- /dev/null
+++ b/app/soapbox/schemas/__tests__/card.test.ts
@@ -0,0 +1,11 @@
+import { cardSchema } from '../card';
+
+describe('cardSchema', () => {
+  it('adds base fields', () => {
+    const card = { url: 'https://soapbox.test' };
+    const result = cardSchema.parse(card);
+
+    expect(result.type).toEqual('link');
+    expect(result.url).toEqual(card.url);
+  });
+});

From 0016aeacec1c99db39b6466689f758c9fe55f250 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 18:49:13 -0500
Subject: [PATCH 240/298] Normalize Relationship with zod

---
 .../actions/__tests__/account-notes.test.ts   |   5 +-
 .../actions/__tests__/accounts.test.ts        |   5 +-
 .../__tests__/subscribe-button.test.tsx       | 161 +-----------------
 app/soapbox/jest/factory.ts                   |  17 +-
 app/soapbox/normalizers/index.ts              |   1 -
 app/soapbox/normalizers/relationship.ts       |  35 ----
 app/soapbox/queries/__tests__/chats.test.ts   |   7 +-
 .../queries/__tests__/relationships.test.ts   |   6 +-
 app/soapbox/reducers/relationships.ts         |  17 +-
 app/soapbox/schemas/relationship.ts           |   2 +-
 app/soapbox/types/entities.ts                 |   4 +-
 11 files changed, 48 insertions(+), 212 deletions(-)
 delete mode 100644 app/soapbox/normalizers/relationship.ts

diff --git a/app/soapbox/actions/__tests__/account-notes.test.ts b/app/soapbox/actions/__tests__/account-notes.test.ts
index 8b85eecc5..a00a9d877 100644
--- a/app/soapbox/actions/__tests__/account-notes.test.ts
+++ b/app/soapbox/actions/__tests__/account-notes.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 { ReducerRecord, EditRecord } from 'soapbox/reducers/account-notes';
 
-import { normalizeAccount, normalizeRelationship } from '../../normalizers';
+import { normalizeAccount } from '../../normalizers';
 import { changeAccountNoteComment, initAccountNoteModal, submitAccountNote } from '../account-notes';
 
 import type { Account } from 'soapbox/types/entities';
@@ -66,7 +67,7 @@ describe('initAccountNoteModal()', () => {
 
   beforeEach(() => {
     const state = rootState
-      .set('relationships', ImmutableMap({ '1': normalizeRelationship({ note: 'hello' }) }));
+      .set('relationships', ImmutableMap({ '1': buildRelationship({ note: 'hello' }) }));
     store = mockStore(state);
   });
 
diff --git a/app/soapbox/actions/__tests__/accounts.test.ts b/app/soapbox/actions/__tests__/accounts.test.ts
index d9faa0213..c13f8ef90 100644
--- a/app/soapbox/actions/__tests__/accounts.test.ts
+++ b/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,
@@ -1340,7 +1341,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);
       });
diff --git a/app/soapbox/features/ui/components/__tests__/subscribe-button.test.tsx b/app/soapbox/features/ui/components/__tests__/subscribe-button.test.tsx
index d0ec92f96..5edc9636b 100644
--- a/app/soapbox/features/ui/components/__tests__/subscribe-button.test.tsx
+++ b/app/soapbox/features/ui/components/__tests__/subscribe-button.test.tsx
@@ -1,8 +1,9 @@
-// import { Map as ImmutableMap } from 'immutable';
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import { normalizeAccount, normalizeRelationship } from '../../../../normalizers';
+import { buildRelationship } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
+import { normalizeAccount } from 'soapbox/normalizers';
+
 import SubscribeButton from '../subscription-button';
 
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
@@ -19,162 +20,10 @@ describe('<SubscribeButton />', () => {
 
   describe('with "accountNotifies" disabled', () => {
     it('renders nothing', () => {
-      const account = normalizeAccount({ ...justin, relationship: normalizeRelationship({ following: true }) }) as ReducerAccount;
+      const account = normalizeAccount({ ...justin, relationship: buildRelationship({ following: true }) }) as ReducerAccount;
 
       render(<SubscribeButton account={account} />, undefined, store);
       expect(screen.queryAllByTestId('icon-button')).toHaveLength(0);
     });
   });
-
-  // describe('with "accountNotifies" enabled', () => {
-  //   beforeEach(() => {
-  //     store = {
-  //       ...store,
-  //       instance: normalizeInstance({
-  //         version: '3.4.1 (compatible; TruthSocial 1.0.0)',
-  //         software: 'TRUTHSOCIAL',
-  //         pleroma: ImmutableMap({}),
-  //       }),
-  //     };
-  //   });
-
-  //   describe('when the relationship is requested', () => {
-  //     beforeEach(() => {
-  //       account = normalizeAccount({ ...account, relationship: normalizeRelationship({ requested: true }) });
-
-  //       store = {
-  //         ...store,
-  //         accounts: ImmutableMap({
-  //           '1': account,
-  //         }),
-  //       };
-  //     });
-
-  //     it('renders the button', () => {
-  //       render(<SubscribeButton account={account} />, null, store);
-  //       expect(screen.getByTestId('icon-button')).toBeInTheDocument();
-  //     });
-
-  //     describe('when the user "isSubscribed"', () => {
-  //       beforeEach(() => {
-  //         account = normalizeAccount({
-  //           ...account,
-  //           relationship: normalizeRelationship({ requested: true, notifying: true }),
-  //         });
-
-  //         store = {
-  //           ...store,
-  //           accounts: ImmutableMap({
-  //             '1': account,
-  //           }),
-  //         };
-  //       });
-
-  //       it('renders the unsubscribe button', () => {
-  //         render(<SubscribeButton account={account} />, null, store);
-  //         expect(screen.getByTestId('icon-button').title).toEqual(`Unsubscribe to notifications from @${account.acct}`);
-  //       });
-  //     });
-
-  //     describe('when the user is not "isSubscribed"', () => {
-  //       beforeEach(() => {
-  //         account = normalizeAccount({
-  //           ...account,
-  //           relationship: normalizeRelationship({ requested: true, notifying: false }),
-  //         });
-
-  //         store = {
-  //           ...store,
-  //           accounts: ImmutableMap({
-  //             '1': account,
-  //           }),
-  //         };
-  //       });
-
-  //       it('renders the unsubscribe button', () => {
-  //         render(<SubscribeButton account={account} />, null, store);
-  //         expect(screen.getByTestId('icon-button').title).toEqual(`Subscribe to notifications from @${account.acct}`);
-  //       });
-  //     });
-  //   });
-
-  //   describe('when the user is not following the account', () => {
-  //     beforeEach(() => {
-  //       account = normalizeAccount({ ...account, relationship: normalizeRelationship({ following: false }) });
-
-  //       store = {
-  //         ...store,
-  //         accounts: ImmutableMap({
-  //           '1': account,
-  //         }),
-  //       };
-  //     });
-
-  //     it('renders nothing', () => {
-  //       render(<SubscribeButton account={account} />, null, store);
-  //       expect(screen.queryAllByTestId('icon-button')).toHaveLength(0);
-  //     });
-  //   });
-
-  //   describe('when the user is following the account', () => {
-  //     beforeEach(() => {
-  //       account = normalizeAccount({ ...account, relationship: normalizeRelationship({ following: true }) });
-
-  //       store = {
-  //         ...store,
-  //         accounts: ImmutableMap({
-  //           '1': account,
-  //         }),
-  //       };
-  //     });
-
-  //     it('renders the button', () => {
-  //       render(<SubscribeButton account={account} />, null, store);
-  //       expect(screen.getByTestId('icon-button')).toBeInTheDocument();
-  //     });
-
-  //     describe('when the user "isSubscribed"', () => {
-  //       beforeEach(() => {
-  //         account = normalizeAccount({
-  //           ...account,
-  //           relationship: normalizeRelationship({ requested: true, notifying: true }),
-  //         });
-
-  //         store = {
-  //           ...store,
-  //           accounts: ImmutableMap({
-  //             '1': account,
-  //           }),
-  //         };
-  //       });
-
-  //       it('renders the unsubscribe button', () => {
-  //         render(<SubscribeButton account={account} />, null, store);
-  //         expect(screen.getByTestId('icon-button').title).toEqual(`Unsubscribe to notifications from @${account.acct}`);
-  //       });
-  //     });
-
-  //     describe('when the user is not "isSubscribed"', () => {
-  //       beforeEach(() => {
-  //         account = normalizeAccount({
-  //           ...account,
-  //           relationship: normalizeRelationship({ requested: true, notifying: false }),
-  //         });
-
-  //         store = {
-  //           ...store,
-  //           accounts: ImmutableMap({
-  //             '1': account,
-  //           }),
-  //         };
-  //       });
-
-  //       it('renders the unsubscribe button', () => {
-  //         render(<SubscribeButton account={account} />, null, store);
-  //         expect(screen.getByTestId('icon-button').title).toEqual(`Subscribe to notifications from @${account.acct}`);
-  //       });
-  //     });
-  //   });
-  // });
-
 });
diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index ca9f2b8f0..07f4bc7d2 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -6,11 +6,13 @@ import {
   groupSchema,
   groupRelationshipSchema,
   groupTagSchema,
+  relationshipSchema,
   type Ad,
   type Card,
   type Group,
   type GroupRelationship,
   type GroupTag,
+  type Relationship,
 } from 'soapbox/schemas';
 
 // TODO: there's probably a better way to create these factory functions.
@@ -46,4 +48,17 @@ function buildAd(props: Partial<Ad> = {}): Ad {
   }, props));
 }
 
-export { buildCard, buildGroup, buildGroupRelationship, buildGroupTag, buildAd };
\ No newline at end of file
+function buildRelationship(props: Partial<Relationship> = {}): Relationship {
+  return relationshipSchema.parse(Object.assign({
+    id: uuidv4(),
+  }, props));
+}
+
+export {
+  buildCard,
+  buildGroup,
+  buildGroupRelationship,
+  buildGroupTag,
+  buildAd,
+  buildRelationship,
+};
\ No newline at end of file
diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts
index ef7dbd7ca..d22bce0c9 100644
--- a/app/soapbox/normalizers/index.ts
+++ b/app/soapbox/normalizers/index.ts
@@ -20,7 +20,6 @@ export { LocationRecord, normalizeLocation } from './location';
 export { MentionRecord, normalizeMention } from './mention';
 export { NotificationRecord, normalizeNotification } from './notification';
 export { PollRecord, PollOptionRecord, normalizePoll } from './poll';
-export { RelationshipRecord, normalizeRelationship } from './relationship';
 export { StatusRecord, normalizeStatus } from './status';
 export { StatusEditRecord, normalizeStatusEdit } from './status-edit';
 export { TagRecord, normalizeTag } from './tag';
diff --git a/app/soapbox/normalizers/relationship.ts b/app/soapbox/normalizers/relationship.ts
deleted file mode 100644
index f492a00e9..000000000
--- a/app/soapbox/normalizers/relationship.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Relationship normalizer:
- * Converts API relationships into our internal format.
- * @see {@link https://docs.joinmastodon.org/entities/relationship/}
- */
-import {
-  Map as ImmutableMap,
-  Record as ImmutableRecord,
-  fromJS,
-} from 'immutable';
-
-// https://docs.joinmastodon.org/entities/relationship/
-// https://api.pleroma.social/#operation/AccountController.relationships
-export const RelationshipRecord = ImmutableRecord({
-  blocked_by: false,
-  blocking: false,
-  domain_blocking: false,
-  endorsed: false,
-  followed_by: false,
-  following: false,
-  id: '',
-  muting: false,
-  muting_notifications: false,
-  note: '',
-  notifying: false,
-  requested: false,
-  showing_reblogs: false,
-  subscribing: false,
-});
-
-export const normalizeRelationship = (relationship: Record<string, any>) => {
-  return RelationshipRecord(
-    ImmutableMap(fromJS(relationship)),
-  );
-};
diff --git a/app/soapbox/queries/__tests__/chats.test.ts b/app/soapbox/queries/__tests__/chats.test.ts
index 65bb6294d..981250456 100644
--- a/app/soapbox/queries/__tests__/chats.test.ts
+++ b/app/soapbox/queries/__tests__/chats.test.ts
@@ -3,8 +3,9 @@ import sumBy from 'lodash/sumBy';
 import { useEffect } from 'react';
 
 import { __stub } from 'soapbox/api';
+import { buildRelationship } from 'soapbox/jest/factory';
 import { createTestStore, mockStore, queryClient, renderHook, rootState, waitFor } from 'soapbox/jest/test-helpers';
-import { normalizeChatMessage, normalizeRelationship } from 'soapbox/normalizers';
+import { normalizeChatMessage } from 'soapbox/normalizers';
 import { normalizeEmojiReaction } from 'soapbox/normalizers/emoji-reaction';
 import { Store } from 'soapbox/store';
 import { ChatMessage } from 'soapbox/types/entities';
@@ -120,7 +121,7 @@ describe('useChatMessages', () => {
       const state = rootState
         .set(
           'relationships',
-          ImmutableMap({ '1': normalizeRelationship({ blocked_by: true }) }),
+          ImmutableMap({ '1': buildRelationship({ blocked_by: true }) }),
         );
       store = mockStore(state);
     });
@@ -239,7 +240,7 @@ describe('useChat()', () => {
         mock.onGet(`/api/v1/pleroma/chats/${chat.id}`).reply(200, chat);
         mock
           .onGet(`/api/v1/accounts/relationships?id[]=${chat.account.id}`)
-          .reply(200, [normalizeRelationship({ id: relationshipId, blocked_by: true })]);
+          .reply(200, [buildRelationship({ id: relationshipId, blocked_by: true })]);
       });
     });
 
diff --git a/app/soapbox/queries/__tests__/relationships.test.ts b/app/soapbox/queries/__tests__/relationships.test.ts
index 6466da7ff..02db36166 100644
--- a/app/soapbox/queries/__tests__/relationships.test.ts
+++ b/app/soapbox/queries/__tests__/relationships.test.ts
@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 
 import { __stub } from 'soapbox/api';
+import { buildRelationship } from 'soapbox/jest/factory';
 import { createTestStore, queryClient, renderHook, rootState, waitFor } from 'soapbox/jest/test-helpers';
-import { normalizeRelationship } from 'soapbox/normalizers';
 import { Store } from 'soapbox/store';
 
 import { useFetchRelationships } from '../relationships';
@@ -25,7 +25,7 @@ describe('useFetchRelationships()', () => {
         __stub((mock) => {
           mock
             .onGet(`/api/v1/accounts/relationships?id[]=${id}`)
-            .reply(200, [normalizeRelationship({ id, blocked_by: true })]);
+            .reply(200, [buildRelationship({ id, blocked_by: true })]);
         });
       });
 
@@ -55,7 +55,7 @@ describe('useFetchRelationships()', () => {
         __stub((mock) => {
           mock
             .onGet(`/api/v1/accounts/relationships?id[]=${ids[0]}&id[]=${ids[1]}`)
-            .reply(200, ids.map((id) => normalizeRelationship({ id, blocked_by: true })));
+            .reply(200, ids.map((id) => buildRelationship({ id, blocked_by: true })));
         });
       });
 
diff --git a/app/soapbox/reducers/relationships.ts b/app/soapbox/reducers/relationships.ts
index 2eb035ec4..40d062f78 100644
--- a/app/soapbox/reducers/relationships.ts
+++ b/app/soapbox/reducers/relationships.ts
@@ -2,7 +2,7 @@ import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
 import get from 'lodash/get';
 
 import { STREAMING_FOLLOW_RELATIONSHIPS_UPDATE } from 'soapbox/actions/streaming';
-import { normalizeRelationship } from 'soapbox/normalizers/relationship';
+import { type Relationship, relationshipSchema } from 'soapbox/schemas';
 
 import { ACCOUNT_NOTE_SUBMIT_SUCCESS } from '../actions/account-notes';
 import {
@@ -35,13 +35,16 @@ import {
 import type { AnyAction } from 'redux';
 import type { APIEntity } from 'soapbox/types/entities';
 
-type Relationship = ReturnType<typeof normalizeRelationship>;
 type State = ImmutableMap<string, Relationship>;
 type APIEntities = Array<APIEntity>;
 
 const normalizeRelationships = (state: State, relationships: APIEntities) => {
   relationships.forEach(relationship => {
-    state = state.set(relationship.id, normalizeRelationship(relationship));
+    try {
+      state = state.set(relationship.id, relationshipSchema.parse(relationship));
+    } catch (_e) {
+      // do nothing
+    }
   });
 
   return state;
@@ -84,8 +87,12 @@ const followStateToRelationship = (followState: string) => {
 };
 
 const updateFollowRelationship = (state: State, id: string, followState: string) => {
-  const map = followStateToRelationship(followState);
-  return state.update(id, normalizeRelationship({}), relationship => relationship.merge(map));
+  const relationship = state.get(id) || relationshipSchema.parse({ id });
+
+  return state.set(id, {
+    ...relationship,
+    ...followStateToRelationship(followState),
+  });
 };
 
 export default function relationships(state: State = ImmutableMap<string, Relationship>(), action: AnyAction) {
diff --git a/app/soapbox/schemas/relationship.ts b/app/soapbox/schemas/relationship.ts
index 7d1e109c8..003cf747a 100644
--- a/app/soapbox/schemas/relationship.ts
+++ b/app/soapbox/schemas/relationship.ts
@@ -19,4 +19,4 @@ const relationshipSchema = z.object({
 
 type Relationship = z.infer<typeof relationshipSchema>;
 
-export { relationshipSchema, Relationship };
\ No newline at end of file
+export { relationshipSchema, type Relationship };
\ No newline at end of file
diff --git a/app/soapbox/types/entities.ts b/app/soapbox/types/entities.ts
index ebbdd197d..27082f76f 100644
--- a/app/soapbox/types/entities.ts
+++ b/app/soapbox/types/entities.ts
@@ -21,7 +21,6 @@ import {
   NotificationRecord,
   PollRecord,
   PollOptionRecord,
-  RelationshipRecord,
   StatusEditRecord,
   StatusRecord,
   TagRecord,
@@ -52,7 +51,6 @@ type Mention = ReturnType<typeof MentionRecord>;
 type Notification = ReturnType<typeof NotificationRecord>;
 type Poll = ReturnType<typeof PollRecord>;
 type PollOption = ReturnType<typeof PollOptionRecord>;
-type Relationship = ReturnType<typeof RelationshipRecord>;
 type StatusEdit = ReturnType<typeof StatusEditRecord>;
 type Tag = ReturnType<typeof TagRecord>;
 
@@ -96,7 +94,6 @@ export {
   Notification,
   Poll,
   PollOption,
-  Relationship,
   Status,
   StatusEdit,
   Tag,
@@ -111,4 +108,5 @@ export type {
   Group,
   GroupMember,
   GroupRelationship,
+  Relationship,
 } from 'soapbox/schemas';
\ No newline at end of file

From e3fcff55f9194e5f9e491644d68a12ca5e2f344c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 19:11:17 -0500
Subject: [PATCH 241/298] Convert EmojiReaction to zod

---
 .../__tests__/chat-message-reaction.test.tsx      |  6 ++----
 .../features/chats/components/chat-message.tsx    |  2 +-
 app/soapbox/normalizers/chat-message.ts           | 15 +++++----------
 app/soapbox/normalizers/emoji-reaction.ts         | 14 --------------
 app/soapbox/normalizers/index.ts                  |  1 -
 app/soapbox/queries/__tests__/chats.test.ts       |  7 +++----
 app/soapbox/schemas/emoji-reaction.ts             | 15 +++++++++++++++
 app/soapbox/schemas/index.ts                      |  1 +
 app/soapbox/types/entities.ts                     |  4 +---
 app/soapbox/utils/features.ts                     |  2 +-
 10 files changed, 29 insertions(+), 38 deletions(-)
 delete mode 100644 app/soapbox/normalizers/emoji-reaction.ts
 create mode 100644 app/soapbox/schemas/emoji-reaction.ts

diff --git a/app/soapbox/features/chats/components/__tests__/chat-message-reaction.test.tsx b/app/soapbox/features/chats/components/__tests__/chat-message-reaction.test.tsx
index 45fac5383..6ab22d4d5 100644
--- a/app/soapbox/features/chats/components/__tests__/chat-message-reaction.test.tsx
+++ b/app/soapbox/features/chats/components/__tests__/chat-message-reaction.test.tsx
@@ -1,12 +1,10 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { normalizeEmojiReaction } from 'soapbox/normalizers/emoji-reaction';
-
 import { render, screen } from '../../../../jest/test-helpers';
 import ChatMessageReaction from '../chat-message-reaction';
 
-const emojiReaction = normalizeEmojiReaction({
+const emojiReaction = ({
   name: '👍',
   count: 1,
   me: false,
@@ -56,7 +54,7 @@ describe('<ChatMessageReaction />', () => {
 
     render(
       <ChatMessageReaction
-        emojiReaction={normalizeEmojiReaction({
+        emojiReaction={({
           name: '👍',
           count: 1,
           me: true,
diff --git a/app/soapbox/features/chats/components/chat-message.tsx b/app/soapbox/features/chats/components/chat-message.tsx
index edeb13d65..f8c7898ed 100644
--- a/app/soapbox/features/chats/components/chat-message.tsx
+++ b/app/soapbox/features/chats/components/chat-message.tsx
@@ -312,7 +312,7 @@ const ChatMessage = (props: IChatMessage) => {
           </Stack>
         </HStack>
 
-        {(chatMessage.emoji_reactions?.size) ? (
+        {(chatMessage.emoji_reactions?.length) ? (
           <div
             className={clsx({
               'space-y-1': true,
diff --git a/app/soapbox/normalizers/chat-message.ts b/app/soapbox/normalizers/chat-message.ts
index f11a095b9..9f63c4daf 100644
--- a/app/soapbox/normalizers/chat-message.ts
+++ b/app/soapbox/normalizers/chat-message.ts
@@ -6,8 +6,8 @@ import {
 } from 'immutable';
 
 import { normalizeAttachment } from 'soapbox/normalizers/attachment';
-
-import { normalizeEmojiReaction } from './emoji-reaction';
+import { emojiReactionSchema } from 'soapbox/schemas';
+import { filteredArray } from 'soapbox/schemas/utils';
 
 import type { Attachment, Card, Emoji, EmojiReaction } from 'soapbox/types/entities';
 
@@ -20,7 +20,7 @@ export const ChatMessageRecord = ImmutableRecord({
   created_at: '',
   emojis: ImmutableList<Emoji>(),
   expiration: null as number | null,
-  emoji_reactions: null as ImmutableList<EmojiReaction> | null,
+  emoji_reactions: null as readonly EmojiReaction[] | null,
   id: '',
   unread: false,
   deleting: false,
@@ -41,13 +41,8 @@ const normalizeMedia = (status: ImmutableMap<string, any>) => {
 };
 
 const normalizeChatMessageEmojiReaction = (chatMessage: ImmutableMap<string, any>) => {
-  const emojiReactions = chatMessage.get('emoji_reactions');
-
-  if (emojiReactions) {
-    return chatMessage.set('emoji_reactions', ImmutableList(emojiReactions.map(normalizeEmojiReaction)));
-  } else {
-    return chatMessage;
-  }
+  const emojiReactions = chatMessage.get('emoji_reactions') || ImmutableList();
+  return chatMessage.set('emoji_reactions', filteredArray(emojiReactionSchema).parse(emojiReactions.toJS()));
 };
 
 /** Rewrite `<p></p>` to empty string. */
diff --git a/app/soapbox/normalizers/emoji-reaction.ts b/app/soapbox/normalizers/emoji-reaction.ts
deleted file mode 100644
index 88dcfd1e4..000000000
--- a/app/soapbox/normalizers/emoji-reaction.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Map as ImmutableMap, Record as ImmutableRecord, fromJS } from 'immutable';
-
-// https://docs.joinmastodon.org/entities/emoji/
-export const EmojiReactionRecord = ImmutableRecord({
-  name: '',
-  count: null as number | null,
-  me: false,
-});
-
-export const normalizeEmojiReaction = (emojiReaction: Record<string, any>) => {
-  return EmojiReactionRecord(
-    ImmutableMap(fromJS(emojiReaction)),
-  );
-};
diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts
index d22bce0c9..e7100fa9d 100644
--- a/app/soapbox/normalizers/index.ts
+++ b/app/soapbox/normalizers/index.ts
@@ -7,7 +7,6 @@ export { AttachmentRecord, normalizeAttachment } from './attachment';
 export { ChatRecord, normalizeChat } from './chat';
 export { ChatMessageRecord, normalizeChatMessage } from './chat-message';
 export { EmojiRecord, normalizeEmoji } from './emoji';
-export { EmojiReactionRecord } from './emoji-reaction';
 export { FilterRecord, normalizeFilter } from './filter';
 export { FilterKeywordRecord, normalizeFilterKeyword } from './filter-keyword';
 export { FilterStatusRecord, normalizeFilterStatus } from './filter-status';
diff --git a/app/soapbox/queries/__tests__/chats.test.ts b/app/soapbox/queries/__tests__/chats.test.ts
index 981250456..3bcd1b9a7 100644
--- a/app/soapbox/queries/__tests__/chats.test.ts
+++ b/app/soapbox/queries/__tests__/chats.test.ts
@@ -1,4 +1,4 @@
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { Map as ImmutableMap } from 'immutable';
 import sumBy from 'lodash/sumBy';
 import { useEffect } from 'react';
 
@@ -6,7 +6,6 @@ import { __stub } from 'soapbox/api';
 import { buildRelationship } from 'soapbox/jest/factory';
 import { createTestStore, mockStore, queryClient, renderHook, rootState, waitFor } from 'soapbox/jest/test-helpers';
 import { normalizeChatMessage } from 'soapbox/normalizers';
-import { normalizeEmojiReaction } from 'soapbox/normalizers/emoji-reaction';
 import { Store } from 'soapbox/store';
 import { ChatMessage } from 'soapbox/types/entities';
 import { flattenPages } from 'soapbox/utils/queries';
@@ -426,11 +425,11 @@ describe('useChatActions', () => {
       });
 
       const updatedChatMessage = (queryClient.getQueryData(ChatKeys.chatMessages(chat.id)) as any).pages[0].result[0] as ChatMessage;
-      expect(updatedChatMessage.emoji_reactions).toEqual(ImmutableList([normalizeEmojiReaction({
+      expect(updatedChatMessage.emoji_reactions).toEqual([{
         name: '👍',
         count: 1,
         me: true,
-      })]));
+      }]);
     });
   });
 });
diff --git a/app/soapbox/schemas/emoji-reaction.ts b/app/soapbox/schemas/emoji-reaction.ts
new file mode 100644
index 000000000..55c1762a0
--- /dev/null
+++ b/app/soapbox/schemas/emoji-reaction.ts
@@ -0,0 +1,15 @@
+import { z } from 'zod';
+
+/** Validates the string as an emoji. */
+const emojiSchema = z.string().refine((v) => /\p{Extended_Pictographic}/u.test(v));
+
+/** Pleroma emoji reaction. */
+const emojiReactionSchema = z.object({
+  name: emojiSchema,
+  count: z.number().nullable().catch(null),
+  me: z.boolean().catch(false),
+});
+
+type EmojiReaction = z.infer<typeof emojiReactionSchema>;
+
+export { emojiReactionSchema, EmojiReaction };
\ No newline at end of file
diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index a64ab2942..29b1c2edd 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -1,6 +1,7 @@
 export { accountSchema, type Account } from './account';
 export { cardSchema, type Card } from './card';
 export { customEmojiSchema, type CustomEmoji } from './custom-emoji';
+export { emojiReactionSchema, type EmojiReaction } from './emoji-reaction';
 export { groupSchema, type Group } from './group';
 export { groupMemberSchema, type GroupMember } from './group-member';
 export { groupRelationshipSchema, type GroupRelationship } from './group-relationship';
diff --git a/app/soapbox/types/entities.ts b/app/soapbox/types/entities.ts
index 27082f76f..e99aa3acf 100644
--- a/app/soapbox/types/entities.ts
+++ b/app/soapbox/types/entities.ts
@@ -8,7 +8,6 @@ import {
   ChatRecord,
   ChatMessageRecord,
   EmojiRecord,
-  EmojiReactionRecord,
   FieldRecord,
   FilterRecord,
   FilterKeywordRecord,
@@ -38,7 +37,6 @@ type Attachment = ReturnType<typeof AttachmentRecord>;
 type Chat = ReturnType<typeof ChatRecord>;
 type ChatMessage = ReturnType<typeof ChatMessageRecord>;
 type Emoji = ReturnType<typeof EmojiRecord>;
-type EmojiReaction = ReturnType<typeof EmojiReactionRecord>;
 type Field = ReturnType<typeof FieldRecord>;
 type Filter = ReturnType<typeof FilterRecord>;
 type FilterKeyword = ReturnType<typeof FilterKeywordRecord>;
@@ -81,7 +79,6 @@ export {
   Chat,
   ChatMessage,
   Emoji,
-  EmojiReaction,
   Field,
   Filter,
   FilterKeyword,
@@ -105,6 +102,7 @@ export {
 
 export type {
   Card,
+  EmojiReaction,
   Group,
   GroupMember,
   GroupRelationship,
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 9c5a68bda..dd818ac2b 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -254,7 +254,7 @@ const getInstanceFeatures = (instance: Instance) => {
     /**
      * Ability to add reactions to chat messages.
      */
-    chatEmojiReactions: v.software === TRUTHSOCIAL && v.build === UNRELEASED,
+    chatEmojiReactions: v.software === TRUTHSOCIAL,
 
     /**
      * Pleroma chats API.

From fb0f20cb6412c819f3fc14a2361e2705fc510ab6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 19:22:59 -0500
Subject: [PATCH 242/298] cardSchema: drop card.pleroma from transformed type

---
 app/soapbox/schemas/card.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/schemas/card.ts b/app/soapbox/schemas/card.ts
index c3826fa1d..d35c9f109 100644
--- a/app/soapbox/schemas/card.ts
+++ b/app/soapbox/schemas/card.ts
@@ -34,23 +34,23 @@ const cardSchema = z.object({
   type: z.enum(['link', 'photo', 'video', 'rich']).catch('link'),
   url: z.string().url(),
   width: z.number().catch(0),
-}).transform((card) => {
+}).transform(({ pleroma, ...card }) => {
   if (!card.provider_name) {
     card.provider_name = decodeIDNA(new URL(card.url).hostname);
   }
 
-  if (card.pleroma?.opengraph) {
+  if (pleroma?.opengraph) {
     if (!card.width && !card.height) {
-      card.width = card.pleroma.opengraph.width;
-      card.height = card.pleroma.opengraph.height;
+      card.width = pleroma.opengraph.width;
+      card.height = pleroma.opengraph.height;
     }
 
     if (!card.html) {
-      card.html = card.pleroma.opengraph.html;
+      card.html = pleroma.opengraph.html;
     }
 
     if (!card.image) {
-      card.image = card.pleroma.opengraph.thumbnail_url;
+      card.image = pleroma.opengraph.thumbnail_url;
     }
   }
 

From df3d0c237a0f4184cddb61126beb6a3cabb4639e Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Wed, 12 Apr 2023 14:21:48 +0000
Subject: [PATCH 243/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1548 of 1548 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 889752971..24582f0d5 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -807,6 +807,7 @@
   "group.role.admin": "管理员",
   "group.role.owner": "拥有者",
   "group.tabs.all": "全部",
+  "group.tabs.media": "媒体",
   "group.tabs.members": "成员",
   "group.tags.hint": "最多添加 3 个关键词，这些关键词将作为群组讨论的核心话题。",
   "group.tags.label": "标签",

From 947197c7d43cb17a5e0e50376530b1f9a207d416 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 12 Apr 2023 22:42:56 +0200
Subject: [PATCH 244/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/no.json    | 1 -
 app/soapbox/locales/tr.json    | 1 -
 app/soapbox/locales/zh-CN.json | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 83c890d89..106babfba 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -964,7 +964,6 @@
   "manage_group.privacy.private.label": "Privat (Eierens godkjenning kreves)",
   "manage_group.privacy.public.hint": "Kan oppdages. Alle kan bli med.",
   "manage_group.privacy.public.label": "Offentlig",
-  "manage_group.success": "Gruppe lagret.",
   "manage_group.tagline": "Grupper setter deg i kontakt med andre basert på felles interesser.",
   "media_panel.empty_message": "Ingen medier funnet.",
   "media_panel.title": "Media",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 35cc5120d..b207fc34a 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -963,7 +963,6 @@
   "manage_group.privacy.private.label": "Özel (Grup sahibi onayı gereklidir)",
   "manage_group.privacy.public.hint": "Keşfedilebilir. Herkes katılabilir.",
   "manage_group.privacy.public.label": "Herkese açık",
-  "manage_group.success": "Grup kaydedildi!",
   "manage_group.tagline": "Gruplar sizi ortak ilgi alanlarına göre başkalarıyla buluşturur.",
   "media_panel.empty_message": "Medya bulunamadı.",
   "media_panel.title": "Medya",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 24582f0d5..24e2082b4 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -967,7 +967,6 @@
   "manage_group.privacy.private.label": "私有（需要群组所有者批准）",
   "manage_group.privacy.public.hint": "可发现。任何人都可以加入。",
   "manage_group.privacy.public.label": "公开",
-  "manage_group.success": "群组已保存！",
   "manage_group.tagline": "群组根据共同的兴趣将您与他人联系起来。",
   "media_panel.empty_message": "未找到媒体。",
   "media_panel.title": "媒体",

From fa4a6b61e0e0c3b0de062b9dd36214f47ca007d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Thu, 13 Apr 2023 03:51:38 +0000
Subject: [PATCH 245/298] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 96.7% (1498 of 1548 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/nb_NO/
---
 app/soapbox/locales/no.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 106babfba..da2b57d46 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -807,9 +807,11 @@
   "group.role.admin": "Administrator",
   "group.role.owner": "Eier",
   "group.tabs.all": "Alle",
+  "group.tabs.media": "Media",
   "group.tabs.members": "Medlemmer",
   "group.tags.hint": "Legg til maks. 3 nøkkelord som tjener som kjerneemner for diskusjoner i gruppen.",
   "group.tags.label": "Etiketter",
+  "group.update.success": "Gruppe lagret",
   "group.upload_banner": "Last opp bilde",
   "groups.discover.popular.empty": "Kunne ikke hente populære grupper nå. Sjekk igjen senere.",
   "groups.discover.popular.show_more": "Vis mer",

From 3d68b1062db3de59a0b735e3ead5ed30c04e98f0 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Thu, 13 Apr 2023 16:09:47 +0000
Subject: [PATCH 246/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1548 of 1548 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 24e2082b4..545b39ef3 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -811,6 +811,7 @@
   "group.tabs.members": "成员",
   "group.tags.hint": "最多添加 3 个关键词，这些关键词将作为群组讨论的核心话题。",
   "group.tags.label": "标签",
+  "group.update.success": "已成功保存群组",
   "group.upload_banner": "已上传照片",
   "groups.discover.popular.empty": "目前无法获取热门群组。请稍后再试。",
   "groups.discover.popular.show_more": "显示更多",

From c067690b10981dd09f1fe51746be23af839b8a03 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Thu, 13 Apr 2023 16:25:16 +0000
Subject: [PATCH 247/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1548 of 1548 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 545b39ef3..1c2f7a83b 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -171,8 +171,8 @@
   "aliases.account_label": "旧帐号：",
   "aliases.aliases_list_delete": "删除别名",
   "aliases.search": "搜索旧帐号",
-  "aliases.success.add": "帐号别名创建成功",
-  "aliases.success.remove": "帐号别名删除成功",
+  "aliases.success.add": "帐号别名已成功创建",
+  "aliases.success.remove": "帐号别名已成功删除",
   "announcements.title": "公告",
   "app_create.name_label": "应用名称",
   "app_create.name_placeholder": "例如：'Soapbox'",
@@ -180,7 +180,7 @@
   "app_create.restart": "创建另一个",
   "app_create.results.app_label": "应用",
   "app_create.results.explanation_text": "您已创建一个新应用及其令牌，请复制密钥等信息，离开此页面后这些信息将不再展示。",
-  "app_create.results.explanation_title": "应用创建成功",
+  "app_create.results.explanation_title": "应用已成功创建",
   "app_create.results.token_label": "OAuth令牌",
   "app_create.scopes_label": "权限范围",
   "app_create.scopes_placeholder": "例如 '读取 写入 关注'",
@@ -606,7 +606,7 @@
   "edit_profile.hints.meta_fields": "您最多能在个人资料页面上展示 {count} 条自定义字段。",
   "edit_profile.hints.stranger_notifications": "仅显示来自您关注的人的通知",
   "edit_profile.save": "保存",
-  "edit_profile.success": "个人资料已保存！",
+  "edit_profile.success": "您的个人资料已成功保存！",
   "email_confirmation.success": "您的电子邮件已被确认！",
   "email_passthru.confirmed.body": "关闭此标签页，并在您发送此电子邮件确认的 {bold} 上继续注册过程。",
   "email_passthru.confirmed.heading": "邮箱地址已确认！",
@@ -624,7 +624,7 @@
   "email_verification.email.label": "电子邮箱地址",
   "email_verification.fail": "请求电子邮件验证失败。",
   "email_verification.header": "输入您的电子邮件地址",
-  "email_verification.success": "验证邮件发送成功。",
+  "email_verification.success": "验证邮件已成功发送。",
   "email_verification.taken": "被占用",
   "email_verifilcation.exists": "此电子邮件已被占用。",
   "embed.instructions": "要在您的站点上嵌入此帖文，请复制以下代码。",
@@ -730,9 +730,9 @@
   "export_data.hints.follows": "下载关注列表CSV文件",
   "export_data.hints.mutes": "下载静音列表CSV文件",
   "export_data.mutes_label": "静音",
-  "export_data.success.blocks": "屏蔽列表导出完毕",
-  "export_data.success.followers": "关注列表导出完毕",
-  "export_data.success.mutes": "静音列表导出完毕",
+  "export_data.success.blocks": "屏蔽列表已成功导出",
+  "export_data.success.followers": "关注列表已成功导出",
+  "export_data.success.mutes": "静音列表已成功导出",
   "federation_restriction.federated_timeline_removal": "从联邦宇宙时间轴移除",
   "federation_restriction.followers_only": "仅关注者可见",
   "federation_restriction.full_media_removal": "完全移除媒体",
@@ -811,7 +811,7 @@
   "group.tabs.members": "成员",
   "group.tags.hint": "最多添加 3 个关键词，这些关键词将作为群组讨论的核心话题。",
   "group.tags.label": "标签",
-  "group.update.success": "已成功保存群组",
+  "group.update.success": "群组已成功保存",
   "group.upload_banner": "已上传照片",
   "groups.discover.popular.empty": "目前无法获取热门群组。请稍后再试。",
   "groups.discover.popular.show_more": "显示更多",
@@ -862,9 +862,9 @@
   "import_data.hints.follows": "上传包含关注帐号列表的CSV文件",
   "import_data.hints.mutes": "上传包含静音帐号列表的CSV文件",
   "import_data.mutes_label": "静音帐号",
-  "import_data.success.blocks": "屏蔽帐号列表导入完成",
-  "import_data.success.followers": "关注帐号列表导入完成",
-  "import_data.success.mutes": "静音帐号列表导入完成",
+  "import_data.success.blocks": "屏蔽帐号列表已成功导入",
+  "import_data.success.followers": "关注帐号列表已成功导入",
+  "import_data.success.mutes": "静音帐号列表已成功导入",
   "input.copy": "复制",
   "input.password.hide_password": "隐藏密码",
   "input.password.show_password": "显示密码",
@@ -995,7 +995,7 @@
   "migration.hint.link": "创建一个帐号别名",
   "migration.move_account.fail": "帐号迁移失败。",
   "migration.move_account.fail.cooldown_period": "您最近迁移了您的帐号。请稍后再试。",
-  "migration.move_account.success": "帐号迁移成功。",
+  "migration.move_account.success": "帐号已成功迁移。",
   "migration.submit": "迁移关注者",
   "missing_description_modal.cancel": "取消",
   "missing_description_modal.continue": "发布",
@@ -1299,7 +1299,7 @@
   "security.codes.fail": "恢复代码错误",
   "security.confirm.fail": "密码错误，请重试。",
   "security.delete_account.fail": "删除帐号失败。",
-  "security.delete_account.success": "帐号删除成功。",
+  "security.delete_account.success": "帐号已成功删除。",
   "security.disable.fail": "密码错误，请重试。",
   "security.fields.email.label": "邮箱地址",
   "security.fields.new_password.label": "输入新密码",
@@ -1315,9 +1315,9 @@
   "security.text.delete.local": "要删除您的帐号，请输入您的密码，然后点击“删除帐号”。这是一个永久性操作，不能撤销。",
   "security.tokens.revoke": "撤销",
   "security.update_email.fail": "更新邮箱地址失败。",
-  "security.update_email.success": "邮箱地址已更新。",
-  "security.update_password.fail": "更改密码失败。",
-  "security.update_password.success": "密码已更改。",
+  "security.update_email.success": "邮箱地址已成功更新。",
+  "security.update_password.fail": "更新密码失败。",
+  "security.update_password.success": "密码已成功更新。",
   "settings.account_migration": "迁移帐号",
   "settings.change_email": "修改邮箱",
   "settings.change_password": "修改密码",

From 075ea7852a15be3bc4ef82429f26073ac83ae3ae Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Tue, 18 Apr 2023 16:21:07 +0000
Subject: [PATCH 248/298] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1567 of 1567 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 1c2f7a83b..e09b3e4c7 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -809,8 +809,19 @@
   "group.tabs.all": "全部",
   "group.tabs.media": "媒体",
   "group.tabs.members": "成员",
+  "group.tabs.tags": "主题",
+  "group.tags.empty": "此群组中尚无主题。",
+  "group.tags.hidden.success": "标记为隐藏的主题",
+  "group.tags.hide": "隐藏主题",
   "group.tags.hint": "最多添加 3 个关键词，这些关键词将作为群组讨论的核心话题。",
   "group.tags.label": "标签",
+  "group.tags.pin": "置顶主题",
+  "group.tags.pin.success": "已置顶！",
+  "group.tags.show": "显示主题",
+  "group.tags.total": "帖文总数",
+  "group.tags.unpin": "取消置顶主题",
+  "group.tags.unpin.success": "已取消置顶！",
+  "group.tags.visible.success": "主题已标记为可见",
   "group.update.success": "群组已成功保存",
   "group.upload_banner": "已上传照片",
   "groups.discover.popular.empty": "目前无法获取热门群组。请稍后再试。",
@@ -830,6 +841,10 @@
   "groups.discover.suggested.empty": "目前无法获取推荐群组。请稍后再试。",
   "groups.discover.suggested.show_more": "显示更多",
   "groups.discover.suggested.title": "为您推荐",
+  "groups.discover.tags.empty": "目前无法获取热门主题。请稍后再试。",
+  "groups.discover.tags.show_more": "显示更多",
+  "groups.discover.tags.title": "浏览主题",
+  "groups.discovery.tags.no_of_groups": "群组数",
   "groups.empty.subtitle": "开始发现可加入的群组或创建您自己的群组。",
   "groups.empty.title": "尚无群组",
   "groups.pending.count": "{number} 条待处理的申请",
@@ -838,10 +853,12 @@
   "groups.pending.label": "待处理的申请",
   "groups.popular.label": "推荐群组",
   "groups.search.placeholder": "搜索我的群组",
+  "groups.tags.title": "浏览主题",
   "hashtag.column_header.tag_mode.all": "以及{additional}",
   "hashtag.column_header.tag_mode.any": "或是{additional}",
   "hashtag.column_header.tag_mode.none": "而不用{additional}",
   "header.home.label": "主页",
+  "header.login.email.placeholder": "电子邮箱地址",
   "header.login.forgot_password": "忘记了密码？",
   "header.login.label": "登录",
   "header.login.password.label": "密码",
@@ -926,6 +943,7 @@
   "lists.subheading": "您的列表",
   "loading_indicator.label": "加载中……",
   "location_search.placeholder": "寻找一个地址",
+  "login.fields.email_label": "电子邮箱地址",
   "login.fields.instance_label": "实例",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.otp_code_hint": "输入双重认证应用里的代码，或者输入恢复代码",
@@ -1014,6 +1032,7 @@
   "mute_modal.duration": "持续时间",
   "mute_modal.hide_notifications": "同时隐藏来自此用户的通知？",
   "navbar.login.action": "登录",
+  "navbar.login.email.placeholder": "电子邮箱地址",
   "navbar.login.forgot_password": "忘记密码？",
   "navbar.login.password.label": "密码",
   "navbar.login.username.placeholder": "邮箱或用户名",
@@ -1116,6 +1135,7 @@
   "onboarding.suggestions.title": "推荐帐号",
   "onboarding.view_feed": "查看时间轴",
   "password_reset.confirmation": "请查阅确认邮件。",
+  "password_reset.fields.email_placeholder": "电子邮箱地址",
   "password_reset.fields.username_placeholder": "电子邮件或用户名",
   "password_reset.header": "重置密码",
   "password_reset.reset": "重置密码",

From dc25f69d8eb523bd1d5055d27e9764c04b2ed818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <me@mkljczk.pl>
Date: Fri, 21 Apr 2023 21:42:51 +0000
Subject: [PATCH 249/298] Translated using Weblate (Polish)

Currently translated at 84.2% (1324 of 1571 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/pl/
---
 app/soapbox/locales/pl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index df7f86c52..43877edb7 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -1285,7 +1285,7 @@
   "status.show_less_all": "Zwiń wszystkie",
   "status.show_more_all": "Rozwiń wszystkie",
   "status.show_original": "Pokaż oryginalny wpis",
-  "status.title": "Wpis @{username}",
+  "status.title": "Wpis",
   "status.title_direct": "Wiadomość bezpośrednia",
   "status.translate": "Przetłumacz wpis",
   "status.translated_from_with": "Przetłumaczono z {lang} z użyciem {provider}",

From d90d138b05e3e819bfc6c3a40581a374d5341d3f Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 25 Apr 2023 15:55:36 +0200
Subject: [PATCH 250/298] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json      | 1 -
 app/soapbox/locales/bn.json      | 1 -
 app/soapbox/locales/ca.json      | 1 -
 app/soapbox/locales/co.json      | 1 -
 app/soapbox/locales/cs.json      | 1 -
 app/soapbox/locales/cy.json      | 1 -
 app/soapbox/locales/da.json      | 1 -
 app/soapbox/locales/de.json      | 1 -
 app/soapbox/locales/el.json      | 1 -
 app/soapbox/locales/en-Shaw.json | 1 -
 app/soapbox/locales/eo.json      | 1 -
 app/soapbox/locales/es-AR.json   | 1 -
 app/soapbox/locales/es.json      | 1 -
 app/soapbox/locales/et.json      | 1 -
 app/soapbox/locales/eu.json      | 1 -
 app/soapbox/locales/fa.json      | 1 -
 app/soapbox/locales/fi.json      | 1 -
 app/soapbox/locales/fr.json      | 1 -
 app/soapbox/locales/ga.json      | 1 -
 app/soapbox/locales/gl.json      | 1 -
 app/soapbox/locales/he.json      | 1 -
 app/soapbox/locales/hi.json      | 1 -
 app/soapbox/locales/hr.json      | 1 -
 app/soapbox/locales/hu.json      | 1 -
 app/soapbox/locales/hy.json      | 1 -
 app/soapbox/locales/id.json      | 1 -
 app/soapbox/locales/io.json      | 1 -
 app/soapbox/locales/is.json      | 1 -
 app/soapbox/locales/it.json      | 1 -
 app/soapbox/locales/ja.json      | 1 -
 app/soapbox/locales/ka.json      | 1 -
 app/soapbox/locales/kk.json      | 1 -
 app/soapbox/locales/ko.json      | 1 -
 app/soapbox/locales/lt.json      | 1 -
 app/soapbox/locales/lv.json      | 1 -
 app/soapbox/locales/mk.json      | 1 -
 app/soapbox/locales/ms.json      | 1 -
 app/soapbox/locales/nl.json      | 1 -
 app/soapbox/locales/nn.json      | 1 -
 app/soapbox/locales/no.json      | 1 -
 app/soapbox/locales/oc.json      | 1 -
 app/soapbox/locales/pl.json      | 1 -
 app/soapbox/locales/pt-BR.json   | 1 -
 app/soapbox/locales/pt.json      | 1 -
 app/soapbox/locales/ro.json      | 1 -
 app/soapbox/locales/ru.json      | 1 -
 app/soapbox/locales/sk.json      | 1 -
 app/soapbox/locales/sl.json      | 1 -
 app/soapbox/locales/sq.json      | 1 -
 app/soapbox/locales/sr-Latn.json | 1 -
 app/soapbox/locales/sr.json      | 1 -
 app/soapbox/locales/sv.json      | 1 -
 app/soapbox/locales/ta.json      | 1 -
 app/soapbox/locales/te.json      | 1 -
 app/soapbox/locales/th.json      | 1 -
 app/soapbox/locales/tr.json      | 1 -
 app/soapbox/locales/uk.json      | 1 -
 app/soapbox/locales/zh-CN.json   | 1 -
 app/soapbox/locales/zh-HK.json   | 1 -
 app/soapbox/locales/zh-TW.json   | 1 -
 60 files changed, 60 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index d732dfe22..3a898c760 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -1515,7 +1515,6 @@
   "trendsPanel.viewAll": "إظهار الكل",
   "unauthorized_modal.text": "يجب عليك تسجيل الدخول لتتمكن من القيام بذلك.",
   "unauthorized_modal.title": "التسجيل في {site_title}",
-  "upload_area.title": "اسحب ملف وافلته لتحميله",
   "upload_button.label": "إرفاق وسائط (JPEG، PNG، GIF، WebM، MP4، MOV)",
   "upload_error.image_size_limit": "الصورة تجاوزت الحجم المسموح به: ({limt})",
   "upload_error.limit": "لقد تم بلوغ الحد الأقصى المسموح به لإرسال الملفات.",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index 7694edf52..9871550f2 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -420,7 +420,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} কথা বলছে",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "টেনে এখানে ছেড়ে দিলে এখানে যুক্ত করা যাবে",
   "upload_button.label": "ছবি বা ভিডিও যুক্ত করতে (এসব ধরণের: JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "যা যুক্ত করতে চাচ্ছেন সেটি বেশি বড়, এখানকার সর্বাধিকের মেমোরির উপরে চলে গেছে।",
   "upload_error.poll": "নির্বাচনক্ষেত্রে কোনো ফাইল যুক্ত করা যাবেনা।",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index 62f495db5..7b4638aad 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -599,7 +599,6 @@
   "trends.title": "Tendències",
   "unauthorized_modal.text": "Heu d'iniciar sessió per fer això.",
   "unauthorized_modal.title": "Registrar-se a {site_title}",
-  "upload_area.title": "Arrossega i deixa anar per a carregar",
   "upload_button.label": "Afegir multimèdia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "S'ha superat el límit de càrrega d'arxius.",
   "upload_error.poll": "No es permet l'enviament de fitxers en les enquestes.",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index 02113ca78..a25de09ce 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -420,7 +420,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} parlanu",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop per caricà un fugliale",
   "upload_button.label": "Aghjunghje un media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Limita di caricamentu di fugliali trapassata.",
   "upload_error.poll": "Ùn si pò micca caricà fugliali cù i scandagli.",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index 0811858bd..b1f0b7403 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -742,7 +742,6 @@
   "trends.title": "Trendy",
   "unauthorized_modal.text": "Nejprve se přihlašte.",
   "unauthorized_modal.title": "Registrovat se na {site_title}",
-  "upload_area.title": "Přetažením nahrajete",
   "upload_button.label": "Přidat média (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Byl překročen limit nahraných souborů.",
   "upload_error.poll": "Nahrávání souborů není povoleno u anket.",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index 1b202dc0b..aeb6b1564 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Llusgwch & gollwing i uwchlwytho",
   "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Wedi mynd heibio'r uchafswm terfyn uwchlwytho.",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index f24d73e4d..a24867cd9 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -418,7 +418,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {personer}} snakker",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Træk og slip for at uploade",
   "upload_button.label": "Tilføj medie (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Uploadgrænse overskredet.",
   "upload_error.poll": "Filupload ikke tilladt sammen med afstemninger.",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 9b15656fc..ff13906c1 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -1390,7 +1390,6 @@
   "trendsPanel.viewAll": "Alle anzeigen",
   "unauthorized_modal.text": "Für diese Aktion musst Du angemeldet sein.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Zum Hochladen hereinziehen",
   "upload_button.label": "Mediendatei hinzufügen (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Bild überschreitet das Limit von ({limit})",
   "upload_error.limit": "Dateiupload-Limit erreicht.",
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index 359ce8ce0..13761643f 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop για να ανεβάσεις",
   "upload_button.label": "Πρόσθεσε πολυμέσα (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Υπέρβαση ορίου μεγέθους ανεβασμένων αρχείων.",
diff --git a/app/soapbox/locales/en-Shaw.json b/app/soapbox/locales/en-Shaw.json
index b2e169b4c..46d44dd93 100644
--- a/app/soapbox/locales/en-Shaw.json
+++ b/app/soapbox/locales/en-Shaw.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "𐑿 𐑯𐑰𐑛 𐑑 𐑚𐑰 𐑤𐑪𐑜𐑛 𐑦𐑯 𐑑 𐑛𐑵 𐑞𐑨𐑑.",
   "unauthorized_modal.title": "𐑕𐑲𐑯 𐑳𐑐 𐑓 {site_title}",
-  "upload_area.title": "𐑛𐑮𐑨𐑜 𐑯 𐑛𐑮𐑪𐑐 𐑑 𐑳𐑐𐑤𐑴𐑛",
   "upload_button.label": "𐑨𐑛 𐑥𐑰𐑛𐑾 𐑩𐑑𐑨𐑗𐑥𐑩𐑯𐑑",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "𐑓𐑲𐑤 𐑳𐑐𐑤𐑴𐑛 𐑤𐑦𐑥𐑦𐑑 𐑦𐑒𐑕𐑰𐑛𐑩𐑛.",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index 6a3cb8129..7d0fc20d6 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -421,7 +421,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persono} other {personoj}} parolas",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Altreni kaj lasi por alŝuti",
   "upload_button.label": "Aldoni aŭdovidaĵon (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Limo de dosiera alŝutado transpasita.",
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index 1af32095e..82d8881d3 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -1180,7 +1180,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Para subir, arrastrá y soltá",
   "upload_button.label": "Agregar medios",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Se excedió el límite de subida de archivos.",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 4b41887f6..685fbd0c4 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -1492,7 +1492,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Arrastra y suelta para subir",
   "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Límite de subida de archivos excedido.",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index df503b6c0..77ae38b80 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -421,7 +421,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {inimene} other {inimesed}} talking",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Lohista & aseta üleslaadimiseks",
   "upload_button.label": "Lisa meedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Faili üleslaadimise limiit ületatud.",
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index b8ed28023..fc7c8a5b1 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -421,7 +421,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} hitz egiten",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Arrastatu eta jaregin igotzeko",
   "upload_button.label": "Gehitu multimedia  (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Fitxategi igoera muga gaindituta.",
   "upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index ca1f611ea..dba8e1a91 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "برای بارگذاری به این‌جا بکشید",
   "upload_button.label": "افزودن عکس و ویدیو (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "از حد مجاز باگذاری فراتر رفتید.",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index 77ffb7df8..c2e5b2c98 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -417,7 +417,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {henkilö} other {henkilöä}} keskustelee",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän",
   "upload_button.label": "Lisää mediaa",
   "upload_error.limit": "Tiedostolatauksien raja ylitetty.",
   "upload_error.poll": "Tiedon lataaminen ei ole sallittua kyselyissä.",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index 7a4f9730c..e2421e71e 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -1309,7 +1309,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Glissez et déposez pour envoyer",
   "upload_button.label": "Joindre un média (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index bfdeb9469..278d41ace 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index f24273379..406c6f980 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -426,7 +426,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} outras {people}} conversando",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Arrastre e solte para subir",
   "upload_button.label": "Engadir medios (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Excedeu o límite de subida de ficheiros.",
   "upload_error.poll": "Non se poden subir ficheiros nas sondaxes.",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index 13b3636a3..95444dc6b 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "אתה צריך להיות מחובר כדי לעשות זאת.",
   "unauthorized_modal.title": "להירשם ל{site_title}",
-  "upload_area.title": "ניתן להעלות על ידי Drag & drop",
   "upload_button.label": "הוספת מדיה",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "חרגת ממגבלת העלאת הקבצים.",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index 6607823e2..2308ef9dd 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index e1d08b7f0..6c7237da1 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -1305,7 +1305,6 @@
   "trendsPanel.viewAll": "Prikaži još",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Povuci i spusti kako bi uploadao",
   "upload_button.label": "Dodaj media",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index 3465572d8..725b2bda7 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Húzd ide a feltöltéshez",
   "upload_button.label": "Média hozzáadása (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Túllépted a fájl feltöltési limitet.",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index 52b8c67f1..9647f6461 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -345,7 +345,6 @@
   "thread_login.signup": "Sign up",
   "toast.view": "View",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Քաշիր ու նետիր՝ վերբեռնելու համար",
   "upload_button.label": "Ավելացնել մեդիա",
   "upload_form.description": "Նկարագրություն ավելացրու տեսողական խնդիրներ ունեցողների համար",
   "upload_form.undo": "Հետարկել",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index 04ce194e6..f4614f33f 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Seret & lepaskan untuk mengunggah",
   "upload_button.label": "Tambahkan media",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index c272f8a1a..eea03929f 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Tranar faligar por kargar",
   "upload_button.label": "Adjuntar kontenajo",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/is.json b/app/soapbox/locales/is.json
index 0f36a744b..77da0b6a4 100644
--- a/app/soapbox/locales/is.json
+++ b/app/soapbox/locales/is.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "Þú þarft að vera skráður inn til að gera þetta.",
   "unauthorized_modal.title": "Nýskrá á {site_title}",
-  "upload_area.title": "Dragðu-og-slepptu hér til að senda inn",
   "upload_button.label": "Bæta við viðhengi",
   "upload_error.image_size_limit": "Mynd fer yfir núverandi skráarstærðarmörk ({limit})",
   "upload_error.limit": "Fór yfir takmörk á innsendingum skráa.",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index ecb533320..dcdfda2f8 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -1440,7 +1440,6 @@
   "trendsPanel.viewAll": "Di più",
   "unauthorized_modal.text": "Per fare questo, devi prima autenticarti.",
   "unauthorized_modal.title": "Iscriviti su {site_title}",
-  "upload_area.title": "Trascina per caricare",
   "upload_button.label": "Aggiungi allegati",
   "upload_error.image_size_limit": "L'immagine eccede il limite di dimensioni ({limit})",
   "upload_error.limit": "Hai superato il limite di quanti file puoi caricare.",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index c012a65e4..b94bd46db 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -1188,7 +1188,6 @@
   "trendsPanel.viewAll": "すべて表示",
   "unauthorized_modal.text": "ログインする必要があります。",
   "unauthorized_modal.title": "{site_title}へ新規登録",
-  "upload_area.title": "ドラッグ＆ドロップでアップロード",
   "upload_button.label": "メディアを追加 (JPG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "画像が現在のファイルサイズ制限({limit})を越えています",
   "upload_error.limit": "アップロードできる上限を超えています。",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index 22c4c7a3b..55b0f0499 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -377,7 +377,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} საუბრობს",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "გადმოწიეთ და ჩააგდეთ ასატვირთათ",
   "upload_button.label": "მედიის დამატება",
   "upload_error.video_duration_limit": "Video exceeds the current duration limit ({limit} seconds)",
   "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index 048c7d26a..de3f7d434 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Жүктеу үшін сүйреп әкеліңіз",
   "upload_button.label": "Медиа қосу (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Файл жүктеу лимитінен асып кеттіңіз.",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index dc71d944f..6058a1c86 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "드래그 & 드롭으로 업로드",
   "upload_button.label": "미디어 추가 (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index f7a6feb0a..90149ded3 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index 1273f390d..c49b0b0eb 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index 4a8280b12..67c1e6590 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index ef8885c64..6d5678b52 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index 7e3f3e1dc..aed0ba5e1 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -416,7 +416,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persoon praat} other {mensen praten}} hierover",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Hiernaar toe slepen om te uploaden",
   "upload_button.label": "Media toevoegen (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Uploadlimiet van bestand overschreden.",
   "upload_error.poll": "Het uploaden van bestanden is in polls niet toegestaan.",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index e3339e389..f1e0db882 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index da2b57d46..a24117227 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -1517,7 +1517,6 @@
   "trendsPanel.viewAll": "Vis alle",
   "unauthorized_modal.text": "Du må være logget inn for å gjøre det.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Dra og slipp for å laste opp",
   "upload_button.label": "Legg til media",
   "upload_error.image_size_limit": "Bildet overskrider gjeldende filstørrelsesgrense ({limit})",
   "upload_error.limit": "Filopplastingsgrensen er overskredet.",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index a4ce6b548..2bff8c415 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Lisatz e depausatz per mandar",
   "upload_button.label": "Ajustar un mèdia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Talha maximum pels mandadís subrepassada.",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 43877edb7..0981ede80 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -1337,7 +1337,6 @@
   "trendsPanel.viewAll": "Pokaż wszystkie",
   "unauthorized_modal.text": "Musisz się zalogować, aby to zrobić.",
   "unauthorized_modal.title": "Zarejestruj się na {site_title}",
-  "upload_area.title": "Przeciągnij i upuść aby wysłać",
   "upload_button.label": "Dodaj zawartość multimedialną (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Obraz przekracza limit rozmiaru plików ({limit})",
   "upload_error.limit": "Przekroczono limit plików do wysłania.",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index 79ebcaab9..f53311155 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Arraste e solte para enviar",
   "upload_button.label": "Adicionar mídia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Limite de envio de arquivos excedido.",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index e3fc41a9d..cf9fb910e 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "Deves ter a sessão iniciada para realizares essa ação.",
   "unauthorized_modal.title": "Registar no {site_title}",
-  "upload_area.title": "Arrasta e larga para enviar",
   "upload_button.label": "Adicionar multimédia",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "O limite máximo do ficheiro a carregar foi excedido.",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index b089675ba..7ee15d5f9 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Trage și eliberează pentru a încărca",
   "upload_button.label": "Adaugă media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 818f1092d..a19cab662 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Перетащите сюда, чтобы загрузить",
   "upload_button.label": "Добавить медиаконтент",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Достигнут лимит загруженных файлов.",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index 6093583a3..f391d77ea 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Pretiahni a pusť pre nahratie",
   "upload_button.label": "Pridaj médiálny súbor (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Limit pre nahrávanie súborov bol prekročený.",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index 2267c1b6b..c310438b8 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Za pošiljanje povlecite in spustite",
   "upload_button.label": "Dodaj medij",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Omejitev prenosa datoteke je presežena.",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index 389db0be2..ff08a559c 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -399,7 +399,6 @@
   "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person duke folur} other {persona që flasin}}",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Merreni & vëreni që të ngarkohet",
   "upload_button.label": "Shtoni media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "U tejkalua kufi ngarkimi kartelash.",
   "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index 51157cb08..7cf1217bf 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Prevucite ovde da otpremite",
   "upload_button.label": "Dodaj multimediju",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index a411c3451..598ab4325 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Превуците овде да отпремите",
   "upload_button.label": "Додај мултимедију (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index 208627c1d..0eb2f231f 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Dra & släpp för att ladda upp",
   "upload_button.label": "Lägg till media",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index c9584dfed..a00885a55 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "பதிவேற்ற & இழுக்கவும்",
   "upload_button.label": "மீடியாவைச் சேர்க்கவும் (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "கோப்பு பதிவேற்ற வரம்பு மீறப்பட்டது.",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index 963317686..734003c53 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "అప్లోడ్ చేయడానికి డ్రాగ్ & డ్రాప్ చేయండి",
   "upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index ce698efb5..10288886e 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "ลากแล้วปล่อยเพื่ออัปโหลด",
   "upload_button.label": "เพิ่มสื่อ (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "เกินขีดจำกัดการอัปโหลดไฟล์",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index b207fc34a..9aaf20fda 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -1513,7 +1513,6 @@
   "trendsPanel.viewAll": "Tümünü gör",
   "unauthorized_modal.text": "Bunu yapabilmek için giriş yapmış olmalısınız.",
   "unauthorized_modal.title": "{site_title} için kaydolun",
-  "upload_area.title": "Dosya yüklemek için sürükle bırak yapınız",
   "upload_button.label": "Görsel ekle",
   "upload_error.image_size_limit": "Resim geçerli dosya boyutu sınırını ({limit}) aşıyor",
   "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index 915397a47..79b068ce0 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -1130,7 +1130,6 @@
   "trendsPanel.viewAll": "View all",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
-  "upload_area.title": "Перетягніть сюди, щоб завантажити",
   "upload_button.label": "Додати медіаконтент",
   "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})",
   "upload_error.limit": "Ліміт завантаження файлів перевищено.",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index e09b3e4c7..ff40ba578 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -1542,7 +1542,6 @@
   "trendsPanel.viewAll": "查看全部",
   "unauthorized_modal.text": "您需要登录才能继续。",
   "unauthorized_modal.title": "注册 {site_title} 帐号",
-  "upload_area.title": "将文件拖放到此处开始上传",
   "upload_button.label": "添加媒体附件",
   "upload_error.image_size_limit": "图片超过了当前的文件大小限制（{limit}）",
   "upload_error.limit": "已超过文件上传限制。",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index a007447e8..b57824417 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -1012,7 +1012,6 @@
   "trendsPanel.viewAll": "顯示全部",
   "unauthorized_modal.text": "你需要登入才能繼續",
   "unauthorized_modal.title": "註冊 {site_title} 帳户",
-  "upload_area.title": "拖放來上傳",
   "upload_button.label": "上傳媒體檔案 (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "圖片超出當前文件大小限制 ({limit})",
   "upload_error.limit": "已達到檔案上傳限制。",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index 788c8cdab..a9ba226a1 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -1012,7 +1012,6 @@
   "trendsPanel.viewAll": "顯示全部",
   "unauthorized_modal.text": "你需要登入才能繼續",
   "unauthorized_modal.title": "註冊 {site_title} 帳戶",
-  "upload_area.title": "拖放來上傳",
   "upload_button.label": "上傳媒體檔案 (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.image_size_limit": "圖片超出當前文件大小限制 ({limit})",
   "upload_error.limit": "已達到檔案上傳限制。",

From 99df477bfd4d4ce085310e8bebbeb18c74ed22bf Mon Sep 17 00:00:00 2001
From: Liberal dev <ssharp0614@gmail.com>
Date: Mon, 1 May 2023 12:41:35 +0000
Subject: [PATCH 251/298] Translated using Weblate (Korean)

Currently translated at 72.6% (1140 of 1570 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ko/
---
 app/soapbox/locales/ko.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index 6058a1c86..d733e326d 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -1,17 +1,17 @@
 {
-  "about.also_available": "Available in:",
-  "accordion.collapse": "Collapse",
-  "accordion.expand": "Expand",
+  "about.also_available": "가능:",
+  "accordion.collapse": "접기",
+  "accordion.expand": "펼치기기",
   "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
   "account.badges.bot": "봇",
-  "account.birthday": "Born {date}",
-  "account.birthday_today": "Birthday is today!",
+  "account.birthday": "생일 {date}",
+  "account.birthday_today": "오늘이 생일입니다!",
   "account.block": "@{name}을 차단",
   "account.block_domain": "{domain} 전체를 숨김",
   "account.blocked": "차단 됨",
   "account.chat": "Chat with @{name}",
-  "account.deactivated": "Deactivated",
-  "account.direct": "@{name}으로부터의 다이렉트 메시지",
+  "account.deactivated": "비활성화됨됨",
+  "account.direct": "@{name}으로부터의 다이렉트 메시지(DM)",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "프로필 편집",
   "account.endorse": "프로필에 나타내기",
@@ -848,7 +848,7 @@
   "registration.header": "Register your account",
   "registration.newsletter": "Subscribe to newsletter.",
   "registration.password_mismatch": "Passwords don't match.",
-  "registration.privacy": "Privacy Policy",
+  "registration.privacy": "개인정보처리방",
   "registration.reason": "Why do you want to join?",
   "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",

From 4bc92f3c276da6471a15c7e939b4a1dbf5da86b9 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 2 May 2023 16:15:14 -0400
Subject: [PATCH 252/298] Add ability for owners to delete statuses from Group

---
 app/soapbox/actions/groups.ts                 | 42 ------------
 .../api/hooks/groups/useDeleteGroupStatus.ts  | 20 ++++++
 .../dropdown-menu/dropdown-menu-item.tsx      |  2 +-
 app/soapbox/components/status-action-bar.tsx  | 66 ++++++-------------
 app/soapbox/locales/en.json                   |  8 +--
 5 files changed, 44 insertions(+), 94 deletions(-)
 create mode 100644 app/soapbox/api/hooks/groups/useDeleteGroupStatus.ts

diff --git a/app/soapbox/actions/groups.ts b/app/soapbox/actions/groups.ts
index 690b74540..ad760d916 100644
--- a/app/soapbox/actions/groups.ts
+++ b/app/soapbox/actions/groups.ts
@@ -4,7 +4,6 @@ import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
 import { importFetchedGroups, importFetchedAccounts } from './importer';
-import { deleteFromTimelines } from './timelines';
 
 import type { AxiosError } from 'axios';
 import type { GroupRole } from 'soapbox/reducers/group-memberships';
@@ -35,10 +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_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';
@@ -206,36 +201,6 @@ const fetchGroupRelationshipsFail = (error: AxiosError) => ({
   skipNotFound: 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));
@@ -677,9 +642,6 @@ export {
   GROUP_RELATIONSHIPS_FETCH_REQUEST,
   GROUP_RELATIONSHIPS_FETCH_SUCCESS,
   GROUP_RELATIONSHIPS_FETCH_FAIL,
-  GROUP_DELETE_STATUS_REQUEST,
-  GROUP_DELETE_STATUS_SUCCESS,
-  GROUP_DELETE_STATUS_FAIL,
   GROUP_KICK_REQUEST,
   GROUP_KICK_SUCCESS,
   GROUP_KICK_FAIL,
@@ -735,10 +697,6 @@ export {
   fetchGroupRelationshipsRequest,
   fetchGroupRelationshipsSuccess,
   fetchGroupRelationshipsFail,
-  groupDeleteStatus,
-  groupDeleteStatusRequest,
-  groupDeleteStatusSuccess,
-  groupDeleteStatusFail,
   groupKick,
   groupKickRequest,
   groupKickSuccess,
diff --git a/app/soapbox/api/hooks/groups/useDeleteGroupStatus.ts b/app/soapbox/api/hooks/groups/useDeleteGroupStatus.ts
new file mode 100644
index 000000000..55a6f9459
--- /dev/null
+++ b/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 };
\ No newline at end of file
diff --git a/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx b/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx
index 8b0ca7755..8a6c8f531 100644
--- a/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx
+++ b/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx
@@ -94,7 +94,7 @@ const DropdownMenuItem = ({ index, item, onClick }: IDropdownMenuItem) => {
       >
         {item.icon && <Icon src={item.icon} className='mr-3 h-5 w-5 flex-none rtl:ml-3 rtl:mr-0' />}
 
-        <span className='truncate'>{item.text}</span>
+        <span className='truncate font-medium'>{item.text}</span>
 
         {item.count ? (
           <span className='ml-auto h-5 w-5 flex-none'>
diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx
index 0f4adb552..13e1a4a3c 100644
--- a/app/soapbox/components/status-action-bar.tsx
+++ b/app/soapbox/components/status-action-bar.tsx
@@ -7,18 +7,20 @@ import { blockAccount } from 'soapbox/actions/accounts';
 import { launchChat } from 'soapbox/actions/chats';
 import { directCompose, mentionCompose, quoteCompose, replyCompose } from 'soapbox/actions/compose';
 import { editEvent } from 'soapbox/actions/events';
-import { groupBlock, groupDeleteStatus, groupKick } from 'soapbox/actions/groups';
 import { toggleBookmark, toggleDislike, toggleFavourite, togglePin, toggleReblog } from 'soapbox/actions/interactions';
 import { openModal } from 'soapbox/actions/modals';
 import { deleteStatusModal, toggleStatusSensitivityModal } from 'soapbox/actions/moderation';
 import { initMuteModal } from 'soapbox/actions/mutes';
 import { initReport, ReportableEntities } from 'soapbox/actions/reports';
 import { deleteStatus, editStatus, toggleMuteStatus } from 'soapbox/actions/statuses';
+import { deleteFromTimelines } from 'soapbox/actions/timelines';
+import { useDeleteGroupStatus } from 'soapbox/api/hooks/groups/useDeleteGroupStatus';
 import DropdownMenu from 'soapbox/components/dropdown-menu';
 import StatusActionButton from 'soapbox/components/status-action-button';
 import StatusReactionWrapper from 'soapbox/components/status-reaction-wrapper';
 import { HStack } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks';
+import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 import { isLocal, isRemote } from 'soapbox/utils/accounts';
 import copy from 'soapbox/utils/copy';
@@ -87,16 +89,7 @@ const messages = defineMessages({
   blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' },
   replies_disabled_group: { id: 'status.disabled_replies.group_membership', defaultMessage: 'Only group members can reply' },
   groupModDelete: { id: 'status.group_mod_delete', defaultMessage: 'Delete post from group' },
-  groupModKick: { id: 'status.group_mod_kick', defaultMessage: 'Kick @{name} from group' },
-  groupModBlock: { id: 'status.group_mod_block', defaultMessage: 'Block @{name} from group' },
-  deleteFromGroupHeading: { id: 'confirmations.delete_from_group.heading', defaultMessage: 'Delete from group' },
   deleteFromGroupMessage: { id: 'confirmations.delete_from_group.message', defaultMessage: 'Are you sure you want to delete @{name}\'s post?' },
-  kickFromGroupHeading: { id: 'confirmations.kick_from_group.heading', defaultMessage: 'Kick group member' },
-  kickFromGroupMessage: { id: 'confirmations.kick_from_group.message', defaultMessage: 'Are you sure you want to kick @{name} from this group?' },
-  kickFromGroupConfirm: { id: 'confirmations.kick_from_group.confirm', defaultMessage: 'Kick' },
-  blockFromGroupHeading: { id: 'confirmations.block_from_group.heading', defaultMessage: 'Block group member' },
-  blockFromGroupMessage: { id: 'confirmations.block_from_group.message', defaultMessage: 'Are you sure you want to block @{name} from interacting with this group?' },
-  blockFromGroupConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Block' },
 });
 
 interface IStatusActionBar {
@@ -121,6 +114,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
   const features = useFeatures();
   const settings = useSettings();
   const soapboxConfig = useSoapboxConfig();
+  const deleteGroupStatus = useDeleteGroupStatus(status?.group as Group, status.id);
 
   const { allowedEmoji } = soapboxConfig;
 
@@ -315,29 +309,13 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
       heading: intl.formatMessage(messages.deleteHeading),
       message: intl.formatMessage(messages.deleteFromGroupMessage, { name: <strong className='break-words'>{account.username}</strong> }),
       confirm: intl.formatMessage(messages.deleteConfirm),
-      onConfirm: () => dispatch(groupDeleteStatus((status.group as Group).id, status.id)),
-    }));
-  };
-
-  const handleKickFromGroup: React.EventHandler<React.MouseEvent> = () => {
-    const account = status.account as Account;
-
-    dispatch(openModal('CONFIRM', {
-      heading: intl.formatMessage(messages.kickFromGroupHeading),
-      message: intl.formatMessage(messages.kickFromGroupMessage, { name: <strong className='break-words'>{account.username}</strong> }),
-      confirm: intl.formatMessage(messages.kickFromGroupConfirm),
-      onConfirm: () => dispatch(groupKick((status.group as Group).id, account.id)),
-    }));
-  };
-
-  const handleBlockFromGroup: React.EventHandler<React.MouseEvent> = () => {
-    const account = status.account as Account;
-
-    dispatch(openModal('CONFIRM', {
-      heading: intl.formatMessage(messages.blockFromGroupHeading),
-      message: intl.formatMessage(messages.blockFromGroupMessage, { name: <strong className='break-words'>{account.username}</strong> }),
-      confirm: intl.formatMessage(messages.blockFromGroupConfirm),
-      onConfirm: () => dispatch(groupBlock((status.group as Group).id, account.id)),
+      onConfirm: () => {
+        deleteGroupStatus.mutate(status.id, {
+          onSuccess() {
+            dispatch(deleteFromTimelines(status.id));
+          },
+        });
+      },
     }));
   };
 
@@ -362,7 +340,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
       menu.push({
         text: intl.formatMessage(messages.copy),
         action: handleCopy,
-        icon: require('@tabler/icons/link.svg'),
+        icon: require('@tabler/icons/clipboard-copy.svg'),
       });
 
       if (features.embeds && isLocal(account)) {
@@ -466,7 +444,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
       menu.push({
         text: intl.formatMessage(messages.mute, { name: username }),
         action: handleMuteClick,
-        icon: require('@tabler/icons/circle-x.svg'),
+        icon: require('@tabler/icons/volume-3.svg'),
       });
       menu.push({
         text: intl.formatMessage(messages.block, { name: username }),
@@ -480,23 +458,17 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
       });
     }
 
-    if (status.group && groupRelationship?.role && ['admin', 'moderator'].includes(groupRelationship.role)) {
+    if (status.group &&
+      groupRelationship?.role &&
+      [GroupRoles.OWNER].includes(groupRelationship.role) &&
+      !ownAccount
+    ) {
       menu.push(null);
       menu.push({
         text: intl.formatMessage(messages.groupModDelete),
         action: handleDeleteFromGroup,
         icon: require('@tabler/icons/trash.svg'),
-      });
-      // TODO: figure out when an account is not in the group anymore
-      menu.push({
-        text: intl.formatMessage(messages.groupModKick, { name: account.get('username') }),
-        action: handleKickFromGroup,
-        icon: require('@tabler/icons/user-minus.svg'),
-      });
-      menu.push({
-        text: intl.formatMessage(messages.groupModBlock, { name: account.get('username') }),
-        action: handleBlockFromGroup,
-        icon: require('@tabler/icons/ban.svg'),
+        destructive: true,
       });
     }
 
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 96efd8530..3821bb342 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1440,7 +1440,7 @@
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
-  "status.copy": "Copy link to post",
+  "status.copy": "Copy Link to Post",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1462,8 +1462,8 @@
   "status.load_more": "Load more",
   "status.mention": "Mention @{name}",
   "status.more": "More",
-  "status.mute_conversation": "Mute conversation",
-  "status.open": "Expand this post",
+  "status.mute_conversation": "Mute Conversation",
+  "status.open": "Show Post Details",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.quote": "Quote post",
@@ -1499,7 +1499,7 @@
   "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.unbookmark": "Remove bookmark",
   "status.unbookmarked": "Bookmark removed.",
-  "status.unmute_conversation": "Unmute conversation",
+  "status.unmute_conversation": "Unmute Conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "statuses.quote_tombstone": "Post is unavailable.",

From 211fdd52f5176ac22af70bf60c975bbdab15d929 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 3 May 2023 08:01:02 -0500
Subject: [PATCH 253/298] Fix normalizeChatMessageEmojiReaction

---
 app/soapbox/normalizers/chat-message.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/normalizers/chat-message.ts b/app/soapbox/normalizers/chat-message.ts
index 9f63c4daf..5ec03bb59 100644
--- a/app/soapbox/normalizers/chat-message.ts
+++ b/app/soapbox/normalizers/chat-message.ts
@@ -41,7 +41,7 @@ const normalizeMedia = (status: ImmutableMap<string, any>) => {
 };
 
 const normalizeChatMessageEmojiReaction = (chatMessage: ImmutableMap<string, any>) => {
-  const emojiReactions = chatMessage.get('emoji_reactions') || ImmutableList();
+  const emojiReactions = ImmutableList(chatMessage.get('emoji_reactions') || []);
   return chatMessage.set('emoji_reactions', filteredArray(emojiReactionSchema).parse(emojiReactions.toJS()));
 };
 

From 27cc0025729cf0a5e06b1639e906d80861140b9f Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 3 May 2023 11:13:47 -0400
Subject: [PATCH 254/298] Fix alignment on ThreadConnector

---
 app/soapbox/features/feed-filtering/feed-carousel.tsx    | 2 +-
 .../placeholder/components/placeholder-avatar.tsx        | 9 +++++++--
 .../placeholder/components/placeholder-status.tsx        | 4 ++--
 app/soapbox/features/status/components/thread-status.tsx | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/features/feed-filtering/feed-carousel.tsx b/app/soapbox/features/feed-filtering/feed-carousel.tsx
index 9d62538ce..f437aad0c 100644
--- a/app/soapbox/features/feed-filtering/feed-carousel.tsx
+++ b/app/soapbox/features/feed-filtering/feed-carousel.tsx
@@ -207,7 +207,7 @@ const FeedCarousel = () => {
                   style={{ width: widthPerAvatar || 'auto' }}
                   key={idx}
                 >
-                  <PlaceholderAvatar size={56} withText />
+                  <PlaceholderAvatar size={56} withText className='py-3' />
                 </div>
               ))
             ) : (
diff --git a/app/soapbox/features/placeholder/components/placeholder-avatar.tsx b/app/soapbox/features/placeholder/components/placeholder-avatar.tsx
index 6eb479f13..058904001 100644
--- a/app/soapbox/features/placeholder/components/placeholder-avatar.tsx
+++ b/app/soapbox/features/placeholder/components/placeholder-avatar.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import React from 'react';
 
 import { Stack } from 'soapbox/components/ui';
@@ -5,10 +6,11 @@ import { Stack } from 'soapbox/components/ui';
 interface IPlaceholderAvatar {
   size: number
   withText?: boolean
+  className?: string
 }
 
 /** Fake avatar to display while data is loading. */
-const PlaceholderAvatar: React.FC<IPlaceholderAvatar> = ({ size, withText = false }) => {
+const PlaceholderAvatar: React.FC<IPlaceholderAvatar> = ({ size, withText = false, className }) => {
   const style = React.useMemo(() => {
     if (!size) {
       return {};
@@ -21,7 +23,10 @@ const PlaceholderAvatar: React.FC<IPlaceholderAvatar> = ({ size, withText = fals
   }, [size]);
 
   return (
-    <Stack space={2} className='animate-pulse py-3 text-center'>
+    <Stack
+      space={2}
+      className={clsx('animate-pulse text-center', className)}
+    >
       <div
         className='mx-auto block rounded-full bg-primary-50 dark:bg-primary-800'
         style={style}
diff --git a/app/soapbox/features/placeholder/components/placeholder-status.tsx b/app/soapbox/features/placeholder/components/placeholder-status.tsx
index 06d6ff1a2..739c96c5c 100644
--- a/app/soapbox/features/placeholder/components/placeholder-status.tsx
+++ b/app/soapbox/features/placeholder/components/placeholder-status.tsx
@@ -8,11 +8,11 @@ import PlaceholderDisplayName from './placeholder-display-name';
 import PlaceholderStatusContent from './placeholder-status-content';
 
 interface IPlaceholderStatus {
-  variant?: 'rounded' | 'slim'
+  variant?: 'rounded' | 'slim' | 'default'
 }
 
 /** Fake status to display while data is loading. */
-const PlaceholderStatus: React.FC<IPlaceholderStatus> = ({ variant = 'rounded' }) => (
+const PlaceholderStatus: React.FC<IPlaceholderStatus> = ({ variant }) => (
   <div
     className={clsx({
       'status-placeholder bg-white dark:bg-primary-900': true,
diff --git a/app/soapbox/features/status/components/thread-status.tsx b/app/soapbox/features/status/components/thread-status.tsx
index c3ff7bc65..8f3e5b249 100644
--- a/app/soapbox/features/status/components/thread-status.tsx
+++ b/app/soapbox/features/status/components/thread-status.tsx
@@ -46,7 +46,7 @@ const ThreadStatus: React.FC<IThreadStatus> = (props): JSX.Element => {
         // @ts-ignore FIXME
         <StatusContainer {...props} showGroup={false} />
       ) : (
-        <PlaceholderStatus variant='slim' />
+        <PlaceholderStatus variant='default' />
       )}
     </div>
   );

From 2baabd3e8684cf48d303bb9da1b46935d1fe4f2b Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 3 May 2023 11:17:47 -0400
Subject: [PATCH 255/298] i18n

---
 app/soapbox/locales/en.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 3821bb342..2f3580551 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -488,7 +488,6 @@
   "confirmations.delete_event.confirm": "Delete",
   "confirmations.delete_event.heading": "Delete event",
   "confirmations.delete_event.message": "Are you sure you want to delete this event?",
-  "confirmations.delete_from_group.heading": "Delete from group",
   "confirmations.delete_from_group.message": "Are you sure you want to delete @{name}'s post?",
   "confirmations.delete_group.confirm": "Delete",
   "confirmations.delete_group.heading": "Delete group",
@@ -500,7 +499,6 @@
   "confirmations.domain_block.heading": "Block {domain}",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications.",
   "confirmations.kick_from_group.confirm": "Kick",
-  "confirmations.kick_from_group.heading": "Kick group member",
   "confirmations.kick_from_group.message": "Are you sure you want to kick @{name} from this group?",
   "confirmations.leave_event.confirm": "Leave event",
   "confirmations.leave_event.message": "If you want to rejoin the event, the request will be manually reviewed again. Are you sure you want to proceed?",
@@ -1452,9 +1450,7 @@
   "status.favourite": "Like",
   "status.filtered": "Filtered",
   "status.group": "Posted in {group}",
-  "status.group_mod_block": "Block @{name} from group",
   "status.group_mod_delete": "Delete post from group",
-  "status.group_mod_kick": "Kick @{name} from group",
   "status.interactions.dislikes": "{count, plural, one {Dislike} other {Dislikes}}",
   "status.interactions.favourites": "{count, plural, one {Like} other {Likes}}",
   "status.interactions.quotes": "{count, plural, one {Quote} other {Quotes}}",

From d4ed442a7eed135bdd8eaeb686ec05b5997c0025 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 3 May 2023 12:52:36 -0500
Subject: [PATCH 256/298] Normalize poll with zod

---
 .../polls/__tests__/poll-footer.test.tsx      |  44 ++++----
 app/soapbox/components/polls/poll-footer.tsx  |   8 +-
 app/soapbox/components/polls/poll-option.tsx  |   5 +-
 .../normalizers/__tests__/poll.test.ts        |  47 --------
 .../normalizers/__tests__/status.test.ts      |  18 ++--
 app/soapbox/normalizers/index.ts              |   1 -
 app/soapbox/normalizers/poll.ts               | 102 ------------------
 app/soapbox/normalizers/status-edit.ts        |   9 +-
 app/soapbox/normalizers/status.ts             |  10 +-
 app/soapbox/reducers/__tests__/polls.test.ts  |   7 +-
 app/soapbox/reducers/statuses.ts              |   4 +-
 app/soapbox/schemas/__tests__/poll.test.ts    |  44 ++++++++
 app/soapbox/schemas/account.ts                |   4 +-
 app/soapbox/schemas/index.ts                  |   1 +
 app/soapbox/schemas/poll.ts                   |  50 +++++++++
 app/soapbox/schemas/soapbox/ad.ts             |   2 +-
 app/soapbox/types/entities.ts                 |   8 +-
 17 files changed, 160 insertions(+), 204 deletions(-)
 delete mode 100644 app/soapbox/normalizers/__tests__/poll.test.ts
 delete mode 100644 app/soapbox/normalizers/poll.ts
 create mode 100644 app/soapbox/schemas/__tests__/poll.test.ts
 create mode 100644 app/soapbox/schemas/poll.ts

diff --git a/app/soapbox/components/polls/__tests__/poll-footer.test.tsx b/app/soapbox/components/polls/__tests__/poll-footer.test.tsx
index 29c841a0a..a9e709399 100644
--- a/app/soapbox/components/polls/__tests__/poll-footer.test.tsx
+++ b/app/soapbox/components/polls/__tests__/poll-footer.test.tsx
@@ -4,14 +4,22 @@ import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
 
 import { __stub } from 'soapbox/api';
-import { normalizePoll } from 'soapbox/normalizers/poll';
+import { mockStore, render, screen, rootState } from 'soapbox/jest/test-helpers';
+import { type Poll } from 'soapbox/schemas';
 
-import { mockStore, render, screen, rootState } from '../../../jest/test-helpers';
 import PollFooter from '../poll-footer';
 
-let poll = normalizePoll({
-  id: 1,
-  options: [{ title: 'Apples', votes_count: 0 }],
+let poll: Poll = {
+  id: '1',
+  options: [{
+    title: 'Apples',
+    votes_count: 0,
+    title_emojified: 'Apples',
+  }, {
+    title: 'Oranges',
+    votes_count: 0,
+    title_emojified: 'Oranges',
+  }],
   emojis: [],
   expired: false,
   expires_at: '2020-03-24T19:33:06.000Z',
@@ -20,7 +28,7 @@ let poll = normalizePoll({
   votes_count: 0,
   own_votes: null,
   voted: false,
-});
+};
 
 describe('<PollFooter />', () => {
   describe('with "showResults" enabled', () => {
@@ -62,10 +70,10 @@ describe('<PollFooter />', () => {
 
     describe('when the Poll has not expired', () => {
       beforeEach(() => {
-        poll = normalizePoll({
-          ...poll.toJS(),
+        poll = {
+          ...poll,
           expired: false,
-        });
+        };
       });
 
       it('renders time remaining', () => {
@@ -77,10 +85,10 @@ describe('<PollFooter />', () => {
 
     describe('when the Poll has expired', () => {
       beforeEach(() => {
-        poll = normalizePoll({
-          ...poll.toJS(),
+        poll = {
+          ...poll,
           expired: true,
-        });
+        };
       });
 
       it('renders closed', () => {
@@ -100,10 +108,10 @@ describe('<PollFooter />', () => {
 
     describe('when the Poll is multiple', () => {
       beforeEach(() => {
-        poll = normalizePoll({
-          ...poll.toJS(),
+        poll = {
+          ...poll,
           multiple: true,
-        });
+        };
       });
 
       it('renders the Vote button', () => {
@@ -115,10 +123,10 @@ describe('<PollFooter />', () => {
 
     describe('when the Poll is not multiple', () => {
       beforeEach(() => {
-        poll = normalizePoll({
-          ...poll.toJS(),
+        poll = {
+          ...poll,
           multiple: false,
-        });
+        };
       });
 
       it('does not render the Vote button', () => {
diff --git a/app/soapbox/components/polls/poll-footer.tsx b/app/soapbox/components/polls/poll-footer.tsx
index c62cc9522..1994c1e76 100644
--- a/app/soapbox/components/polls/poll-footer.tsx
+++ b/app/soapbox/components/polls/poll-footer.tsx
@@ -40,21 +40,21 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
   let votesCount = null;
 
   if (poll.voters_count !== null && poll.voters_count !== undefined) {
-    votesCount = <FormattedMessage id='poll.total_people' defaultMessage='{count, plural, one {# person} other {# people}}' values={{ count: poll.get('voters_count') }} />;
+    votesCount = <FormattedMessage id='poll.total_people' defaultMessage='{count, plural, one {# person} other {# people}}' values={{ count: poll.voters_count }} />;
   } else {
-    votesCount = <FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.get('votes_count') }} />;
+    votesCount = <FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.votes_count }} />;
   }
 
   return (
     <Stack space={4} data-testid='poll-footer'>
-      {(!showResults && poll?.multiple) && (
+      {(!showResults && poll.multiple) && (
         <Button onClick={handleVote} theme='primary' block>
           <FormattedMessage id='poll.vote' defaultMessage='Vote' />
         </Button>
       )}
 
       <HStack space={1.5} alignItems='center' wrap>
-        {poll.pleroma.get('non_anonymous') && (
+        {poll.pleroma?.non_anonymous && (
           <>
             <Tooltip text={intl.formatMessage(messages.nonAnonymous)}>
               <Text theme='muted' weight='medium'>
diff --git a/app/soapbox/components/polls/poll-option.tsx b/app/soapbox/components/polls/poll-option.tsx
index 792a3a066..b4c37e11d 100644
--- a/app/soapbox/components/polls/poll-option.tsx
+++ b/app/soapbox/components/polls/poll-option.tsx
@@ -112,10 +112,13 @@ const PollOption: React.FC<IPollOption> = (props): JSX.Element | null => {
 
   const pollVotesCount = poll.voters_count || poll.votes_count;
   const percent = pollVotesCount === 0 ? 0 : (option.votes_count / pollVotesCount) * 100;
-  const leading = poll.options.filterNot(other => other.title === option.title).every(other => option.votes_count >= other.votes_count);
   const voted = poll.own_votes?.includes(index);
   const message = intl.formatMessage(messages.votes, { votes: option.votes_count });
 
+  const leading = poll.options
+    .filter(other => other.title !== option.title)
+    .every(other => option.votes_count >= other.votes_count);
+
   return (
     <div key={option.title}>
       {showResults ? (
diff --git a/app/soapbox/normalizers/__tests__/poll.test.ts b/app/soapbox/normalizers/__tests__/poll.test.ts
deleted file mode 100644
index d5226e938..000000000
--- a/app/soapbox/normalizers/__tests__/poll.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Record as ImmutableRecord } from 'immutable';
-
-import { normalizePoll } from '../poll';
-
-describe('normalizePoll()', () => {
-  it('adds base fields', () => {
-    const poll = { options: [{ title: 'Apples' }] };
-    const result = normalizePoll(poll);
-
-    const expected = {
-      options: [{ title: 'Apples', votes_count: 0 }],
-      emojis: [],
-      expired: false,
-      multiple: false,
-      voters_count: 0,
-      votes_count: 0,
-      own_votes: null,
-      voted: false,
-    };
-
-    expect(ImmutableRecord.isRecord(result)).toBe(true);
-    expect(ImmutableRecord.isRecord(result.options.get(0))).toBe(true);
-    expect(result.toJS()).toMatchObject(expected);
-  });
-
-  it('normalizes a Pleroma logged-out poll', () => {
-    const { poll } = require('soapbox/__fixtures__/pleroma-status-with-poll.json');
-    const result = normalizePoll(poll);
-
-    // Adds logged-in fields
-    expect(result.voted).toBe(false);
-    expect(result.own_votes).toBe(null);
-  });
-
-  it('normalizes poll with emojis', () => {
-    const { poll } = require('soapbox/__fixtures__/pleroma-status-with-poll-with-emojis.json');
-    const result = normalizePoll(poll);
-
-    // Emojifies poll options
-    expect(result.options.get(1)?.title_emojified)
-      .toContain('emojione');
-
-    // Parses emojis as Immutable.Record's
-    expect(ImmutableRecord.isRecord(result.emojis.get(0))).toBe(true);
-    expect(result.emojis.get(1)?.shortcode).toEqual('soapbox');
-  });
-});
diff --git a/app/soapbox/normalizers/__tests__/status.test.ts b/app/soapbox/normalizers/__tests__/status.test.ts
index 5c66a4b9b..0024a212c 100644
--- a/app/soapbox/normalizers/__tests__/status.test.ts
+++ b/app/soapbox/normalizers/__tests__/status.test.ts
@@ -146,12 +146,16 @@ describe('normalizeStatus()', () => {
   });
 
   it('normalizes poll and poll options', () => {
-    const status = { poll: { options: [{ title: 'Apples' }] } };
+    const status = { poll: { id: '1', options: [{ title: 'Apples' }, { title: 'Oranges' }] } };
     const result = normalizeStatus(status);
     const poll = result.poll as Poll;
 
     const expected = {
-      options: [{ title: 'Apples', votes_count: 0 }],
+      id: '1',
+      options: [
+        { title: 'Apples', votes_count: 0 },
+        { title: 'Oranges', votes_count: 0 },
+      ],
       emojis: [],
       expired: false,
       multiple: false,
@@ -161,9 +165,7 @@ describe('normalizeStatus()', () => {
       voted: false,
     };
 
-    expect(ImmutableRecord.isRecord(poll)).toBe(true);
-    expect(ImmutableRecord.isRecord(poll.options.get(0))).toBe(true);
-    expect(poll.toJS()).toMatchObject(expected);
+    expect(poll).toMatchObject(expected);
   });
 
   it('normalizes a Pleroma logged-out poll', () => {
@@ -182,12 +184,10 @@ describe('normalizeStatus()', () => {
     const poll = result.poll as Poll;
 
     // Emojifies poll options
-    expect(poll.options.get(1)?.title_emojified)
+    expect(poll.options[1].title_emojified)
       .toContain('emojione');
 
-    // Parses emojis as Immutable.Record's
-    expect(ImmutableRecord.isRecord(poll.emojis.get(0))).toBe(true);
-    expect(poll.emojis.get(1)?.shortcode).toEqual('soapbox');
+    expect(poll.emojis[1].shortcode).toEqual('soapbox');
   });
 
   it('normalizes a card', () => {
diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts
index e7100fa9d..12bb77d0c 100644
--- a/app/soapbox/normalizers/index.ts
+++ b/app/soapbox/normalizers/index.ts
@@ -18,7 +18,6 @@ export { ListRecord, normalizeList } from './list';
 export { LocationRecord, normalizeLocation } from './location';
 export { MentionRecord, normalizeMention } from './mention';
 export { NotificationRecord, normalizeNotification } from './notification';
-export { PollRecord, PollOptionRecord, normalizePoll } from './poll';
 export { StatusRecord, normalizeStatus } from './status';
 export { StatusEditRecord, normalizeStatusEdit } from './status-edit';
 export { TagRecord, normalizeTag } from './tag';
diff --git a/app/soapbox/normalizers/poll.ts b/app/soapbox/normalizers/poll.ts
deleted file mode 100644
index 726278a57..000000000
--- a/app/soapbox/normalizers/poll.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Poll normalizer:
- * Converts API polls into our internal format.
- * @see {@link https://docs.joinmastodon.org/entities/poll/}
- */
-import escapeTextContentForBrowser from 'escape-html';
-import {
-  Map as ImmutableMap,
-  List as ImmutableList,
-  Record as ImmutableRecord,
-  fromJS,
-} from 'immutable';
-
-import emojify from 'soapbox/features/emoji';
-import { normalizeEmoji } from 'soapbox/normalizers/emoji';
-import { makeEmojiMap } from 'soapbox/utils/normalizers';
-
-import type { Emoji, PollOption } from 'soapbox/types/entities';
-
-// https://docs.joinmastodon.org/entities/poll/
-export const PollRecord = ImmutableRecord({
-  emojis: ImmutableList<Emoji>(),
-  expired: false,
-  expires_at: '',
-  id: '',
-  multiple: false,
-  options: ImmutableList<PollOption>(),
-  voters_count: 0,
-  votes_count: 0,
-  own_votes: null as ImmutableList<number> | null,
-  voted: false,
-  pleroma: ImmutableMap<string, any>(),
-});
-
-// Sub-entity of Poll
-export const PollOptionRecord = ImmutableRecord({
-  title: '',
-  votes_count: 0,
-
-  // Internal fields
-  title_emojified: '',
-});
-
-// Normalize emojis
-const normalizeEmojis = (entity: ImmutableMap<string, any>) => {
-  return entity.update('emojis', ImmutableList(), emojis => {
-    return emojis.map(normalizeEmoji);
-  });
-};
-
-const normalizePollOption = (option: ImmutableMap<string, any> | string, emojis: ImmutableList<ImmutableMap<string, string>> = ImmutableList()) => {
-  const emojiMap = makeEmojiMap(emojis);
-
-  if (typeof option === 'string') {
-    const titleEmojified = emojify(escapeTextContentForBrowser(option), emojiMap);
-
-    return PollOptionRecord({
-      title: option,
-      title_emojified: titleEmojified,
-    });
-  }
-
-  const titleEmojified = emojify(escapeTextContentForBrowser(option.get('title')), emojiMap);
-
-  return PollOptionRecord(
-    option.set('title_emojified', titleEmojified),
-  );
-};
-
-// Normalize poll options
-const normalizePollOptions = (poll: ImmutableMap<string, any>) => {
-  const emojis = poll.get('emojis');
-
-  return poll.update('options', (options: ImmutableList<ImmutableMap<string, any>>) => {
-    return options.map(option => normalizePollOption(option, emojis));
-  });
-};
-
-// Normalize own_votes to `null` if empty (like Mastodon)
-const normalizePollOwnVotes = (poll: ImmutableMap<string, any>) => {
-  return poll.update('own_votes', ownVotes => {
-    return ownVotes?.size > 0 ? ownVotes : null;
-  });
-};
-
-// Whether the user voted in the poll
-const normalizePollVoted = (poll: ImmutableMap<string, any>) => {
-  return poll.update('voted', voted => {
-    return typeof voted === 'boolean' ? voted : poll.get('own_votes')?.size > 0;
-  });
-};
-
-export const normalizePoll = (poll: Record<string, any>) => {
-  return PollRecord(
-    ImmutableMap(fromJS(poll)).withMutations((poll: ImmutableMap<string, any>) => {
-      normalizeEmojis(poll);
-      normalizePollOptions(poll);
-      normalizePollOwnVotes(poll);
-      normalizePollVoted(poll);
-    }),
-  );
-};
diff --git a/app/soapbox/normalizers/status-edit.ts b/app/soapbox/normalizers/status-edit.ts
index 6f5d8d53a..f569ecce3 100644
--- a/app/soapbox/normalizers/status-edit.ts
+++ b/app/soapbox/normalizers/status-edit.ts
@@ -12,7 +12,7 @@ import {
 import emojify from 'soapbox/features/emoji';
 import { normalizeAttachment } from 'soapbox/normalizers/attachment';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
-import { normalizePoll } from 'soapbox/normalizers/poll';
+import { pollSchema } from 'soapbox/schemas';
 import { stripCompatibilityFeatures } from 'soapbox/utils/html';
 import { makeEmojiMap } from 'soapbox/utils/normalizers';
 
@@ -50,9 +50,10 @@ const normalizeEmojis = (entity: ImmutableMap<string, any>) => {
 
 // Normalize the poll in the status, if applicable
 const normalizeStatusPoll = (statusEdit: ImmutableMap<string, any>) => {
-  if (statusEdit.hasIn(['poll', 'options'])) {
-    return statusEdit.update('poll', ImmutableMap(), normalizePoll);
-  } else {
+  try {
+    const poll = pollSchema.parse(statusEdit.get('poll').toJS());
+    return statusEdit.set('poll', poll);
+  } catch (_e) {
     return statusEdit.set('poll', null);
   }
 };
diff --git a/app/soapbox/normalizers/status.ts b/app/soapbox/normalizers/status.ts
index 64a00b316..17a23b19e 100644
--- a/app/soapbox/normalizers/status.ts
+++ b/app/soapbox/normalizers/status.ts
@@ -13,8 +13,7 @@ import {
 import { normalizeAttachment } from 'soapbox/normalizers/attachment';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
 import { normalizeMention } from 'soapbox/normalizers/mention';
-import { normalizePoll } from 'soapbox/normalizers/poll';
-import { cardSchema } from 'soapbox/schemas/card';
+import { cardSchema, pollSchema } from 'soapbox/schemas';
 
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity } from 'soapbox/types/entities';
@@ -109,9 +108,10 @@ const normalizeEmojis = (entity: ImmutableMap<string, any>) => {
 
 // Normalize the poll in the status, if applicable
 const normalizeStatusPoll = (status: ImmutableMap<string, any>) => {
-  if (status.hasIn(['poll', 'options'])) {
-    return status.update('poll', ImmutableMap(), normalizePoll);
-  } else {
+  try {
+    const poll = pollSchema.parse(status.get('poll').toJS());
+    return status.set('poll', poll);
+  } catch (_e) {
     return status.set('poll', null);
   }
 };
diff --git a/app/soapbox/reducers/__tests__/polls.test.ts b/app/soapbox/reducers/__tests__/polls.test.ts
index b9ceb07f7..74627fb68 100644
--- a/app/soapbox/reducers/__tests__/polls.test.ts
+++ b/app/soapbox/reducers/__tests__/polls.test.ts
@@ -11,14 +11,17 @@ describe('polls reducer', () => {
 
   describe('POLLS_IMPORT', () => {
     it('normalizes the poll', () => {
-      const polls = [{ id: '3', options: [{ title: 'Apples' }] }];
+      const polls = [{ id: '3', options: [{ title: 'Apples' }, { title: 'Oranges' }] }];
       const action = { type: POLLS_IMPORT, polls };
 
       const result = reducer(undefined, action);
 
       const expected = {
         '3': {
-          options: [{ title: 'Apples', votes_count: 0 }],
+          options: [
+            { title: 'Apples', votes_count: 0 },
+            { title: 'Oranges', votes_count: 0 },
+          ],
           emojis: [],
           expired: false,
           multiple: false,
diff --git a/app/soapbox/reducers/statuses.ts b/app/soapbox/reducers/statuses.ts
index 3ae9c308f..d8c91b6a3 100644
--- a/app/soapbox/reducers/statuses.ts
+++ b/app/soapbox/reducers/statuses.ts
@@ -74,11 +74,11 @@ const minifyStatus = (status: StatusRecord): ReducerStatus => {
 };
 
 // Gets titles of poll options from status
-const getPollOptionTitles = ({ poll }: StatusRecord): ImmutableList<string> => {
+const getPollOptionTitles = ({ poll }: StatusRecord): readonly string[] => {
   if (poll && typeof poll === 'object') {
     return poll.options.map(({ title }) => title);
   } else {
-    return ImmutableList();
+    return [];
   }
 };
 
diff --git a/app/soapbox/schemas/__tests__/poll.test.ts b/app/soapbox/schemas/__tests__/poll.test.ts
new file mode 100644
index 000000000..fe39315dd
--- /dev/null
+++ b/app/soapbox/schemas/__tests__/poll.test.ts
@@ -0,0 +1,44 @@
+import { pollSchema } from '../poll';
+
+describe('normalizePoll()', () => {
+  it('adds base fields', () => {
+    const poll = { id: '1', options: [{ title: 'Apples' }, { title: 'Oranges' }] };
+    const result = pollSchema.parse(poll);
+
+    const expected = {
+      options: [
+        { title: 'Apples', votes_count: 0 },
+        { title: 'Oranges', votes_count: 0 },
+      ],
+      emojis: [],
+      expired: false,
+      multiple: false,
+      voters_count: 0,
+      votes_count: 0,
+      own_votes: null,
+      voted: false,
+    };
+
+    expect(result).toMatchObject(expected);
+  });
+
+  it('normalizes a Pleroma logged-out poll', () => {
+    const { poll } = require('soapbox/__fixtures__/pleroma-status-with-poll.json');
+    const result = pollSchema.parse(poll);
+
+    // Adds logged-in fields
+    expect(result.voted).toBe(false);
+    expect(result.own_votes).toBe(null);
+  });
+
+  it('normalizes poll with emojis', () => {
+    const { poll } = require('soapbox/__fixtures__/pleroma-status-with-poll-with-emojis.json');
+    const result = pollSchema.parse(poll);
+
+    // Emojifies poll options
+    expect(result.options[1]?.title_emojified)
+      .toContain('emojione');
+
+    expect(result.emojis[1]?.shortcode).toEqual('soapbox');
+  });
+});
diff --git a/app/soapbox/schemas/account.ts b/app/soapbox/schemas/account.ts
index a6fb6b4c3..9381edbbd 100644
--- a/app/soapbox/schemas/account.ts
+++ b/app/soapbox/schemas/account.ts
@@ -43,8 +43,8 @@ const accountSchema = z.object({
   pleroma: z.any(), // TODO
   source: z.any(), // TODO
   statuses_count: z.number().catch(0),
-  uri: z.string().catch(''),
-  url: z.string().catch(''),
+  uri: z.string().url().catch(''),
+  url: z.string().url().catch(''),
   username: z.string().catch(''),
   verified: z.boolean().default(false),
   website: z.string().catch(''),
diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index 29b1c2edd..655bffc7f 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -6,6 +6,7 @@ export { groupSchema, type Group } from './group';
 export { groupMemberSchema, type GroupMember } from './group-member';
 export { groupRelationshipSchema, type GroupRelationship } from './group-relationship';
 export { groupTagSchema, type GroupTag } from './group-tag';
+export { pollSchema, type Poll, type PollOption } from './poll';
 export { relationshipSchema, type Relationship } from './relationship';
 
 // Soapbox
diff --git a/app/soapbox/schemas/poll.ts b/app/soapbox/schemas/poll.ts
new file mode 100644
index 000000000..73d27753a
--- /dev/null
+++ b/app/soapbox/schemas/poll.ts
@@ -0,0 +1,50 @@
+import escapeTextContentForBrowser from 'escape-html';
+import { z } from 'zod';
+
+import emojify from 'soapbox/features/emoji';
+
+import { customEmojiSchema } from './custom-emoji';
+import { filteredArray, makeCustomEmojiMap } from './utils';
+
+const pollOptionSchema = z.object({
+  title: z.string().catch(''),
+  votes_count: z.number().catch(0),
+});
+
+const pollSchema = z.object({
+  emojis: filteredArray(customEmojiSchema),
+  expired: z.boolean().catch(false),
+  expires_at: z.string().datetime().catch(new Date().toUTCString()),
+  id: z.string(),
+  multiple: z.boolean().catch(false),
+  options: z.array(pollOptionSchema).min(2),
+  voters_count: z.number().catch(0),
+  votes_count: z.number().catch(0),
+  own_votes: z.array(z.number()).nonempty().nullable().catch(null),
+  voted: z.boolean().catch(false),
+  pleroma: z.object({
+    non_anonymous: z.boolean().catch(false),
+  }).optional().catch(undefined),
+}).transform((poll) => {
+  const emojiMap = makeCustomEmojiMap(poll.emojis);
+
+  const emojifiedOptions = poll.options.map((option) => ({
+    ...option,
+    title_emojified: emojify(escapeTextContentForBrowser(option.title), emojiMap),
+  }));
+
+  // If the user has votes, they have certainly voted.
+  if (poll.own_votes?.length) {
+    poll.voted = true;
+  }
+
+  return {
+    ...poll,
+    options: emojifiedOptions,
+  };
+});
+
+type Poll = z.infer<typeof pollSchema>;
+type PollOption = Poll['options'][number];
+
+export { pollSchema, type Poll, type PollOption };
\ No newline at end of file
diff --git a/app/soapbox/schemas/soapbox/ad.ts b/app/soapbox/schemas/soapbox/ad.ts
index 343b519b2..40dc05fb3 100644
--- a/app/soapbox/schemas/soapbox/ad.ts
+++ b/app/soapbox/schemas/soapbox/ad.ts
@@ -5,7 +5,7 @@ import { cardSchema } from '../card';
 const adSchema = z.object({
   card: cardSchema,
   impression: z.string().optional().catch(undefined),
-  expires_at: z.string().optional().catch(undefined),
+  expires_at: z.string().datetime().optional().catch(undefined),
   reason: z.string().optional().catch(undefined),
 });
 
diff --git a/app/soapbox/types/entities.ts b/app/soapbox/types/entities.ts
index e99aa3acf..712a89e23 100644
--- a/app/soapbox/types/entities.ts
+++ b/app/soapbox/types/entities.ts
@@ -18,8 +18,6 @@ import {
   LocationRecord,
   MentionRecord,
   NotificationRecord,
-  PollRecord,
-  PollOptionRecord,
   StatusEditRecord,
   StatusRecord,
   TagRecord,
@@ -47,8 +45,6 @@ type List = ReturnType<typeof ListRecord>;
 type Location = ReturnType<typeof LocationRecord>;
 type Mention = ReturnType<typeof MentionRecord>;
 type Notification = ReturnType<typeof NotificationRecord>;
-type Poll = ReturnType<typeof PollRecord>;
-type PollOption = ReturnType<typeof PollOptionRecord>;
 type StatusEdit = ReturnType<typeof StatusEditRecord>;
 type Tag = ReturnType<typeof TagRecord>;
 
@@ -89,8 +85,6 @@ export {
   Location,
   Mention,
   Notification,
-  Poll,
-  PollOption,
   Status,
   StatusEdit,
   Tag,
@@ -106,5 +100,7 @@ export type {
   Group,
   GroupMember,
   GroupRelationship,
+  Poll,
+  PollOption,
   Relationship,
 } from 'soapbox/schemas';
\ No newline at end of file

From ebaff75e388c8167c143002fa041249b936102a6 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 3 May 2023 14:03:13 -0400
Subject: [PATCH 257/298] Improve Group UX

---
 .../api/hooks/groups/useGroupMembershipRequests.ts |  3 ++-
 .../components/authorize-reject-buttons.tsx        |  2 +-
 .../features/group/group-membership-requests.tsx   | 14 ++++++++------
 app/soapbox/features/group/manage-group.tsx        | 10 +++++-----
 .../features/ui/components/group-media-panel.tsx   |  4 ++--
 .../manage-group-modal/steps/confirmation-step.tsx |  2 +-
 app/soapbox/locales/en.json                        | 10 +++++-----
 7 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts b/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
index 16ff924c7..a6e068091 100644
--- a/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
+++ b/app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
@@ -14,7 +14,7 @@ function useGroupMembershipRequests(groupId: string) {
 
   const { entity: relationship } = useGroupRelationship(groupId);
 
-  const { entities, invalidate, ...rest } = useEntities(
+  const { entities, invalidate, fetchEntities, ...rest } = useEntities(
     path,
     () => api.get(`/api/v1/groups/${groupId}/membership_requests`),
     {
@@ -37,6 +37,7 @@ function useGroupMembershipRequests(groupId: string) {
 
   return {
     accounts: entities,
+    refetch: fetchEntities,
     authorize,
     reject,
     ...rest,
diff --git a/app/soapbox/components/authorize-reject-buttons.tsx b/app/soapbox/components/authorize-reject-buttons.tsx
index a5fddc61a..5dfb37a31 100644
--- a/app/soapbox/components/authorize-reject-buttons.tsx
+++ b/app/soapbox/components/authorize-reject-buttons.tsx
@@ -51,7 +51,7 @@ const AuthorizeRejectButtons: React.FC<IAuthorizeRejectButtons> = ({ onAuthorize
           await action();
           setState(past);
         } catch (e) {
-          console.error(e);
+          if (e) console.error(e);
         }
       };
       if (typeof countdown === 'number') {
diff --git a/app/soapbox/features/group/group-membership-requests.tsx b/app/soapbox/features/group/group-membership-requests.tsx
index e50092887..eebe387bb 100644
--- a/app/soapbox/features/group/group-membership-requests.tsx
+++ b/app/soapbox/features/group/group-membership-requests.tsx
@@ -58,7 +58,7 @@ const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params })
 
   const { group } = useGroup(id);
 
-  const { accounts, authorize, reject, isLoading } = useGroupMembershipRequests(id);
+  const { accounts, authorize, reject, refetch, isLoading } = useGroupMembershipRequests(id);
   const { invalidate } = useGroupMembers(id, GroupRoles.USER);
 
   useEffect(() => {
@@ -80,11 +80,13 @@ const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params })
   }
 
   async function handleAuthorize(account: AccountEntity) {
-    try {
-      await authorize(account.id);
-    } catch (_e) {
-      toast.error(intl.formatMessage(messages.authorizeFail, { name: account.username }));
-    }
+    return authorize(account.id)
+      .then(() => Promise.resolve())
+      .catch(() => {
+        refetch();
+        toast.error(intl.formatMessage(messages.authorizeFail, { name: account.username }));
+        return Promise.reject();
+      });
   }
 
   async function handleReject(account: AccountEntity) {
diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 648593318..d57b8792a 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -16,16 +16,16 @@ import ColumnForbidden from '../ui/components/column-forbidden';
 type RouteParams = { groupId: string };
 
 const messages = defineMessages({
-  heading: { id: 'column.manage_group', defaultMessage: 'Manage group' },
-  editGroup: { id: 'manage_group.edit_group', defaultMessage: 'Edit group' },
+  heading: { id: 'column.manage_group', defaultMessage: 'Manage Group' },
+  editGroup: { id: 'manage_group.edit_group', defaultMessage: 'Edit Group' },
   pendingRequests: { id: 'manage_group.pending_requests', defaultMessage: 'Pending Requests' },
   blockedMembers: { id: 'manage_group.blocked_members', defaultMessage: 'Banned Members' },
-  deleteGroup: { id: 'manage_group.delete_group', defaultMessage: 'Delete group' },
+  deleteGroup: { id: 'manage_group.delete_group', defaultMessage: 'Delete Group' },
   deleteConfirm: { id: 'confirmations.delete_group.confirm', defaultMessage: 'Delete' },
-  deleteHeading: { id: 'confirmations.delete_group.heading', defaultMessage: 'Delete group' },
+  deleteHeading: { id: 'confirmations.delete_group.heading', defaultMessage: 'Delete Group' },
   deleteMessage: { id: 'confirmations.delete_group.message', defaultMessage: 'Are you sure you want to delete this group? This is a permanent action that cannot be undone.' },
   members: { id: 'group.tabs.members', defaultMessage: 'Members' },
-  other: { id: 'settings.other', defaultMessage: 'Other options' },
+  other: { id: 'settings.other', defaultMessage: 'Other Options' },
   deleteSuccess: { id: 'group.delete.success', defaultMessage: 'Group successfully deleted' },
 });
 
diff --git a/app/soapbox/features/ui/components/group-media-panel.tsx b/app/soapbox/features/ui/components/group-media-panel.tsx
index 1d9428f33..9f52af5a2 100644
--- a/app/soapbox/features/ui/components/group-media-panel.tsx
+++ b/app/soapbox/features/ui/components/group-media-panel.tsx
@@ -40,7 +40,7 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
   useEffect(() => {
     setLoading(true);
 
-    if (group && (isMember || !isPrivate)) {
+    if (group && !group.deleted_at && (isMember || !isPrivate)) {
       dispatch(expandGroupMediaTimeline(group.id))
       // @ts-ignore
         .then(() => setLoading(false))
@@ -72,7 +72,7 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
     }
   };
 
-  if (isPrivate && !isMember) {
+  if ((isPrivate && !isMember) || group?.deleted_at) {
     return null;
   }
 
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index 4c388751f..11244c3c5 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -19,7 +19,7 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
   const intl = useIntl();
 
   const handleCopyLink = () => {
-    copy(`${window.location.origin}/group/${group?.slug}`, () => {
+    copy(group?.url as string, () => {
       toast.success(intl.formatMessage(messages.copied));
     });
   };
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 96efd8530..91fad97e0 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -358,7 +358,7 @@
   "column.import_data": "Import data",
   "column.info": "Server information",
   "column.lists": "Lists",
-  "column.manage_group": "Manage group",
+  "column.manage_group": "Manage Group",
   "column.mentions": "Mentions",
   "column.mfa": "Multi-Factor Authentication",
   "column.mfa_cancel": "Cancel",
@@ -491,7 +491,7 @@
   "confirmations.delete_from_group.heading": "Delete from group",
   "confirmations.delete_from_group.message": "Are you sure you want to delete @{name}'s post?",
   "confirmations.delete_group.confirm": "Delete",
-  "confirmations.delete_group.heading": "Delete group",
+  "confirmations.delete_group.heading": "Delete Group",
   "confirmations.delete_group.message": "Are you sure you want to delete this group? This is a permanent action that cannot be undone.",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.heading": "Delete list",
@@ -970,9 +970,9 @@
   "manage_group.confirmation.share": "Share this group",
   "manage_group.confirmation.title": "You’re all set!",
   "manage_group.create": "Create Group",
-  "manage_group.delete_group": "Delete group",
+  "manage_group.delete_group": "Delete Group",
   "manage_group.done": "Done",
-  "manage_group.edit_group": "Edit group",
+  "manage_group.edit_group": "Edit Group",
   "manage_group.fields.cannot_change_hint": "This cannot be changed after the group is created.",
   "manage_group.fields.description_label": "Description",
   "manage_group.fields.description_placeholder": "Description",
@@ -1354,7 +1354,7 @@
   "settings.delete_account": "Delete Account",
   "settings.edit_profile": "Edit Profile",
   "settings.messages.label": "Allow users to start a new chat with you",
-  "settings.other": "Other options",
+  "settings.other": "Other Options",
   "settings.preferences": "Preferences",
   "settings.profile": "Profile",
   "settings.save.success": "Your preferences have been saved!",

From f48edfba456652318451cf46e7fd7e515458d55f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 3 May 2023 13:40:30 -0500
Subject: [PATCH 258/298] Add tagSchema

---
 app/soapbox/schemas/index.ts |  1 +
 app/soapbox/schemas/tag.ts   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 app/soapbox/schemas/tag.ts

diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index 655bffc7f..25f5f3d45 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -8,6 +8,7 @@ export { groupRelationshipSchema, type GroupRelationship } from './group-relatio
 export { groupTagSchema, type GroupTag } from './group-tag';
 export { pollSchema, type Poll, type PollOption } from './poll';
 export { relationshipSchema, type Relationship } from './relationship';
+export { tagSchema, type Tag } from './tag';
 
 // Soapbox
 export { adSchema, type Ad } from './soapbox/ad';
\ No newline at end of file
diff --git a/app/soapbox/schemas/tag.ts b/app/soapbox/schemas/tag.ts
new file mode 100644
index 000000000..5f74a31c7
--- /dev/null
+++ b/app/soapbox/schemas/tag.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+const historySchema = z.object({
+  accounts: z.coerce.number(),
+  uses: z.coerce.number(),
+});
+
+/** // https://docs.joinmastodon.org/entities/tag */
+const tagSchema = z.object({
+  name: z.string().min(1),
+  url: z.string().url().catch(''),
+  history: z.array(historySchema).nullable().catch(null),
+  following: z.boolean().catch(false),
+});
+
+type Tag = z.infer<typeof tagSchema>;
+
+export { tagSchema, type Tag };
\ No newline at end of file

From 08b2f0446d49f4b6bd9e3a550cc6b5e0f8739f41 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 3 May 2023 14:29:57 -0500
Subject: [PATCH 259/298] DetailedStatus: remove timestamp from account

---
 app/soapbox/features/status/components/detailed-status.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx
index 2959d285d..15f2e86e8 100644
--- a/app/soapbox/features/status/components/detailed-status.tsx
+++ b/app/soapbox/features/status/components/detailed-status.tsx
@@ -125,7 +125,6 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
           <Account
             key={account.id}
             account={account}
-            timestamp={actualStatus.created_at}
             avatarSize={42}
             hideActions
             approvalStatus={actualStatus.approval_status}

From 04811c461842e4e2340d66a91df40b76141b3264 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 3 May 2023 14:37:41 -0500
Subject: [PATCH 260/298] InteractionCounter: use neutral colors

---
 .../features/status/components/status-interaction-bar.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/status/components/status-interaction-bar.tsx b/app/soapbox/features/status/components/status-interaction-bar.tsx
index 87b9a234c..0dc6b1c08 100644
--- a/app/soapbox/features/status/components/status-interaction-bar.tsx
+++ b/app/soapbox/features/status/components/status-interaction-bar.tsx
@@ -230,7 +230,7 @@ const InteractionCounter: React.FC<IInteractionCounter> = ({ count, onClick, chi
       }
     >
       <HStack space={1} alignItems='center'>
-        <Text theme='primary' weight='bold'>
+        <Text weight='bold'>
           {shortNumberFormat(count)}
         </Text>
 

From 4f081abb7add7f1a9d8efb83b3af23db400af6eb Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 4 May 2023 08:14:43 -0400
Subject: [PATCH 261/298] d

---
 .../group/group-membership-requests.tsx         | 17 +++++++++--------
 app/soapbox/locales/en.json                     |  3 +--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/soapbox/features/group/group-membership-requests.tsx b/app/soapbox/features/group/group-membership-requests.tsx
index eebe387bb..2ea708c3d 100644
--- a/app/soapbox/features/group/group-membership-requests.tsx
+++ b/app/soapbox/features/group/group-membership-requests.tsx
@@ -17,8 +17,7 @@ type RouteParams = { groupId: string };
 
 const messages = defineMessages({
   heading: { id: 'column.group_pending_requests', defaultMessage: 'Pending requests' },
-  authorizeFail: { id: 'group.group_mod_authorize.fail', defaultMessage: 'Failed to approve @{name}' },
-  rejectFail: { id: 'group.group_mod_reject.fail', defaultMessage: 'Failed to reject @{name}' },
+  authorizeRejectFail: { id: 'group.membership_requests.fail', defaultMessage: 'Group owner or admin has already taken action on this request.' },
 });
 
 interface IMembershipRequest {
@@ -84,17 +83,19 @@ const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params })
       .then(() => Promise.resolve())
       .catch(() => {
         refetch();
-        toast.error(intl.formatMessage(messages.authorizeFail, { name: account.username }));
+        toast.error(intl.formatMessage(messages.authorizeRejectFail));
         return Promise.reject();
       });
   }
 
   async function handleReject(account: AccountEntity) {
-    try {
-      await reject(account.id);
-    } catch (_e) {
-      toast.error(intl.formatMessage(messages.rejectFail, { name: account.username }));
-    }
+    return reject(account.id)
+      .then(() => Promise.resolve())
+      .catch(() => {
+        refetch();
+        toast.error(intl.formatMessage(messages.authorizeRejectFail));
+        return Promise.reject();
+      });
   }
 
   return (
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 91fad97e0..2c81f307f 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -773,14 +773,12 @@
   "group.delete.success": "Group successfully deleted",
   "group.deleted.message": "This group has been deleted.",
   "group.demote.user.success": "@{name} is now a member",
-  "group.group_mod_authorize.fail": "Failed to approve @{name}",
   "group.group_mod_block": "Ban from group",
   "group.group_mod_block.success": "@{name} is banned",
   "group.group_mod_demote": "Remove {role} role",
   "group.group_mod_kick": "Kick @{name} from group",
   "group.group_mod_kick.success": "Kicked @{name} from group",
   "group.group_mod_promote_mod": "Assign {role} role",
-  "group.group_mod_reject.fail": "Failed to reject @{name}",
   "group.group_mod_unblock": "Unban",
   "group.group_mod_unblock.success": "Unbanned @{name} from group",
   "group.header.alt": "Group header",
@@ -794,6 +792,7 @@
   "group.manage": "Manage Group",
   "group.member.admin.limit.summary": "You can assign up to {count} admins for the group at this time.",
   "group.member.admin.limit.title": "Admin limit reached",
+  "group.membership_requests.fail": "Group owner or admin has already taken action on this request.",
   "group.popover.action": "View Group",
   "group.popover.summary": "You must be a member of the group in order to reply to this status.",
   "group.popover.title": "Membership required",

From 9e33dc80aee010e93642e833561484d862380677 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 4 May 2023 09:24:37 -0400
Subject: [PATCH 262/298] Remove search term after navigating away from Search
 page

---
 app/soapbox/features/compose/components/search.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/compose/components/search.tsx b/app/soapbox/features/compose/components/search.tsx
index 0e50fc0be..3a3bdcd6b 100644
--- a/app/soapbox/features/compose/components/search.tsx
+++ b/app/soapbox/features/compose/components/search.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import debounce from 'lodash/debounce';
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 
@@ -135,6 +135,18 @@ const Search = (props: ISearch) => {
     componentProps.autoSelect = false;
   }
 
+  useEffect(() => {
+    return () => {
+      const newPath = history.location.pathname;
+      const shouldPersistSearch = !!newPath.match(/@.+\/posts\/\d+/g)
+        || !!newPath.match(/\/tags\/.+/g);
+
+      if (!shouldPersistSearch) {
+        dispatch(changeSearch(''));
+      }
+    };
+  }, []);
+
   return (
     <div className='w-full'>
       <label htmlFor='search' className='sr-only'>{intl.formatMessage(messages.placeholder)}</label>

From 8ebaca0b44a8613da2ac9e4349b74591141b5805 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 4 May 2023 09:48:39 -0400
Subject: [PATCH 263/298] Remove group search inside global search

---
 app/soapbox/actions/search.ts                 | 10 +----
 app/soapbox/containers/group-container.tsx    | 24 ------------
 .../compose/components/search-results.tsx     | 39 +------------------
 3 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 app/soapbox/containers/group-container.tsx

diff --git a/app/soapbox/actions/search.ts b/app/soapbox/actions/search.ts
index 6d64b6534..a2f165ac0 100644
--- a/app/soapbox/actions/search.ts
+++ b/app/soapbox/actions/search.ts
@@ -1,7 +1,7 @@
 import api 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,10 +83,6 @@ const submitSearch = (filter?: SearchFilter) =>
         dispatch(importFetchedStatuses(response.data.statuses));
       }
 
-      if (response.data.groups) {
-        dispatch(importFetchedGroups(response.data.groups));
-      }
-
       dispatch(fetchSearchSuccess(response.data, value, type));
       dispatch(fetchRelationships(response.data.accounts.map((item: APIEntity) => item.id)));
     }).catch(error => {
@@ -143,10 +139,6 @@ const expandSearch = (type: SearchFilter) => (dispatch: AppDispatch, getState: (
       dispatch(importFetchedStatuses(data.statuses));
     }
 
-    if (data.groups) {
-      dispatch(importFetchedGroups(data.groups));
-    }
-
     dispatch(expandSearchSuccess(data, value, type));
     dispatch(fetchRelationships(data.accounts.map((item: APIEntity) => item.id)));
   }).catch(error => {
diff --git a/app/soapbox/containers/group-container.tsx b/app/soapbox/containers/group-container.tsx
deleted file mode 100644
index f1254b2ca..000000000
--- a/app/soapbox/containers/group-container.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React, { useCallback } from 'react';
-
-import GroupCard from 'soapbox/components/group-card';
-import { useAppSelector } from 'soapbox/hooks';
-import { makeGetGroup } from 'soapbox/selectors';
-
-interface IGroupContainer {
-  id: string
-}
-
-const GroupContainer: React.FC<IGroupContainer> = (props) => {
-  const { id, ...rest } = props;
-
-  const getGroup = useCallback(makeGetGroup(), []);
-  const group = useAppSelector(state => getGroup(state, id));
-
-  if (group) {
-    return <GroupCard group={group} {...rest} />;
-  } else {
-    return null;
-  }
-};
-
-export default GroupContainer;
diff --git a/app/soapbox/features/compose/components/search-results.tsx b/app/soapbox/features/compose/components/search-results.tsx
index 0962f7429..fe7a66d22 100644
--- a/app/soapbox/features/compose/components/search-results.tsx
+++ b/app/soapbox/features/compose/components/search-results.tsx
@@ -9,13 +9,11 @@ import IconButton from 'soapbox/components/icon-button';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { HStack, Tabs, Text } from 'soapbox/components/ui';
 import AccountContainer from 'soapbox/containers/account-container';
-import GroupContainer from 'soapbox/containers/group-container';
 import StatusContainer from 'soapbox/containers/status-container';
 import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder-account';
-import PlaceholderGroupCard from 'soapbox/features/placeholder/components/placeholder-group-card';
 import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder-hashtag';
 import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status';
-import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 
 import type { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import type { VirtuosoHandle } from 'react-virtuoso';
@@ -24,7 +22,6 @@ import type { SearchFilter } from 'soapbox/reducers/search';
 const messages = defineMessages({
   accounts: { id: 'search_results.accounts', defaultMessage: 'People' },
   statuses: { id: 'search_results.statuses', defaultMessage: 'Posts' },
-  groups: { id: 'search_results.groups', defaultMessage: 'Groups' },
   hashtags: { id: 'search_results.hashtags', defaultMessage: 'Hashtags' },
 });
 
@@ -33,7 +30,6 @@ const SearchResults = () => {
 
   const intl = useIntl();
   const dispatch = useAppDispatch();
-  const features = useFeatures();
 
   const value = useAppSelector((state) => state.search.submittedValue);
   const results = useAppSelector((state) => state.search.results);
@@ -66,14 +62,6 @@ const SearchResults = () => {
       },
     );
 
-    if (features.groups) items.push(
-      {
-        text: intl.formatMessage(messages.groups),
-        action: () => selectFilter('groups'),
-        name: 'groups',
-      },
-    );
-
     items.push(
       {
         text: intl.formatMessage(messages.hashtags),
@@ -186,31 +174,6 @@ const SearchResults = () => {
     }
   }
 
-  if (selectedFilter === 'groups') {
-    hasMore = results.groupsHasMore;
-    loaded = results.groupsLoaded;
-    placeholderComponent = PlaceholderGroupCard;
-
-    if (results.groups && results.groups.size > 0) {
-      searchResults = results.groups.map((groupId: string) => (
-        <GroupContainer id={groupId} />
-      ));
-      resultsIds = results.groups;
-    } else if (!submitted && trendingStatuses && !trendingStatuses.isEmpty()) {
-      searchResults = null;
-    } else if (loaded) {
-      noResultsMessage = (
-        <div className='empty-column-indicator'>
-          <FormattedMessage
-            id='empty_column.search.groups'
-            defaultMessage='There are no groups results for "{term}"'
-            values={{ term: value }}
-          />
-        </div>
-      );
-    }
-  }
-
   if (selectedFilter === 'hashtags') {
     hasMore = results.hashtagsHasMore;
     loaded = results.hashtagsLoaded;

From 55ebc8c6eecf66a32d4b29b07693d54dc80a7a47 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 4 May 2023 10:24:34 -0500
Subject: [PATCH 264/298] Add notificationSchema

---
 app/soapbox/schemas/chat-message.ts   |  10 +++
 app/soapbox/schemas/emoji-reaction.ts |   3 +-
 app/soapbox/schemas/notification.ts   | 104 ++++++++++++++++++++++++++
 app/soapbox/schemas/utils.ts          |   5 +-
 4 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 app/soapbox/schemas/chat-message.ts
 create mode 100644 app/soapbox/schemas/notification.ts

diff --git a/app/soapbox/schemas/chat-message.ts b/app/soapbox/schemas/chat-message.ts
new file mode 100644
index 000000000..a64ffec0b
--- /dev/null
+++ b/app/soapbox/schemas/chat-message.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+import { normalizeChatMessage } from 'soapbox/normalizers';
+import { toSchema } from 'soapbox/utils/normalizers';
+
+const chatMessageSchema = toSchema(normalizeChatMessage);
+
+type ChatMessage = z.infer<typeof chatMessageSchema>;
+
+export { chatMessageSchema, type ChatMessage };
\ No newline at end of file
diff --git a/app/soapbox/schemas/emoji-reaction.ts b/app/soapbox/schemas/emoji-reaction.ts
index 55c1762a0..28271fe29 100644
--- a/app/soapbox/schemas/emoji-reaction.ts
+++ b/app/soapbox/schemas/emoji-reaction.ts
@@ -1,7 +1,6 @@
 import { z } from 'zod';
 
-/** Validates the string as an emoji. */
-const emojiSchema = z.string().refine((v) => /\p{Extended_Pictographic}/u.test(v));
+import { emojiSchema } from './utils';
 
 /** Pleroma emoji reaction. */
 const emojiReactionSchema = z.object({
diff --git a/app/soapbox/schemas/notification.ts b/app/soapbox/schemas/notification.ts
new file mode 100644
index 000000000..3c77de6bf
--- /dev/null
+++ b/app/soapbox/schemas/notification.ts
@@ -0,0 +1,104 @@
+import { z } from 'zod';
+
+import { accountSchema } from './account';
+import { chatMessageSchema } from './chat-message';
+import { statusSchema } from './status';
+import { emojiSchema } from './utils';
+
+const baseNotificationSchema = z.object({
+  account: accountSchema,
+  created_at: z.string().datetime().catch(new Date().toUTCString()),
+  id: z.string(),
+  type: z.string(),
+  total_count: z.number().optional().catch(undefined), // TruthSocial
+});
+
+const mentionNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('mention'),
+  status: statusSchema,
+});
+
+const statusNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('status'),
+  status: statusSchema,
+});
+
+const reblogNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('reblog'),
+  status: statusSchema,
+});
+
+const followNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('follow'),
+});
+
+const followRequestNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('follow_request'),
+});
+
+const favouriteNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('favourite'),
+  status: statusSchema,
+});
+
+const pollNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('poll'),
+  status: statusSchema,
+});
+
+const updateNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('update'),
+  status: statusSchema,
+});
+
+const moveNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('move'),
+  target: accountSchema,
+});
+
+const chatMessageNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('chat_message'),
+  chat_message: chatMessageSchema,
+});
+
+const emojiReactionNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('pleroma:emoji_reaction'),
+  emoji: emojiSchema,
+  emoji_url: z.string().url().optional().catch(undefined),
+});
+
+const eventReminderNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('pleroma:event_reminder'),
+  status: statusSchema,
+});
+
+const participationRequestNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('pleroma:participation_request'),
+  status: statusSchema,
+});
+
+const participationAcceptedNotificationSchema = baseNotificationSchema.extend({
+  type: z.literal('pleroma:participation_accepted'),
+  status: statusSchema,
+});
+
+const notificationSchema = z.discriminatedUnion('type', [
+  mentionNotificationSchema,
+  statusNotificationSchema,
+  reblogNotificationSchema,
+  followNotificationSchema,
+  followRequestNotificationSchema,
+  favouriteNotificationSchema,
+  pollNotificationSchema,
+  updateNotificationSchema,
+  moveNotificationSchema,
+  chatMessageNotificationSchema,
+  emojiReactionNotificationSchema,
+  eventReminderNotificationSchema,
+  participationRequestNotificationSchema,
+  participationAcceptedNotificationSchema,
+]);
+
+type Notification = z.infer<typeof notificationSchema>;
+
+export { notificationSchema, type Notification };
\ No newline at end of file
diff --git a/app/soapbox/schemas/utils.ts b/app/soapbox/schemas/utils.ts
index 5a62fa0c6..1e53e11aa 100644
--- a/app/soapbox/schemas/utils.ts
+++ b/app/soapbox/schemas/utils.ts
@@ -13,6 +13,9 @@ function filteredArray<T extends z.ZodTypeAny>(schema: T) {
     ));
 }
 
+/** Validates the string as an emoji. */
+const emojiSchema = z.string().refine((v) => /\p{Extended_Pictographic}/u.test(v));
+
 /** Map a list of CustomEmoji to their shortcodes. */
 function makeCustomEmojiMap(customEmojis: CustomEmoji[]) {
   return customEmojis.reduce<Record<string, CustomEmoji>>((result, emoji) => {
@@ -21,4 +24,4 @@ function makeCustomEmojiMap(customEmojis: CustomEmoji[]) {
   }, {});
 }
 
-export { filteredArray, makeCustomEmojiMap };
\ No newline at end of file
+export { filteredArray, makeCustomEmojiMap, emojiSchema };
\ No newline at end of file

From 074c3c5b3986c8d46e4b224286b3345e39ffb305 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 4 May 2023 11:26:31 -0500
Subject: [PATCH 265/298] Add attachmentSchema

---
 app/soapbox/schemas/attachment.ts | 89 +++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 app/soapbox/schemas/attachment.ts

diff --git a/app/soapbox/schemas/attachment.ts b/app/soapbox/schemas/attachment.ts
new file mode 100644
index 000000000..44b9cb126
--- /dev/null
+++ b/app/soapbox/schemas/attachment.ts
@@ -0,0 +1,89 @@
+import { isBlurhashValid } from 'blurhash';
+import { z } from 'zod';
+
+const blurhashSchema = z.string().superRefine((value, ctx) => {
+  const r = isBlurhashValid(value);
+
+  if (!r.result) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: r.errorReason,
+    });
+  }
+});
+
+const baseAttachmentSchema = z.object({
+  blurhash: blurhashSchema.nullable().catch(null),
+  description: z.string().catch(''),
+  external_video_id: z.string().optional().catch(undefined), // TruthSocial
+  id: z.string(),
+  pleroma: z.object({
+    mime_type: z.string().regex(/^\w+\/[-+.\w]+$/),
+  }).optional().catch(undefined),
+  preview_url: z.string().url().catch(''),
+  remote_url: z.string().url().nullable().catch(null),
+  type: z.string(),
+  url: z.string().url(),
+});
+
+const imageMetaSchema = z.object({
+  width: z.number(),
+  height: z.number(),
+  aspect: z.number().optional().catch(undefined),
+}).transform((meta) => ({
+  ...meta,
+  aspect: typeof meta.aspect === 'number' ? meta.aspect : meta.width / meta.height,
+}));
+
+const imageAttachmentSchema = baseAttachmentSchema.extend({
+  type: z.literal('image'),
+  meta: z.object({
+    original: imageMetaSchema.optional().catch(undefined),
+  }).catch({}),
+});
+
+const videoAttachmentSchema = baseAttachmentSchema.extend({
+  type: z.literal('video'),
+  meta: z.object({
+    duration: z.number().optional().catch(undefined),
+    original: imageMetaSchema.optional().catch(undefined),
+  }).catch({}),
+});
+
+const gifvAttachmentSchema = baseAttachmentSchema.extend({
+  type: z.literal('gifv'),
+  meta: z.object({
+    duration: z.number().optional().catch(undefined),
+    original: imageMetaSchema.optional().catch(undefined),
+  }).catch({}),
+});
+
+const audioAttachmentSchema = baseAttachmentSchema.extend({
+  type: z.literal('audio'),
+  meta: z.object({
+    duration: z.number().optional().catch(undefined),
+  }).catch({}),
+});
+
+const unknownAttachmentSchema = baseAttachmentSchema.extend({
+  type: z.literal('unknown'),
+});
+
+/** https://docs.joinmastodon.org/entities/attachment */
+const attachmentSchema = z.discriminatedUnion('type', [
+  imageAttachmentSchema,
+  videoAttachmentSchema,
+  gifvAttachmentSchema,
+  audioAttachmentSchema,
+  unknownAttachmentSchema,
+]).transform((attachment) => {
+  if (!attachment.preview_url) {
+    attachment.preview_url = attachment.url;
+  }
+
+  return attachment;
+});
+
+type Attachment = z.infer<typeof attachmentSchema>;
+
+export { attachmentSchema, type Attachment };
\ No newline at end of file

From a7e1350a6505a700b3b23c5d58fd0b6c20dedd59 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 4 May 2023 11:31:58 -0500
Subject: [PATCH 266/298] Add real chatMessageSchema

---
 app/soapbox/schemas/chat-message.ts | 22 +++++++++++++++++++---
 app/soapbox/schemas/tag.ts          |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/schemas/chat-message.ts b/app/soapbox/schemas/chat-message.ts
index a64ffec0b..121ef9d5f 100644
--- a/app/soapbox/schemas/chat-message.ts
+++ b/app/soapbox/schemas/chat-message.ts
@@ -1,9 +1,25 @@
 import { z } from 'zod';
 
-import { normalizeChatMessage } from 'soapbox/normalizers';
-import { toSchema } from 'soapbox/utils/normalizers';
+import { attachmentSchema } from './attachment';
+import { cardSchema } from './card';
+import { customEmojiSchema } from './custom-emoji';
+import { emojiSchema, filteredArray } from './utils';
 
-const chatMessageSchema = toSchema(normalizeChatMessage);
+const chatMessageSchema = z.object({
+  account_id: z.string(),
+  media_attachments: filteredArray(attachmentSchema),
+  card: cardSchema.nullable().catch(null),
+  chat_id: z.string(),
+  content: z.string().catch(''),
+  created_at: z.string().datetime().catch(new Date().toUTCString()),
+  emojis: filteredArray(customEmojiSchema),
+  expiration: z.number().optional().catch(undefined),
+  emoji_reactions: z.array(emojiSchema).min(1).nullable().catch(null),
+  id: z.string(),
+  unread: z.coerce.boolean(),
+  deleting: z.coerce.boolean(),
+  pending: z.coerce.boolean(),
+});
 
 type ChatMessage = z.infer<typeof chatMessageSchema>;
 
diff --git a/app/soapbox/schemas/tag.ts b/app/soapbox/schemas/tag.ts
index 5f74a31c7..22e903d60 100644
--- a/app/soapbox/schemas/tag.ts
+++ b/app/soapbox/schemas/tag.ts
@@ -5,7 +5,7 @@ const historySchema = z.object({
   uses: z.coerce.number(),
 });
 
-/** // https://docs.joinmastodon.org/entities/tag */
+/** https://docs.joinmastodon.org/entities/tag */
 const tagSchema = z.object({
   name: z.string().min(1),
   url: z.string().url().catch(''),

From 1dec42cd9fcb2e56c3dbb383a5d4c3bd453a09c2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 4 May 2023 11:42:20 -0500
Subject: [PATCH 267/298] Add contentSchema helper

---
 app/soapbox/schemas/account.ts      | 4 ++--
 app/soapbox/schemas/chat-message.ts | 4 ++--
 app/soapbox/schemas/utils.ts        | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/schemas/account.ts b/app/soapbox/schemas/account.ts
index 9381edbbd..51202d2e6 100644
--- a/app/soapbox/schemas/account.ts
+++ b/app/soapbox/schemas/account.ts
@@ -5,7 +5,7 @@ import emojify from 'soapbox/features/emoji';
 
 import { customEmojiSchema } from './custom-emoji';
 import { relationshipSchema } from './relationship';
-import { filteredArray, makeCustomEmojiMap } from './utils';
+import { contentSchema, filteredArray, makeCustomEmojiMap } from './utils';
 
 const avatarMissing = require('assets/images/avatar-missing.png');
 const headerMissing = require('assets/images/header-missing.png');
@@ -39,7 +39,7 @@ const accountSchema = z.object({
     z.string(),
     z.null(),
   ]).catch(null),
-  note: z.string().catch(''),
+  note: contentSchema,
   pleroma: z.any(), // TODO
   source: z.any(), // TODO
   statuses_count: z.number().catch(0),
diff --git a/app/soapbox/schemas/chat-message.ts b/app/soapbox/schemas/chat-message.ts
index 121ef9d5f..fe0ff0f6b 100644
--- a/app/soapbox/schemas/chat-message.ts
+++ b/app/soapbox/schemas/chat-message.ts
@@ -3,14 +3,14 @@ import { z } from 'zod';
 import { attachmentSchema } from './attachment';
 import { cardSchema } from './card';
 import { customEmojiSchema } from './custom-emoji';
-import { emojiSchema, filteredArray } from './utils';
+import { contentSchema, emojiSchema, filteredArray } from './utils';
 
 const chatMessageSchema = z.object({
   account_id: z.string(),
   media_attachments: filteredArray(attachmentSchema),
   card: cardSchema.nullable().catch(null),
   chat_id: z.string(),
-  content: z.string().catch(''),
+  content: contentSchema,
   created_at: z.string().datetime().catch(new Date().toUTCString()),
   emojis: filteredArray(customEmojiSchema),
   expiration: z.number().optional().catch(undefined),
diff --git a/app/soapbox/schemas/utils.ts b/app/soapbox/schemas/utils.ts
index 1e53e11aa..b64185800 100644
--- a/app/soapbox/schemas/utils.ts
+++ b/app/soapbox/schemas/utils.ts
@@ -2,6 +2,9 @@ import z from 'zod';
 
 import type { CustomEmoji } from './custom-emoji';
 
+/** Ensure HTML content is a string, and drop empty `<p>` tags. */
+const contentSchema = z.string().catch('').transform((value) => value === '<p></p>' ? '' : value);
+
 /** Validates individual items in an array, dropping any that aren't valid. */
 function filteredArray<T extends z.ZodTypeAny>(schema: T) {
   return z.any().array().catch([])
@@ -24,4 +27,4 @@ function makeCustomEmojiMap(customEmojis: CustomEmoji[]) {
   }, {});
 }
 
-export { filteredArray, makeCustomEmojiMap, emojiSchema };
\ No newline at end of file
+export { filteredArray, makeCustomEmojiMap, emojiSchema, contentSchema };
\ No newline at end of file

From 9a6437568187f5338714cd6b1c987d0aae644e79 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 4 May 2023 11:51:50 -0500
Subject: [PATCH 268/298] useGroupMedia: don't use statusSchema directly yet so
 we can change it

---
 app/soapbox/api/hooks/groups/useGroupMedia.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/api/hooks/groups/useGroupMedia.ts b/app/soapbox/api/hooks/groups/useGroupMedia.ts
index 23375bdc7..4db7fd179 100644
--- a/app/soapbox/api/hooks/groups/useGroupMedia.ts
+++ b/app/soapbox/api/hooks/groups/useGroupMedia.ts
@@ -1,7 +1,10 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
 import { useApi } from 'soapbox/hooks/useApi';
-import { statusSchema } from 'soapbox/schemas/status';
+import { normalizeStatus } from 'soapbox/normalizers';
+import { toSchema } from 'soapbox/utils/normalizers';
+
+const statusSchema = toSchema(normalizeStatus);
 
 function useGroupMedia(groupId: string) {
   const api = useApi();

From e024e9212565731a92f21071bc3551284aee3a4c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 4 May 2023 12:13:39 -0500
Subject: [PATCH 269/298] Add a real statusSchema

---
 app/soapbox/schemas/mention.ts | 18 +++++++++++
 app/soapbox/schemas/status.ts  | 57 ++++++++++++++++++++++++++++++++--
 app/soapbox/schemas/utils.ts   |  5 ++-
 3 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 app/soapbox/schemas/mention.ts

diff --git a/app/soapbox/schemas/mention.ts b/app/soapbox/schemas/mention.ts
new file mode 100644
index 000000000..9bbdbff5b
--- /dev/null
+++ b/app/soapbox/schemas/mention.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+const mentionSchema = z.object({
+  acct: z.string(),
+  id: z.string(),
+  url: z.string().url().catch(''),
+  username: z.string().catch(''),
+}).transform((mention) => {
+  if (!mention.username) {
+    mention.username = mention.acct.split('@')[0];
+  }
+
+  return mention;
+});
+
+type Mention = z.infer<typeof mentionSchema>;
+
+export { mentionSchema, type Mention };
\ No newline at end of file
diff --git a/app/soapbox/schemas/status.ts b/app/soapbox/schemas/status.ts
index 66d6f05eb..00fa6d483 100644
--- a/app/soapbox/schemas/status.ts
+++ b/app/soapbox/schemas/status.ts
@@ -1,9 +1,60 @@
 import { z } from 'zod';
 
-import { normalizeStatus } from 'soapbox/normalizers';
-import { toSchema } from 'soapbox/utils/normalizers';
+import { accountSchema } from './account';
+import { attachmentSchema } from './attachment';
+import { cardSchema } from './card';
+import { customEmojiSchema } from './custom-emoji';
+import { groupSchema } from './group';
+import { mentionSchema } from './mention';
+import { pollSchema } from './poll';
+import { tagSchema } from './tag';
+import { contentSchema, dateSchema, filteredArray } from './utils';
 
-const statusSchema = toSchema(normalizeStatus);
+const baseStatusSchema = z.object({
+  account: accountSchema,
+  application: z.object({
+    name: z.string(),
+    website: z.string().url().nullable().catch(null),
+  }).nullable().catch(null),
+  bookmarked: z.coerce.boolean(),
+  card: cardSchema.nullable().catch(null),
+  content: contentSchema,
+  created_at: dateSchema,
+  disliked: z.coerce.boolean(),
+  dislikes_count: z.number().catch(0),
+  edited_at: z.string().datetime().nullable().catch(null),
+  emojis: filteredArray(customEmojiSchema),
+  favourited: z.coerce.boolean(),
+  favourites_count: z.number().catch(0),
+  group: groupSchema.nullable().catch(null),
+  in_reply_to_account_id: z.string().nullable().catch(null),
+  in_reply_to_id: z.string().nullable().catch(null),
+  id: z.string(),
+  language: z.string().nullable().catch(null),
+  media_attachments: filteredArray(attachmentSchema),
+  mentions: filteredArray(mentionSchema),
+  muted: z.coerce.boolean(),
+  pinned: z.coerce.boolean(),
+  pleroma: z.object({}).optional().catch(undefined),
+  poll: pollSchema.nullable().catch(null),
+  quote: z.literal(null).catch(null),
+  quotes_count: z.number().catch(0),
+  reblog: z.literal(null).catch(null),
+  reblogged: z.coerce.boolean(),
+  reblogs_count: z.number().catch(0),
+  replies_count: z.number().catch(0),
+  sensitive: z.coerce.boolean(),
+  spoiler_text: contentSchema,
+  tags: filteredArray(tagSchema),
+  uri: z.string().url().catch(''),
+  url: z.string().url().catch(''),
+  visibility: z.string().catch('public'),
+});
+
+const statusSchema = baseStatusSchema.extend({
+  quote: baseStatusSchema.nullable().catch(null),
+  reblog: baseStatusSchema.nullable().catch(null),
+});
 
 type Status = z.infer<typeof statusSchema>;
 
diff --git a/app/soapbox/schemas/utils.ts b/app/soapbox/schemas/utils.ts
index b64185800..c85b2b2b1 100644
--- a/app/soapbox/schemas/utils.ts
+++ b/app/soapbox/schemas/utils.ts
@@ -5,6 +5,9 @@ import type { CustomEmoji } from './custom-emoji';
 /** Ensure HTML content is a string, and drop empty `<p>` tags. */
 const contentSchema = z.string().catch('').transform((value) => value === '<p></p>' ? '' : value);
 
+/** Validate to Mastodon's date format, or use the current date. */
+const dateSchema = z.string().datetime().catch(new Date().toUTCString());
+
 /** Validates individual items in an array, dropping any that aren't valid. */
 function filteredArray<T extends z.ZodTypeAny>(schema: T) {
   return z.any().array().catch([])
@@ -27,4 +30,4 @@ function makeCustomEmojiMap(customEmojis: CustomEmoji[]) {
   }, {});
 }
 
-export { filteredArray, makeCustomEmojiMap, emojiSchema, contentSchema };
\ No newline at end of file
+export { filteredArray, makeCustomEmojiMap, emojiSchema, contentSchema, dateSchema };
\ No newline at end of file

From 0e7ccd57ae7f8c725ad359129ed7906d823a99ba Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 4 May 2023 12:20:39 -0500
Subject: [PATCH 270/298] Export new schemas

---
 app/soapbox/schemas/account.ts            | 2 +-
 app/soapbox/schemas/custom-emoji.ts       | 2 +-
 app/soapbox/schemas/emoji-reaction.ts     | 2 +-
 app/soapbox/schemas/group-member.ts       | 2 +-
 app/soapbox/schemas/group-relationship.ts | 2 +-
 app/soapbox/schemas/index.ts              | 5 +++++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/schemas/account.ts b/app/soapbox/schemas/account.ts
index 51202d2e6..919013329 100644
--- a/app/soapbox/schemas/account.ts
+++ b/app/soapbox/schemas/account.ts
@@ -121,4 +121,4 @@ const accountSchema = z.object({
 
 type Account = z.infer<typeof accountSchema>;
 
-export { accountSchema, Account };
\ No newline at end of file
+export { accountSchema, type Account };
\ No newline at end of file
diff --git a/app/soapbox/schemas/custom-emoji.ts b/app/soapbox/schemas/custom-emoji.ts
index 68c49c587..1addf026a 100644
--- a/app/soapbox/schemas/custom-emoji.ts
+++ b/app/soapbox/schemas/custom-emoji.ts
@@ -14,4 +14,4 @@ const customEmojiSchema = z.object({
 
 type CustomEmoji = z.infer<typeof customEmojiSchema>;
 
-export { customEmojiSchema, CustomEmoji };
+export { customEmojiSchema, type CustomEmoji };
diff --git a/app/soapbox/schemas/emoji-reaction.ts b/app/soapbox/schemas/emoji-reaction.ts
index 28271fe29..1559148e1 100644
--- a/app/soapbox/schemas/emoji-reaction.ts
+++ b/app/soapbox/schemas/emoji-reaction.ts
@@ -11,4 +11,4 @@ const emojiReactionSchema = z.object({
 
 type EmojiReaction = z.infer<typeof emojiReactionSchema>;
 
-export { emojiReactionSchema, EmojiReaction };
\ No newline at end of file
+export { emojiReactionSchema, type EmojiReaction };
\ No newline at end of file
diff --git a/app/soapbox/schemas/group-member.ts b/app/soapbox/schemas/group-member.ts
index 4521450cb..8135fecb6 100644
--- a/app/soapbox/schemas/group-member.ts
+++ b/app/soapbox/schemas/group-member.ts
@@ -16,4 +16,4 @@ const groupMemberSchema = z.object({
 
 type GroupMember = z.infer<typeof groupMemberSchema>;
 
-export { groupMemberSchema, GroupMember, GroupRoles };
\ No newline at end of file
+export { groupMemberSchema, type GroupMember, GroupRoles };
\ No newline at end of file
diff --git a/app/soapbox/schemas/group-relationship.ts b/app/soapbox/schemas/group-relationship.ts
index 5bf4cae31..baeb55a12 100644
--- a/app/soapbox/schemas/group-relationship.ts
+++ b/app/soapbox/schemas/group-relationship.ts
@@ -14,4 +14,4 @@ const groupRelationshipSchema = z.object({
 
 type GroupRelationship = z.infer<typeof groupRelationshipSchema>;
 
-export { groupRelationshipSchema, GroupRelationship };
\ No newline at end of file
+export { groupRelationshipSchema, type GroupRelationship };
\ No newline at end of file
diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index 25f5f3d45..8e20c0d05 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -1,13 +1,18 @@
 export { accountSchema, type Account } from './account';
+export { attachmentSchema, type Attachment } from './attachment';
 export { cardSchema, type Card } from './card';
+export { chatMessageSchema, type ChatMessage } from './chat-message';
 export { customEmojiSchema, type CustomEmoji } from './custom-emoji';
 export { emojiReactionSchema, type EmojiReaction } from './emoji-reaction';
 export { groupSchema, type Group } from './group';
 export { groupMemberSchema, type GroupMember } from './group-member';
 export { groupRelationshipSchema, type GroupRelationship } from './group-relationship';
 export { groupTagSchema, type GroupTag } from './group-tag';
+export { mentionSchema, type Mention } from './mention';
+export { notificationSchema, type Notification } from './notification';
 export { pollSchema, type Poll, type PollOption } from './poll';
 export { relationshipSchema, type Relationship } from './relationship';
+export { statusSchema, type Status } from './status';
 export { tagSchema, type Tag } from './tag';
 
 // Soapbox

From f1b98e16027821657908b41678b6a35436bc9d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Fri, 5 May 2023 13:18:39 +0200
Subject: [PATCH 271/298] Hide relationship in BirthdayPanel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/components/birthday-panel.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/components/birthday-panel.tsx b/app/soapbox/components/birthday-panel.tsx
index 059b8678b..bcfe5d073 100644
--- a/app/soapbox/components/birthday-panel.tsx
+++ b/app/soapbox/components/birthday-panel.tsx
@@ -58,6 +58,7 @@ const BirthdayPanel = ({ limit }: IBirthdayPanel) => {
           key={accountId}
           // @ts-ignore: TS thinks `id` is passed to <Account>, but it isn't
           id={accountId}
+          withRelationship={false}
         />
       ))}
     </Widget>

From ad6f237a9d8ee5fe547a8daa42a91aa84d349012 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 5 May 2023 08:34:23 -0400
Subject: [PATCH 272/298] Add back 'uses' attribute for specific use-case

---
 app/soapbox/features/group/components/group-tag-list-item.tsx | 2 +-
 app/soapbox/schemas/group-tag.ts                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index 7908bb13d..c076a445e 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -137,7 +137,7 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
             {intl.formatMessage(messages.total)}:
             {' '}
             <Text size='sm' theme='inherit' weight='semibold' tag='span'>
-              {shortNumberFormat(tag.groups)}
+              {shortNumberFormat(tag.uses)}
             </Text>
           </Text>
         </Stack>
diff --git a/app/soapbox/schemas/group-tag.ts b/app/soapbox/schemas/group-tag.ts
index f49162cfd..0d07003ff 100644
--- a/app/soapbox/schemas/group-tag.ts
+++ b/app/soapbox/schemas/group-tag.ts
@@ -5,6 +5,7 @@ const groupTagSchema = z.object({
   name: z.string(),
   groups: z.number().optional(),
   url: z.string().optional(),
+  uses: z.number().optional(),
   pinned: z.boolean().optional().catch(false),
   visible: z.boolean().optional().default(true),
 });

From db91a00aca04f4b27b52309fb4c95852a43735e2 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 5 May 2023 08:35:11 -0400
Subject: [PATCH 273/298] Add more Jest tests for various Group components

---
 .../__tests__/group-header.test.tsx           |  46 +++
 .../__tests__/group-member-list-item.test.tsx | 320 ++++++++++++++++++
 .../__tests__/group-tag-list-item.test.tsx    | 123 +++++++
 .../group/components/group-header.tsx         |  14 +-
 .../components/group-member-list-item.tsx     |   7 +-
 .../group/components/group-tag-list-item.tsx  |   8 +-
 app/soapbox/jest/factory.ts                   |  28 +-
 7 files changed, 537 insertions(+), 9 deletions(-)
 create mode 100644 app/soapbox/features/group/components/__tests__/group-header.test.tsx
 create mode 100644 app/soapbox/features/group/components/__tests__/group-member-list-item.test.tsx
 create mode 100644 app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx

diff --git a/app/soapbox/features/group/components/__tests__/group-header.test.tsx b/app/soapbox/features/group/components/__tests__/group-header.test.tsx
new file mode 100644
index 000000000..03f171e14
--- /dev/null
+++ b/app/soapbox/features/group/components/__tests__/group-header.test.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+
+import { buildGroup } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
+import { Group } from 'soapbox/types/entities';
+
+import GroupHeader from '../group-header';
+
+let group: Group;
+
+describe('<GroupHeader />', () => {
+  describe('without a group', () => {
+    it('should render the blankslate', () => {
+      render(<GroupHeader group={null} />);
+      expect(screen.getByTestId('group-header-missing')).toBeInTheDocument();
+    });
+  });
+
+  describe('when the Group has been deleted', () => {
+    it('only shows name, header, and avatar', () => {
+      group = buildGroup({ display_name: 'my group', deleted_at: new Date().toISOString() });
+      render(<GroupHeader group={group} />);
+
+      expect(screen.queryAllByTestId('group-header-missing')).toHaveLength(0);
+      expect(screen.queryAllByTestId('group-actions')).toHaveLength(0);
+      expect(screen.queryAllByTestId('group-meta')).toHaveLength(0);
+      expect(screen.getByTestId('group-header-image')).toBeInTheDocument();
+      expect(screen.getByTestId('group-avatar')).toBeInTheDocument();
+      expect(screen.getByTestId('group-name')).toBeInTheDocument();
+    });
+  });
+
+  describe('with a valid Group', () => {
+    it('only shows all fields', () => {
+      group = buildGroup({ display_name: 'my group', deleted_at: null });
+      render(<GroupHeader group={group} />);
+
+      expect(screen.queryAllByTestId('group-header-missing')).toHaveLength(0);
+      expect(screen.getByTestId('group-actions')).toBeInTheDocument();
+      expect(screen.getByTestId('group-meta')).toBeInTheDocument();
+      expect(screen.getByTestId('group-header-image')).toBeInTheDocument();
+      expect(screen.getByTestId('group-avatar')).toBeInTheDocument();
+      expect(screen.getByTestId('group-name')).toBeInTheDocument();
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/group/components/__tests__/group-member-list-item.test.tsx b/app/soapbox/features/group/components/__tests__/group-member-list-item.test.tsx
new file mode 100644
index 000000000..abecc3287
--- /dev/null
+++ b/app/soapbox/features/group/components/__tests__/group-member-list-item.test.tsx
@@ -0,0 +1,320 @@
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { __stub } from 'soapbox/api';
+import { buildGroup, buildGroupMember, buildGroupRelationship } from 'soapbox/jest/factory';
+import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
+import { GroupRoles } from 'soapbox/schemas/group-member';
+
+import GroupMemberListItem from '../group-member-list-item';
+
+describe('<GroupMemberListItem />', () => {
+  describe('account rendering', () => {
+    const accountId = '4';
+    const groupMember = buildGroupMember({}, {
+      id: accountId,
+      display_name: 'tiger woods',
+    });
+
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+      });
+    });
+
+    it('should render the users avatar', async () => {
+      const group = buildGroup({
+        relationship: buildGroupRelationship(),
+      });
+
+      render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+      await waitFor(() => {
+        expect(screen.getByTestId('group-member-list-item')).toHaveTextContent(groupMember.account.display_name);
+      });
+    });
+  });
+
+  describe('role badge', () => {
+    const accountId = '4';
+    const group = buildGroup();
+
+    describe('when the user is an Owner', () => {
+      const groupMember = buildGroupMember({ role: GroupRoles.OWNER }, {
+        id: accountId,
+        display_name: 'tiger woods',
+      });
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      it('should render the correct badge', async () => {
+        render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+        await waitFor(() => {
+          expect(screen.getByTestId('role-badge')).toHaveTextContent('owner');
+        });
+      });
+    });
+
+    describe('when the user is an Admin', () => {
+      const groupMember = buildGroupMember({ role: GroupRoles.ADMIN }, {
+        id: accountId,
+        display_name: 'tiger woods',
+      });
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      it('should render the correct badge', async () => {
+        render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+        await waitFor(() => {
+          expect(screen.getByTestId('role-badge')).toHaveTextContent('admin');
+        });
+      });
+    });
+
+    describe('when the user is an User', () => {
+      const groupMember = buildGroupMember({ role: GroupRoles.USER }, {
+        id: accountId,
+        display_name: 'tiger woods',
+      });
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      it('should render no correct badge', async () => {
+        render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+        await waitFor(() => {
+          expect(screen.queryAllByTestId('role-badge')).toHaveLength(0);
+        });
+      });
+    });
+  });
+
+  describe('as a Group owner', () => {
+    const group = buildGroup({
+      relationship: buildGroupRelationship({
+        role: GroupRoles.OWNER,
+        member: true,
+      }),
+    });
+
+    describe('when the user has role of "user"', () => {
+      const accountId = '4';
+      const groupMember = buildGroupMember({}, {
+        id: accountId,
+        display_name: 'tiger woods',
+        username: 'tiger',
+      });
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      describe('when "canPromoteToAdmin is true', () => {
+        it('should render dropdown with correct Owner actions', async () => {
+          const user = userEvent.setup();
+
+          render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+          await waitFor(async() => {
+            await user.click(screen.getByTestId('icon-button'));
+          });
+
+          const dropdownMenu = screen.getByTestId('dropdown-menu');
+          expect(dropdownMenu).toHaveTextContent('Assign admin role');
+          expect(dropdownMenu).toHaveTextContent('Kick @tiger from group');
+          expect(dropdownMenu).toHaveTextContent('Ban from group');
+        });
+      });
+
+      describe('when "canPromoteToAdmin is false', () => {
+        it('should prevent promoting user to Admin', async () => {
+          const user = userEvent.setup();
+
+          render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin={false} />);
+
+          await waitFor(async() => {
+            await user.click(screen.getByTestId('icon-button'));
+            await user.click(screen.getByTitle('Assign admin role'));
+          });
+
+          expect(screen.getByTestId('toast')).toHaveTextContent('Admin limit reached');
+        });
+      });
+    });
+
+    describe('when the user has role of "admin"', () => {
+      const accountId = '4';
+      const groupMember = buildGroupMember(
+        {
+          role: GroupRoles.ADMIN,
+        },
+        {
+          id: accountId,
+          display_name: 'tiger woods',
+          username: 'tiger',
+        },
+      );
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      it('should render dropdown with correct Owner actions', async () => {
+        const user = userEvent.setup();
+
+        render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+        await waitFor(async() => {
+          await user.click(screen.getByTestId('icon-button'));
+        });
+
+        const dropdownMenu = screen.getByTestId('dropdown-menu');
+        expect(dropdownMenu).toHaveTextContent('Remove admin role');
+        expect(dropdownMenu).toHaveTextContent('Kick @tiger from group');
+        expect(dropdownMenu).toHaveTextContent('Ban from group');
+      });
+    });
+  });
+
+  describe('as a Group admin', () => {
+    const group = buildGroup({
+      relationship: buildGroupRelationship({
+        role: GroupRoles.ADMIN,
+        member: true,
+      }),
+    });
+
+    describe('when the user has role of "user"', () => {
+      const accountId = '4';
+      const groupMember = buildGroupMember({}, {
+        id: accountId,
+        display_name: 'tiger woods',
+        username: 'tiger',
+      });
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      it('should render dropdown with correct Admin actions', async () => {
+        const user = userEvent.setup();
+
+        render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+        await waitFor(async() => {
+          await user.click(screen.getByTestId('icon-button'));
+        });
+
+        const dropdownMenu = screen.getByTestId('dropdown-menu');
+        expect(dropdownMenu).not.toHaveTextContent('Assign admin role');
+        expect(dropdownMenu).toHaveTextContent('Kick @tiger from group');
+        expect(dropdownMenu).toHaveTextContent('Ban from group');
+      });
+    });
+
+    describe('when the user has role of "admin"', () => {
+      const accountId = '4';
+      const groupMember = buildGroupMember(
+        {
+          role: GroupRoles.ADMIN,
+        },
+        {
+          id: accountId,
+          display_name: 'tiger woods',
+          username: 'tiger',
+        },
+      );
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      it('should not render the dropdown', async () => {
+        render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+        await waitFor(async() => {
+          expect(screen.queryAllByTestId('icon-button')).toHaveLength(0);
+        });
+      });
+    });
+
+    describe('when the user has role of "owner"', () => {
+      const accountId = '4';
+      const groupMember = buildGroupMember(
+        {
+          role: GroupRoles.OWNER,
+        },
+        {
+          id: accountId,
+          display_name: 'tiger woods',
+          username: 'tiger',
+        },
+      );
+
+      beforeEach(() => {
+        __stub((mock) => {
+          mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+        });
+      });
+
+      it('should not render the dropdown', async () => {
+        render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+        await waitFor(async() => {
+          expect(screen.queryAllByTestId('icon-button')).toHaveLength(0);
+        });
+      });
+    });
+  });
+
+  describe('as a Group user', () => {
+    const group = buildGroup({
+      relationship: buildGroupRelationship({
+        role: GroupRoles.USER,
+        member: true,
+      }),
+    });
+    const accountId = '4';
+    const groupMember = buildGroupMember({}, {
+      id: accountId,
+      display_name: 'tiger woods',
+      username: 'tiger',
+    });
+
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet(`/api/v1/accounts/${accountId}`).reply(200, groupMember.account);
+      });
+    });
+
+    it('should not render the dropdown', async () => {
+      render(<GroupMemberListItem group={group} member={groupMember} canPromoteToAdmin />);
+
+      await waitFor(async() => {
+        expect(screen.queryAllByTestId('icon-button')).toHaveLength(0);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx b/app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx
new file mode 100644
index 000000000..4418fff86
--- /dev/null
+++ b/app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx
@@ -0,0 +1,123 @@
+import React from 'react';
+
+import { buildGroup, buildGroupTag, buildGroupRelationship } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
+import { GroupRoles } from 'soapbox/schemas/group-member';
+
+import GroupTagListItem from '../group-tag-list-item';
+
+describe('<GroupTagListItem />', () => {
+  describe('tag name', () => {
+    const name = 'hello';
+
+    it('should render the tag name', () => {
+      const group = buildGroup();
+      const tag = buildGroupTag({ name });
+      render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+
+      expect(screen.getByTestId('group-tag-list-item')).toHaveTextContent(`#${name}`);
+    });
+
+    describe('when the tag is "visible"', () => {
+      const group = buildGroup();
+      const tag = buildGroupTag({ name, visible: true });
+
+      it('renders the default name', () => {
+        render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+        expect(screen.getByTestId('group-tag-name')).toHaveClass('text-gray-900');
+      });
+    });
+
+    describe('when the tag is not "visible" and user is Owner', () => {
+      const group = buildGroup({
+        relationship: buildGroupRelationship({
+          role: GroupRoles.OWNER,
+          member: true,
+        }),
+      });
+      const tag = buildGroupTag({
+        name,
+        visible: false,
+      });
+
+      it('renders the subtle name', () => {
+        render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+        expect(screen.getByTestId('group-tag-name')).toHaveClass('text-gray-400');
+      });
+    });
+
+    describe('when the tag is not "visible" and user is Admin or User', () => {
+      const group = buildGroup({
+        relationship: buildGroupRelationship({
+          role: GroupRoles.ADMIN,
+          member: true,
+        }),
+      });
+      const tag = buildGroupTag({
+        name,
+        visible: false,
+      });
+
+      it('renders the subtle name', () => {
+        render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+        expect(screen.getByTestId('group-tag-name')).toHaveClass('text-gray-900');
+      });
+    });
+  });
+
+  describe('pinning', () => {
+    describe('as an owner', () => {
+      const group = buildGroup({
+        relationship: buildGroupRelationship({
+          role: GroupRoles.OWNER,
+          member: true,
+        }),
+      });
+
+      describe('when the tag is visible', () => {
+        const tag = buildGroupTag({ visible: true });
+
+        it('renders the pin icon', () => {
+          render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+          expect(screen.getByTestId('pin-icon')).toBeInTheDocument();
+        });
+      });
+
+      describe('when the tag is not visible', () => {
+        const tag = buildGroupTag({ visible: false });
+
+        it('does not render the pin icon', () => {
+          render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+          expect(screen.queryAllByTestId('pin-icon')).toHaveLength(0);
+        });
+      });
+
+      describe('as a non-owner', () => {
+        const group = buildGroup({
+          relationship: buildGroupRelationship({
+            role: GroupRoles.ADMIN,
+            member: true,
+          }),
+        });
+
+        describe('when the tag is visible', () => {
+          const tag = buildGroupTag({ visible: true });
+
+          it('does not render the pin icon', () => {
+            render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+            expect(screen.queryAllByTestId('pin-icon')).toHaveLength(0);
+          });
+        });
+
+        describe('when the tag is not visible', () => {
+          const tag = buildGroupTag({ visible: false });
+
+          it('does not render the pin icon', () => {
+            render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+            expect(screen.queryAllByTestId('pin-icon')).toHaveLength(0);
+          });
+        });
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/features/group/components/group-header.tsx b/app/soapbox/features/group/components/group-header.tsx
index 9626906d5..ad22e1e13 100644
--- a/app/soapbox/features/group/components/group-header.tsx
+++ b/app/soapbox/features/group/components/group-header.tsx
@@ -34,7 +34,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
 
   if (!group) {
     return (
-      <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6'>
+      <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6' data-testid='group-header-missing'>
         <div>
           <div className='relative h-32 w-full bg-gray-200 dark:bg-gray-900/50 md:rounded-t-xl lg:h-48' />
         </div>
@@ -107,7 +107,10 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
     }
 
     return (
-      <div className='flex h-32 w-full items-center justify-center bg-gray-200 dark:bg-gray-800/30 md:rounded-t-xl lg:h-52'>
+      <div
+        data-testid='group-header-image'
+        className='flex h-32 w-full items-center justify-center bg-gray-200 dark:bg-gray-800/30 md:rounded-t-xl lg:h-52'
+      >
         {isHeaderMissing ? (
           <Icon src={require('@tabler/icons/photo-off.svg')} className='h-6 w-6 text-gray-500 dark:text-gray-700' />
         ) : header}
@@ -120,7 +123,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
       <div className='relative'>
         {renderHeader()}
 
-        <div className='absolute bottom-0 left-1/2 -translate-x-1/2 translate-y-1/2'>
+        <div className='absolute bottom-0 left-1/2 -translate-x-1/2 translate-y-1/2' data-testid='group-avatar'>
           <a href={group.avatar} onClick={handleAvatarClick} target='_blank'>
             <GroupAvatar
               group={group}
@@ -136,11 +139,12 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
           size='xl'
           weight='bold'
           dangerouslySetInnerHTML={{ __html: group.display_name_html }}
+          data-testid='group-name'
         />
 
         {!isDeleted && (
           <>
-            <Stack space={1} alignItems='center'>
+            <Stack data-testid='group-meta' space={1} alignItems='center'>
               <HStack className='text-gray-700 dark:text-gray-600' space={2} wrap>
                 <GroupRelationship group={group} />
                 <GroupPrivacy group={group} />
@@ -154,7 +158,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
               />
             </Stack>
 
-            <HStack alignItems='center' space={2}>
+            <HStack alignItems='center' space={2} data-testid='group-actions'>
               <GroupOptionsButton group={group} />
               <GroupActionButton group={group} />
             </HStack>
diff --git a/app/soapbox/features/group/components/group-member-list-item.tsx b/app/soapbox/features/group/components/group-member-list-item.tsx
index d2226879a..f9b18735d 100644
--- a/app/soapbox/features/group/components/group-member-list-item.tsx
+++ b/app/soapbox/features/group/components/group-member-list-item.tsx
@@ -180,7 +180,11 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   }
 
   return (
-    <HStack alignItems='center' justifyContent='between'>
+    <HStack
+      alignItems='center'
+      justifyContent='between'
+      data-testid='group-member-list-item'
+    >
       <div className='w-full'>
         <Account account={member.account} withRelationship={false} />
       </div>
@@ -188,6 +192,7 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
       <HStack alignItems='center' space={2}>
         {(isMemberOwner || isMemberAdmin) ? (
           <span
+            data-testid='role-badge'
             className={
               clsx('inline-flex items-center rounded px-2 py-1 text-xs font-medium capitalize', {
                 'bg-primary-200 text-primary-500': isMemberOwner,
diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index c076a445e..bf02cc202 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -102,6 +102,7 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
                 require('@tabler/icons/pin.svg')
             }
             iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
+            data-testid='pin-icon'
           />
         </Tooltip>
       );
@@ -123,13 +124,18 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
   };
 
   return (
-    <HStack alignItems='center' justifyContent='between'>
+    <HStack
+      alignItems='center'
+      justifyContent='between'
+      data-testid='group-tag-list-item'
+    >
       <Link to={`/group/${group.slug}/tag/${tag.id}`} className='group grow'>
         <Stack>
           <Text
             weight='bold'
             theme={(tag.visible || !isOwner) ? 'default' : 'subtle'}
             className='group-hover:underline'
+            data-testid='group-tag-name'
           >
             #{tag.name}
           </Text>
diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index 07f4bc7d2..35ea063e0 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -1,23 +1,34 @@
 import { v4 as uuidv4 } from 'uuid';
 
 import {
+  accountSchema,
   adSchema,
   cardSchema,
-  groupSchema,
+  groupMemberSchema,
   groupRelationshipSchema,
+  groupSchema,
   groupTagSchema,
   relationshipSchema,
+  type Account,
   type Ad,
   type Card,
   type Group,
+  type GroupMember,
   type GroupRelationship,
   type GroupTag,
   type Relationship,
 } from 'soapbox/schemas';
+import { GroupRoles } from 'soapbox/schemas/group-member';
 
 // TODO: there's probably a better way to create these factory functions.
 // This looks promising but didn't work on my first attempt: https://github.com/anatine/zod-plugins/tree/main/packages/zod-mock
 
+function buildAccount(props: Partial<Account> = {}): Account {
+  return accountSchema.parse(Object.assign({
+    id: uuidv4(),
+  }, props));
+}
+
 function buildCard(props: Partial<Card> = {}): Card {
   return cardSchema.parse(Object.assign({
     url: 'https://soapbox.test',
@@ -39,6 +50,18 @@ function buildGroupRelationship(props: Partial<GroupRelationship> = {}): GroupRe
 function buildGroupTag(props: Partial<GroupTag> = {}): GroupTag {
   return groupTagSchema.parse(Object.assign({
     id: uuidv4(),
+    name: uuidv4(),
+  }, props));
+}
+
+function buildGroupMember(
+  props: Partial<GroupMember> = {},
+  accountProps: Partial<Account> = {},
+): GroupMember {
+  return groupMemberSchema.parse(Object.assign({
+    id: uuidv4(),
+    account: buildAccount(accountProps),
+    role: GroupRoles.USER,
   }, props));
 }
 
@@ -55,10 +78,11 @@ function buildRelationship(props: Partial<Relationship> = {}): Relationship {
 }
 
 export {
+  buildAd,
   buildCard,
   buildGroup,
+  buildGroupMember,
   buildGroupRelationship,
   buildGroupTag,
-  buildAd,
   buildRelationship,
 };
\ No newline at end of file

From 9b011275b86dcd3a6d19459553cf18f06badf9c0 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 5 May 2023 08:35:21 -0400
Subject: [PATCH 274/298] Switch order of Group Page tabs

---
 app/soapbox/pages/group-page.tsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index e2d6e5755..41d561604 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -123,17 +123,19 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
       });
     }
 
-    items.push({
-      text: intl.formatMessage(messages.members),
-      to: `/group/${group?.slug}/members`,
-      name: '/group/:groupSlug/members',
-      count: pending.length,
-    },
-    {
-      text: intl.formatMessage(messages.media),
-      to: `/group/${group?.slug}/media`,
-      name: '/group/:groupSlug/media',
-    });
+    items.push(
+      {
+        text: intl.formatMessage(messages.media),
+        to: `/group/${group?.slug}/media`,
+        name: '/group/:groupSlug/media',
+      },
+      {
+        text: intl.formatMessage(messages.members),
+        to: `/group/${group?.slug}/members`,
+        name: '/group/:groupSlug/members',
+        count: pending.length,
+      },
+    );
 
     return items;
   }, [features.groupsTags, pending.length]);

From 5b61aa39a7b23a7a48b648ccc366b7532a7a14c7 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 5 May 2023 08:41:25 -0400
Subject: [PATCH 275/298] Account for 409 response codes

---
 .../group/group-membership-requests.tsx       | 24 +++++++++++++++----
 app/soapbox/locales/en.json                   |  3 ++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/features/group/group-membership-requests.tsx b/app/soapbox/features/group/group-membership-requests.tsx
index 2ea708c3d..79700e1a7 100644
--- a/app/soapbox/features/group/group-membership-requests.tsx
+++ b/app/soapbox/features/group/group-membership-requests.tsx
@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import React, { useEffect } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
@@ -17,7 +18,8 @@ type RouteParams = { groupId: string };
 
 const messages = defineMessages({
   heading: { id: 'column.group_pending_requests', defaultMessage: 'Pending requests' },
-  authorizeRejectFail: { id: 'group.membership_requests.fail', defaultMessage: 'Group owner or admin has already taken action on this request.' },
+  authorizeFail: { id: 'group.group_mod_authorize.fail', defaultMessage: 'Failed to approve @{name}' },
+  rejectFail: { id: 'group.group_mod_reject.fail', defaultMessage: 'Failed to reject @{name}' },
 });
 
 interface IMembershipRequest {
@@ -81,9 +83,15 @@ const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params })
   async function handleAuthorize(account: AccountEntity) {
     return authorize(account.id)
       .then(() => Promise.resolve())
-      .catch(() => {
+      .catch((error: AxiosError) => {
         refetch();
-        toast.error(intl.formatMessage(messages.authorizeRejectFail));
+
+        let message = intl.formatMessage(messages.authorizeFail, { name: account.username });
+        if (error.response?.status === 409) {
+          message = (error.response?.data as any).error;
+        }
+        toast.error(message);
+
         return Promise.reject();
       });
   }
@@ -91,9 +99,15 @@ const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params })
   async function handleReject(account: AccountEntity) {
     return reject(account.id)
       .then(() => Promise.resolve())
-      .catch(() => {
+      .catch((error: AxiosError) => {
         refetch();
-        toast.error(intl.formatMessage(messages.authorizeRejectFail));
+
+        let message = intl.formatMessage(messages.rejectFail, { name: account.username });
+        if (error.response?.status === 409) {
+          message = (error.response?.data as any).error;
+        }
+        toast.error(message);
+
         return Promise.reject();
       });
   }
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 2c81f307f..91fad97e0 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -773,12 +773,14 @@
   "group.delete.success": "Group successfully deleted",
   "group.deleted.message": "This group has been deleted.",
   "group.demote.user.success": "@{name} is now a member",
+  "group.group_mod_authorize.fail": "Failed to approve @{name}",
   "group.group_mod_block": "Ban from group",
   "group.group_mod_block.success": "@{name} is banned",
   "group.group_mod_demote": "Remove {role} role",
   "group.group_mod_kick": "Kick @{name} from group",
   "group.group_mod_kick.success": "Kicked @{name} from group",
   "group.group_mod_promote_mod": "Assign {role} role",
+  "group.group_mod_reject.fail": "Failed to reject @{name}",
   "group.group_mod_unblock": "Unban",
   "group.group_mod_unblock.success": "Unbanned @{name} from group",
   "group.header.alt": "Group header",
@@ -792,7 +794,6 @@
   "group.manage": "Manage Group",
   "group.member.admin.limit.summary": "You can assign up to {count} admins for the group at this time.",
   "group.member.admin.limit.title": "Admin limit reached",
-  "group.membership_requests.fail": "Group owner or admin has already taken action on this request.",
   "group.popover.action": "View Group",
   "group.popover.summary": "You must be a member of the group in order to reply to this status.",
   "group.popover.title": "Membership required",

From 2e7e6b3df6e3d7e07514e7f6b1b4e5a333949741 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 5 May 2023 08:44:23 -0400
Subject: [PATCH 276/298] I18n

---
 app/soapbox/locales/en.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 96efd8530..64116bc10 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -691,7 +691,6 @@
   "empty_column.remote": "There is nothing here! Manually follow users from {instance} to fill it up.",
   "empty_column.scheduled_statuses": "You don't have any scheduled statuses yet. When you add one, it will show up here.",
   "empty_column.search.accounts": "There are no people results for \"{term}\"",
-  "empty_column.search.groups": "There are no groups results for \"{term}\"",
   "empty_column.search.hashtags": "There are no hashtags results for \"{term}\"",
   "empty_column.search.statuses": "There are no posts results for \"{term}\"",
   "empty_column.test": "The test timeline is empty.",
@@ -1322,7 +1321,6 @@
   "search.placeholder": "Search",
   "search_results.accounts": "People",
   "search_results.filter_message": "You are searching for posts from @{acct}.",
-  "search_results.groups": "Groups",
   "search_results.hashtags": "Hashtags",
   "search_results.statuses": "Posts",
   "security.codes.fail": "Failed to fetch backup codes",

From 06d8370fe63b171fd5efbf6a62187f7e5d977d1c Mon Sep 17 00:00:00 2001
From: Ahmad Dakhlallah <ahmadlinuxarabia.co>
Date: Fri, 5 May 2023 17:51:33 +0300
Subject: [PATCH 277/298] Enhance RTL detection by ignoring links in post

---
 app/soapbox/rtl.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/rtl.ts b/app/soapbox/rtl.ts
index 4c3599cb6..f069bf5c4 100644
--- a/app/soapbox/rtl.ts
+++ b/app/soapbox/rtl.ts
@@ -19,7 +19,12 @@ export function isRtl(text: string): boolean {
   if (text.length === 0) {
     return false;
   }
-
+  // Remove http(s), (s)ftp, ws(s), blob and smtp(s) links
+  text = text.replace(/(?:https?|ftp|sftp|ws|wss|blob|smtp|smtps):\/\/[\n\S]+/g, '');
+  // Remove email address links
+  text = text.replace(/(mailto:)([^\s@]+@[^\s@]+\.[^\s@]+)/g, '');
+  // Remove Phone numbe links
+  text = text.replace(/(tel:)([+\d\s()-]+)/g, '');
   text = text.replace(/(?:^|[^\/\w])@([a-z0-9_]+(@[a-z0-9\.\-]+)?)/ig, '');
   text = text.replace(/(?:^|[^\/\w])#([\S]+)/ig, '');
   text = text.replace(/\s+/g, '');
@@ -27,6 +32,7 @@ export function isRtl(text: string): boolean {
   const matches = text.match(rtlChars);
 
   if (!matches) {
+
     return false;
   }
 

From 7a0ce1aab4e951960517148f70e3647a7e42fd60 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 5 May 2023 16:26:58 +0000
Subject: [PATCH 278/298] Sound better now!

---
 app/soapbox/rtl.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/rtl.ts b/app/soapbox/rtl.ts
index f069bf5c4..16a6100ef 100644
--- a/app/soapbox/rtl.ts
+++ b/app/soapbox/rtl.ts
@@ -20,7 +20,7 @@ export function isRtl(text: string): boolean {
     return false;
   }
   // Remove http(s), (s)ftp, ws(s), blob and smtp(s) links
-  text = text.replace(/(?:https?|ftp|sftp|ws|wss|blob|smtp|smtps):\/\/[\n\S]+/g, '');
+  text = text.replace(/(?:https?|ftp|sftp|ws|wss|blob|smtp|smtps):\/\/[\S]+/g, '');
   // Remove email address links
   text = text.replace(/(mailto:)([^\s@]+@[^\s@]+\.[^\s@]+)/g, '');
   // Remove Phone numbe links

From a491c6acb80c9640d9a7457d8d5b69d3c7b48f59 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 5 May 2023 15:15:59 -0400
Subject: [PATCH 279/298] Prevent focus on 'Trouble logging in?' link

---
 app/soapbox/features/auth-login/components/login-form.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/auth-login/components/login-form.tsx b/app/soapbox/features/auth-login/components/login-form.tsx
index 9a4768903..d7871fc75 100644
--- a/app/soapbox/features/auth-login/components/login-form.tsx
+++ b/app/soapbox/features/auth-login/components/login-form.tsx
@@ -57,7 +57,7 @@ const LoginForm: React.FC<ILoginForm> = ({ isLoading, handleSubmit }) => {
           <FormGroup
             labelText={passwordLabel}
             hintText={
-              <Link to='/reset-password' className='hover:underline'>
+              <Link to='/reset-password' className='hover:underline' tabIndex={-1}>
                 <FormattedMessage
                   id='login.reset_password_hint'
                   defaultMessage='Trouble logging in?'

From 185ef4e3c6ce3edcb8055b4f4259489cff29501f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 6 May 2023 22:55:36 -0500
Subject: [PATCH 280/298] StatusReplyMentions: enforce a 200px max width

---
 app/soapbox/components/status-reply-mentions.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/components/status-reply-mentions.tsx b/app/soapbox/components/status-reply-mentions.tsx
index 61f2f2969..e03d0c7f7 100644
--- a/app/soapbox/components/status-reply-mentions.tsx
+++ b/app/soapbox/components/status-reply-mentions.tsx
@@ -54,7 +54,7 @@ const StatusReplyMentions: React.FC<IStatusReplyMentions> = ({ status, hoverable
       <Link
         key={account.id}
         to={`/@${account.acct}`}
-        className='reply-mentions__account'
+        className='reply-mentions__account max-w-[200px] truncate align-bottom'
         onClick={(e) => e.stopPropagation()}
       >
         @{isPubkey(account.username) ? account.username.slice(0, 8) : account.username}

From 0f65c7bd7e5e4c2286d97d204ac8c650628bce1e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 8 May 2023 10:35:12 -0500
Subject: [PATCH 281/298] Auth: fix otherAccounts throwing a fullscreen error
 in local dev

---
 app/soapbox/actions/auth.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/actions/auth.ts b/app/soapbox/actions/auth.ts
index 06fe848e2..e4a10edd0 100644
--- a/app/soapbox/actions/auth.ts
+++ b/app/soapbox/actions/auth.ts
@@ -242,7 +242,8 @@ export const fetchOwnAccounts = () =>
     return state.auth.users.forEach((user) => {
       const account = state.accounts.get(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}`));
       }
     });
   };

From f290ca85e358ebb44f4e68e6127dab0f08314f0e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 8 May 2023 10:39:25 -0500
Subject: [PATCH 282/298] Thread: scroll up a little more on focus so the
 thread connector is visible

---
 app/soapbox/features/status/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 64eb9404f..6628db23b 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -404,7 +404,7 @@ const Thread: React.FC<IThread> = (props) => {
   useEffect(() => {
     scroller.current?.scrollToIndex({
       index: ancestorsIds.size,
-      offset: -140,
+      offset: -146,
     });
 
     setImmediate(() => statusRef.current?.querySelector<HTMLDivElement>('.detailed-actualStatus')?.focus());

From f47b5f0a20c8885bccb56af27f38903132070d44 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 8 May 2023 10:44:07 -0500
Subject: [PATCH 283/298] Thread: fix display of initial loading indicator

---
 app/soapbox/features/status/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 6628db23b..6b41148c4 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -443,7 +443,9 @@ const Thread: React.FC<IThread> = (props) => {
     );
   } else if (!status) {
     return (
-      <PlaceholderStatus />
+      <Column>
+        <PlaceholderStatus />
+      </Column>
     );
   }
 

From afec0edc1ce4cf146105834b2bb2a55437230e14 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 8 May 2023 13:29:11 -0400
Subject: [PATCH 284/298] Add tests for Group API hooks

---
 .../hooks/groups/__tests__/useGroup.test.ts   | 41 +++++++++++++++++
 .../groups/__tests__/useGroupLookup.test.ts   | 41 +++++++++++++++++
 .../groups/__tests__/useGroupMedia.test.ts    | 44 ++++++++++++++++++
 .../groups/__tests__/useGroupMembers.test.ts  | 45 +++++++++++++++++++
 .../hooks/groups/__tests__/useGroups.test.ts  | 43 ++++++++++++++++++
 app/soapbox/jest/factory.ts                   |  8 ++++
 6 files changed, 222 insertions(+)
 create mode 100644 app/soapbox/api/hooks/groups/__tests__/useGroup.test.ts
 create mode 100644 app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts
 create mode 100644 app/soapbox/api/hooks/groups/__tests__/useGroupMedia.test.ts
 create mode 100644 app/soapbox/api/hooks/groups/__tests__/useGroupMembers.test.ts
 create mode 100644 app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts

diff --git a/app/soapbox/api/hooks/groups/__tests__/useGroup.test.ts b/app/soapbox/api/hooks/groups/__tests__/useGroup.test.ts
new file mode 100644
index 000000000..8afd06f1a
--- /dev/null
+++ b/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();
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts b/app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts
new file mode 100644
index 000000000..2397b16ce
--- /dev/null
+++ b/app/soapbox/api/hooks/groups/__tests__/useGroupLookup.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 { useGroupLookup } from '../useGroupLookup';
+
+const group = buildGroup({ id: '1', slug: 'soapbox' });
+
+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));
+
+      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));
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.entity).toBeUndefined();
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/__tests__/useGroupMedia.test.ts b/app/soapbox/api/hooks/groups/__tests__/useGroupMedia.test.ts
new file mode 100644
index 000000000..a68b79eb1
--- /dev/null
+++ b/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();
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/__tests__/useGroupMembers.test.ts b/app/soapbox/api/hooks/groups/__tests__/useGroupMembers.test.ts
new file mode 100644
index 000000000..6f2fb6eac
--- /dev/null
+++ b/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();
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts b/app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts
new file mode 100644
index 000000000..adff805f3
--- /dev/null
+++ b/app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts
@@ -0,0 +1,43 @@
+import { __stub } from 'soapbox/api';
+import { buildGroup } from 'soapbox/jest/factory';
+import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
+
+import { useGroups } from '../useGroups';
+
+const group = buildGroup({ id: '1', display_name: 'soapbox' });
+
+describe('useGroups hook', () => {
+  describe('with a successful request', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet('/api/v1/groups?q=').reply(200, [group]);
+      });
+    });
+
+    it('is successful', async () => {
+      const { result } = renderHook(() => useGroups());
+
+      console.log(result.current);
+
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+      expect(result.current.groups.length).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());
+
+  //     await waitFor(() => expect(result.current.isFetching).toBe(false));
+
+  //     expect(result.current.groups).toHaveLength(0);
+  //   });
+  // });
+});
\ No newline at end of file
diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index 35ea063e0..4d8ff336a 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -19,6 +19,7 @@ import {
   type Relationship,
 } from 'soapbox/schemas';
 import { GroupRoles } from 'soapbox/schemas/group-member';
+import { statusSchema, type Status } from 'soapbox/schemas/status';
 
 // TODO: there's probably a better way to create these factory functions.
 // This looks promising but didn't work on my first attempt: https://github.com/anatine/zod-plugins/tree/main/packages/zod-mock
@@ -77,6 +78,12 @@ function buildRelationship(props: Partial<Relationship> = {}): Relationship {
   }, props));
 }
 
+function buildStatus(props: Partial<Status> = {}): Status {
+  return statusSchema.parse(Object.assign({
+    id: uuidv4(),
+  }, props));
+}
+
 export {
   buildAd,
   buildCard,
@@ -85,4 +92,5 @@ export {
   buildGroupRelationship,
   buildGroupTag,
   buildRelationship,
+  buildStatus,
 };
\ No newline at end of file

From 4a2b7faa594d24dcc97ac56fea78513dd37ec710 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 9 May 2023 15:16:13 -0400
Subject: [PATCH 285/298] Support soft-deleted statuses via tombstones

---
 app/soapbox/components/status.tsx               | 12 ++++++++++++
 app/soapbox/components/tombstone.tsx            | 15 +++++++++++----
 .../status/components/thread-status.tsx         |  5 ++---
 app/soapbox/normalizers/status.ts               | 17 ++++++++++++++++-
 app/soapbox/schemas/index.ts                    |  1 +
 app/soapbox/schemas/status.ts                   |  5 +++++
 app/soapbox/schemas/tombstone.ts                |  9 +++++++++
 app/styles/components/detailed-status.scss      | 10 ----------
 8 files changed, 56 insertions(+), 18 deletions(-)
 create mode 100644 app/soapbox/schemas/tombstone.ts

diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 8456a46a4..0c1a7be59 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -21,6 +21,7 @@ import StatusMedia from './status-media';
 import StatusReplyMentions from './status-reply-mentions';
 import SensitiveContentOverlay from './statuses/sensitive-content-overlay';
 import StatusInfo from './statuses/status-info';
+import Tombstone from './tombstone';
 import { Card, Icon, Stack, Text } from './ui';
 
 import type {
@@ -388,6 +389,17 @@ const Status: React.FC<IStatus> = (props) => {
 
   const isUnderReview = actualStatus.visibility === 'self';
   const isSensitive = actualStatus.hidden;
+  const isSoftDeleted = status.tombstone?.reason === 'deleted';
+
+  if (isSoftDeleted) {
+    return (
+      <Tombstone
+        id={status.id}
+        onMoveUp={(id) => onMoveUp ? onMoveUp(id) : null}
+        onMoveDown={(id) => onMoveDown ? onMoveDown(id) : null}
+      />
+    );
+  }
 
   return (
     <HotKeys handlers={handlers} data-testid='status'>
diff --git a/app/soapbox/components/tombstone.tsx b/app/soapbox/components/tombstone.tsx
index 6c6a2a6f9..b92fb7e70 100644
--- a/app/soapbox/components/tombstone.tsx
+++ b/app/soapbox/components/tombstone.tsx
@@ -19,10 +19,17 @@ const Tombstone: React.FC<ITombstone> = ({ id, onMoveUp, onMoveDown }) => {
 
   return (
     <HotKeys handlers={handlers}>
-      <div className='focusable flex items-center justify-center border border-solid border-gray-200 bg-gray-100 p-9 dark:border-gray-800 dark:bg-gray-900 sm:rounded-xl' tabIndex={0}>
-        <Text>
-          <FormattedMessage id='statuses.tombstone' defaultMessage='One or more posts are unavailable.' />
-        </Text>
+      <div className='h-16'>
+        <div
+          className='focusable flex h-[42px] items-center justify-center rounded-lg border-2 border-gray-200 text-center'
+        >
+          <Text theme='muted'>
+            <FormattedMessage
+              id='statuses.tombstone'
+              defaultMessage='One or more posts are unavailable.'
+            />
+          </Text>
+        </div>
       </div>
     </HotKeys>
   );
diff --git a/app/soapbox/features/status/components/thread-status.tsx b/app/soapbox/features/status/components/thread-status.tsx
index 8f3e5b249..442bae0e3 100644
--- a/app/soapbox/features/status/components/thread-status.tsx
+++ b/app/soapbox/features/status/components/thread-status.tsx
@@ -31,9 +31,8 @@ const ThreadStatus: React.FC<IThreadStatus> = (props): JSX.Element => {
 
     return (
       <div
-        className={clsx('thread__connector', {
-          'thread__connector--top': isConnectedTop,
-          'thread__connector--bottom': isConnectedBottom,
+        className={clsx('absolute left-5 z-[1] hidden w-0.5 bg-gray-200 rtl:left-auto rtl:right-5 dark:bg-primary-800', {
+          '!block top-[calc(12px+42px)] h-[calc(100%-42px-8px-1rem)]': isConnectedBottom,
         })}
       />
     );
diff --git a/app/soapbox/normalizers/status.ts b/app/soapbox/normalizers/status.ts
index 17a23b19e..a207b0434 100644
--- a/app/soapbox/normalizers/status.ts
+++ b/app/soapbox/normalizers/status.ts
@@ -13,7 +13,7 @@ import {
 import { normalizeAttachment } from 'soapbox/normalizers/attachment';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
 import { normalizeMention } from 'soapbox/normalizers/mention';
-import { cardSchema, pollSchema } from 'soapbox/schemas';
+import { cardSchema, pollSchema, tombstoneSchema } from 'soapbox/schemas';
 
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity } from 'soapbox/types/entities';
@@ -36,6 +36,10 @@ export const EventRecord = ImmutableRecord({
   links: ImmutableList<Attachment>(),
 });
 
+interface Tombstone {
+  reason: 'deleted'
+}
+
 // https://docs.joinmastodon.org/entities/status/
 export const StatusRecord = ImmutableRecord({
   account: null as EmbeddedEntity<Account | ReducerAccount>,
@@ -72,6 +76,7 @@ export const StatusRecord = ImmutableRecord({
   sensitive: false,
   spoiler_text: '',
   tags: ImmutableList<ImmutableMap<string, any>>(),
+  tombstone: null as Tombstone | null,
   uri: '',
   url: '',
   visibility: 'public' as StatusVisibility,
@@ -116,6 +121,15 @@ const normalizeStatusPoll = (status: ImmutableMap<string, any>) => {
   }
 };
 
+const normalizeTombstone = (status: ImmutableMap<string, any>) => {
+  try {
+    const tombstone = tombstoneSchema.parse(status.get('tombstone').toJS());
+    return status.set('tombstone', tombstone);
+  } catch (_e) {
+    return status.set('tombstone', null);
+  }
+};
+
 // Normalize card
 const normalizeStatusCard = (status: ImmutableMap<string, any>) => {
   try {
@@ -246,6 +260,7 @@ export const normalizeStatus = (status: Record<string, any>) => {
       fixContent(status);
       normalizeFilterResults(status);
       normalizeDislikes(status);
+      normalizeTombstone(status);
     }),
   );
 };
diff --git a/app/soapbox/schemas/index.ts b/app/soapbox/schemas/index.ts
index 8e20c0d05..1fa8ac5b4 100644
--- a/app/soapbox/schemas/index.ts
+++ b/app/soapbox/schemas/index.ts
@@ -14,6 +14,7 @@ export { pollSchema, type Poll, type PollOption } from './poll';
 export { relationshipSchema, type Relationship } from './relationship';
 export { statusSchema, type Status } from './status';
 export { tagSchema, type Tag } from './tag';
+export { tombstoneSchema, type Tombstone } from './tombstone';
 
 // Soapbox
 export { adSchema, type Ad } from './soapbox/ad';
\ No newline at end of file
diff --git a/app/soapbox/schemas/status.ts b/app/soapbox/schemas/status.ts
index 00fa6d483..ea55d5085 100644
--- a/app/soapbox/schemas/status.ts
+++ b/app/soapbox/schemas/status.ts
@@ -10,6 +10,10 @@ import { pollSchema } from './poll';
 import { tagSchema } from './tag';
 import { contentSchema, dateSchema, filteredArray } from './utils';
 
+const tombstoneSchema = z.object({
+  reason: z.enum(['deleted']),
+});
+
 const baseStatusSchema = z.object({
   account: accountSchema,
   application: z.object({
@@ -46,6 +50,7 @@ const baseStatusSchema = z.object({
   sensitive: z.coerce.boolean(),
   spoiler_text: contentSchema,
   tags: filteredArray(tagSchema),
+  tombstone: tombstoneSchema.nullable().optional(),
   uri: z.string().url().catch(''),
   url: z.string().url().catch(''),
   visibility: z.string().catch('public'),
diff --git a/app/soapbox/schemas/tombstone.ts b/app/soapbox/schemas/tombstone.ts
new file mode 100644
index 000000000..e7617a27a
--- /dev/null
+++ b/app/soapbox/schemas/tombstone.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+const tombstoneSchema = z.object({
+  reason: z.enum(['deleted']),
+});
+
+type Tombstone = z.infer<typeof tombstoneSchema>;
+
+export { tombstoneSchema, type Tombstone };
\ No newline at end of file
diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss
index d07c31814..daa7296ee 100644
--- a/app/styles/components/detailed-status.scss
+++ b/app/styles/components/detailed-status.scss
@@ -12,14 +12,4 @@
   .status__content-wrapper {
     @apply pl-[calc(42px+12px)] rtl:pl-0 rtl:pr-[calc(42px+12px)];
   }
-
-  &__connector {
-    @apply bg-gray-200 dark:bg-primary-800 absolute w-0.5 left-5 hidden z-[1] rtl:right-5 rtl:left-auto;
-
-    &--bottom {
-      @apply block;
-      height: calc(100% - 42px - 8px - 1rem);
-      top: calc(12px + 42px);
-    }
-  }
 }

From 8d05747537851b9aad2e28a06dfaa0a79db76335 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 11 May 2023 08:30:13 -0400
Subject: [PATCH 286/298] Fix test

---
 .../hooks/groups/__tests__/useGroups.test.ts  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts b/app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts
index adff805f3..739a1c0af 100644
--- a/app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts
+++ b/app/soapbox/api/hooks/groups/__tests__/useGroups.test.ts
@@ -1,43 +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?q=').reply(200, [group]);
+        mock.onGet('/api/v1/groups').reply(200, [group]);
       });
     });
 
     it('is successful', async () => {
-      const { result } = renderHook(() => useGroups());
-
-      console.log(result.current);
+      const { result } = renderHook(useGroups, undefined, store);
 
       await waitFor(() => expect(result.current.isFetching).toBe(false));
 
-      expect(result.current.groups.length).toHaveLength(1);
+      expect(result.current.groups).toHaveLength(1);
     });
   });
 
-  // describe('with an unsuccessful query', () => {
-  //   beforeEach(() => {
-  //     __stub((mock) => {
-  //       mock.onGet('/api/v1/groups').networkError();
-  //     });
-  //   });
+  describe('with an unsuccessful query', () => {
+    beforeEach(() => {
+      __stub((mock) => {
+        mock.onGet('/api/v1/groups').networkError();
+      });
+    });
 
-  //   it('is has error state', async() => {
-  //     const { result } = renderHook(() => useGroups());
+    it('is has error state', async() => {
+      const { result } = renderHook(useGroups, undefined, store);
 
-  //     await waitFor(() => expect(result.current.isFetching).toBe(false));
+      await waitFor(() => expect(result.current.isFetching).toBe(false));
 
-  //     expect(result.current.groups).toHaveLength(0);
-  //   });
-  // });
+      expect(result.current.groups).toHaveLength(0);
+    });
+  });
 });
\ No newline at end of file

From 6ab41eb8990ffeed49cffe2b65ec1c385aed2543 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 11 May 2023 14:20:33 -0400
Subject: [PATCH 287/298] Add ability to share Group

---
 .../group/components/group-options-button.tsx | 19 +++++++++++++++++++
 app/soapbox/locales/en.json                   |  1 +
 2 files changed, 20 insertions(+)

diff --git a/app/soapbox/features/group/components/group-options-button.tsx b/app/soapbox/features/group/components/group-options-button.tsx
index 597a751d7..ebc3152e4 100644
--- a/app/soapbox/features/group/components/group-options-button.tsx
+++ b/app/soapbox/features/group/components/group-options-button.tsx
@@ -19,6 +19,7 @@ const messages = defineMessages({
   leave: { id: 'group.leave.label', defaultMessage: 'Leave' },
   leaveSuccess: { id: 'group.leave.success', defaultMessage: 'Left the group' },
   report: { id: 'group.report.label', defaultMessage: 'Report' },
+  share: { id: 'group.share.label', defaultMessage: 'Share' },
 });
 
 interface IGroupActionButton {
@@ -35,6 +36,15 @@ const GroupOptionsButton = ({ group }: IGroupActionButton) => {
   const isAdmin = group.relationship?.role === GroupRoles.ADMIN;
   const isBlocked = group.relationship?.blocked_by;
 
+  const handleShare = () => {
+    navigator.share({
+      text: group.display_name,
+      url: group.url,
+    }).catch((e) => {
+      if (e.name !== 'AbortError') console.error(e);
+    });
+  };
+
   const onLeaveGroup = () =>
     dispatch(openModal('CONFIRM', {
       heading: intl.formatMessage(messages.confirmationHeading),
@@ -49,6 +59,7 @@ const GroupOptionsButton = ({ group }: IGroupActionButton) => {
     }));
 
   const menu: Menu = useMemo(() => {
+    const canShare = 'share' in navigator;
     const items = [];
 
     if (isMember || isAdmin) {
@@ -59,6 +70,14 @@ const GroupOptionsButton = ({ group }: IGroupActionButton) => {
       });
     }
 
+    if (canShare) {
+      items.push({
+        text: intl.formatMessage(messages.share),
+        icon: require('@tabler/icons/share.svg'),
+        action: handleShare,
+      });
+    }
+
     if (isAdmin) {
       items.push({
         text: intl.formatMessage(messages.leave),
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 6138dbdd5..9281992cb 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -807,6 +807,7 @@
   "group.report.label": "Report",
   "group.role.admin": "Admin",
   "group.role.owner": "Owner",
+  "group.share.label": "Share",
   "group.tabs.all": "All",
   "group.tabs.media": "Media",
   "group.tabs.members": "Members",

From 93c67c863ab2bc706afbe77f09f60e913327fe92 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 11 May 2023 14:28:44 -0400
Subject: [PATCH 288/298] Format tag input with #

---
 .../features/group/components/group-tags-field.tsx     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/group/components/group-tags-field.tsx b/app/soapbox/features/group/components/group-tags-field.tsx
index ba98d808e..f8092d5c0 100644
--- a/app/soapbox/features/group/components/group-tags-field.tsx
+++ b/app/soapbox/features/group/components/group-tags-field.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { Input, Streamfield } from 'soapbox/components/ui';
@@ -36,15 +36,19 @@ const GroupTagsField: React.FC<IGroupTagsField> = ({ tags, onChange, onAddItem,
 const HashtagField: StreamfieldComponent<string> = ({ value, onChange, autoFocus = false }) => {
   const intl = useIntl();
 
+  const formattedValue = useMemo(() => {
+    return `#${value}`;
+  }, [value]);
+
   const handleChange: React.ChangeEventHandler<HTMLInputElement> = ({ target }) => {
-    onChange(target.value);
+    onChange(target.value.replace('#', ''));
   };
 
   return (
     <Input
       outerClassName='w-full'
       type='text'
-      value={value}
+      value={formattedValue}
       onChange={handleChange}
       placeholder={intl.formatMessage(messages.hashtagPlaceholder)}
       autoFocus={autoFocus}

From 90f7c712560f4bd65adc22d4f2110ee68bca4f1e Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 11 May 2023 14:41:31 -0400
Subject: [PATCH 289/298] Hide Group context in Compose button if not Group
 member

---
 app/soapbox/api/hooks/groups/useGroupLookup.ts        | 11 ++++++++++-
 app/soapbox/api/hooks/groups/useGroupRelationship.ts  |  9 ++++++---
 app/soapbox/entity-store/hooks/useEntity.ts           |  6 +++++-
 app/soapbox/features/ui/components/compose-button.tsx |  6 +++++-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/api/hooks/groups/useGroupLookup.ts b/app/soapbox/api/hooks/groups/useGroupLookup.ts
index 89c778a15..6e41975e5 100644
--- a/app/soapbox/api/hooks/groups/useGroupLookup.ts
+++ b/app/soapbox/api/hooks/groups/useGroupLookup.ts
@@ -3,15 +3,24 @@ import { useEntityLookup } from 'soapbox/entity-store/hooks';
 import { useApi } from 'soapbox/hooks/useApi';
 import { groupSchema } from 'soapbox/schemas';
 
+import { useGroupRelationship } from './useGroupRelationship';
+
 function useGroupLookup(slug: string) {
   const api = useApi();
 
-  return useEntityLookup(
+  const { entity: group, ...result } = useEntityLookup(
     Entities.GROUPS,
     (group) => group.slug === slug,
     () => api.get(`/api/v1/groups/lookup?name=${slug}`),
     { schema: groupSchema },
   );
+
+  const { entity: relationship } = useGroupRelationship(group?.id);
+
+  return {
+    ...result,
+    entity: group ? { ...group, relationship: relationship || null } : undefined,
+  };
 }
 
 export { useGroupLookup };
\ No newline at end of file
diff --git a/app/soapbox/api/hooks/groups/useGroupRelationship.ts b/app/soapbox/api/hooks/groups/useGroupRelationship.ts
index 6b24c463c..21d8d3efd 100644
--- a/app/soapbox/api/hooks/groups/useGroupRelationship.ts
+++ b/app/soapbox/api/hooks/groups/useGroupRelationship.ts
@@ -7,14 +7,17 @@ import { useEntity } from 'soapbox/entity-store/hooks';
 import { useApi, useAppDispatch } from 'soapbox/hooks';
 import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
 
-function useGroupRelationship(groupId: string) {
+function useGroupRelationship(groupId: string | undefined) {
   const api = useApi();
   const dispatch = useAppDispatch();
 
   const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
-    [Entities.GROUP_RELATIONSHIPS, groupId],
+    [Entities.GROUP_RELATIONSHIPS, groupId as string],
     () => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
-    { schema: z.array(groupRelationshipSchema).transform(arr => arr[0]) },
+    {
+      enabled: !!groupId,
+      schema: z.array(groupRelationshipSchema).transform(arr => arr[0]),
+    },
   );
 
   useEffect(() => {
diff --git a/app/soapbox/entity-store/hooks/useEntity.ts b/app/soapbox/entity-store/hooks/useEntity.ts
index 63447ae67..3d57c8ab0 100644
--- a/app/soapbox/entity-store/hooks/useEntity.ts
+++ b/app/soapbox/entity-store/hooks/useEntity.ts
@@ -14,6 +14,8 @@ interface UseEntityOpts<TEntity extends Entity> {
   schema?: EntitySchema<TEntity>
   /** Whether to refetch this entity every time the hook mounts, even if it's already in the store. */
   refetch?: boolean
+  /** A flag to potentially disable sending requests to the API. */
+  enabled?: boolean
 }
 
 function useEntity<TEntity extends Entity>(
@@ -31,6 +33,7 @@ function useEntity<TEntity extends Entity>(
 
   const entity = useAppSelector(state => state.entities[entityType]?.store[entityId] as TEntity | undefined);
 
+  const isEnabled = opts.enabled ?? true;
   const isLoading = isFetching && !entity;
 
   const fetchEntity = async () => {
@@ -44,10 +47,11 @@ function useEntity<TEntity extends Entity>(
   };
 
   useEffect(() => {
+    if (!isEnabled) return;
     if (!entity || opts.refetch) {
       fetchEntity();
     }
-  }, []);
+  }, [isEnabled]);
 
   return {
     entity,
diff --git a/app/soapbox/features/ui/components/compose-button.tsx b/app/soapbox/features/ui/components/compose-button.tsx
index a21909bb1..7686f9c55 100644
--- a/app/soapbox/features/ui/components/compose-button.tsx
+++ b/app/soapbox/features/ui/components/compose-button.tsx
@@ -10,8 +10,12 @@ import { useAppDispatch } from 'soapbox/hooks';
 
 const ComposeButton = () => {
   const location = useLocation();
+  const isOnGroupPage = location.pathname.startsWith('/group/');
+  const match = useRouteMatch<{ groupSlug: string }>('/group/:groupSlug');
+  const { entity: group } = useGroupLookup(match?.params.groupSlug || '');
+  const isGroupMember = !!group?.relationship?.member;
 
-  if (location.pathname.startsWith('/group/')) {
+  if (isOnGroupPage && isGroupMember) {
     return <GroupComposeButton />;
   }
 

From 2c59933cd028ea045f9a5211b8be1d7f2eacde5f Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 11 May 2023 15:00:28 -0400
Subject: [PATCH 290/298] Handle API errors when failing to join group

---
 .../features/group/components/group-action-button.tsx       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index 005b9e245..f3b208574 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -55,6 +55,12 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
           : intl.formatMessage(messages.joinSuccess),
       );
     },
+    onError(error) {
+      const message = (error.response?.data as any).error;
+      if (message) {
+        toast.error(message);
+      }
+    },
   });
 
   const onLeaveGroup = () =>

From e84a4a6c45f3c6e34f6448bb87c3074ebccc3db6 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 11 May 2023 15:13:07 -0400
Subject: [PATCH 291/298] Fix full-width of Group Header

---
 app/soapbox/features/group/components/group-header.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/group/components/group-header.tsx b/app/soapbox/features/group/components/group-header.tsx
index ad22e1e13..4cfe8f786 100644
--- a/app/soapbox/features/group/components/group-header.tsx
+++ b/app/soapbox/features/group/components/group-header.tsx
@@ -99,7 +99,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
 
       if (!isDefaultHeader(group.header)) {
         header = (
-          <a href={group.header} onClick={handleHeaderClick} target='_blank' className='relative'>
+          <a href={group.header} onClick={handleHeaderClick} target='_blank' className='relative w-full'>
             {header}
           </a>
         );

From d2eca144fa50c0ca6f5a21642f2319f5dc3fe3d1 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Thu, 11 May 2023 15:13:30 -0400
Subject: [PATCH 292/298] Make sure GroupLinkPreview covers entire header

---
 app/soapbox/features/groups/components/group-link-preview.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/groups/components/group-link-preview.tsx b/app/soapbox/features/groups/components/group-link-preview.tsx
index 18ca586a5..98ca03076 100644
--- a/app/soapbox/features/groups/components/group-link-preview.tsx
+++ b/app/soapbox/features/groups/components/group-link-preview.tsx
@@ -19,7 +19,7 @@ const GroupLinkPreview: React.FC<IGroupLinkPreview> = ({ card }) => {
   return (
     <Stack className='cursor-default overflow-hidden rounded-lg border border-gray-300 text-center dark:border-gray-800'>
       <div
-        className='-mb-8 h-32 w-full bg-center'
+        className='-mb-8 h-32 w-full bg-cover bg-center'
         style={{ backgroundImage: `url(${group.header})` }}
       />
 

From 41e969616dad0cf22e2214fd289ef1c279706fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 11 May 2023 20:10:22 +0200
Subject: [PATCH 293/298] Forgot to commit some files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/actions/tags.ts   | 83 ++++++++++++++++++++++++++++++++++-
 app/soapbox/locales/en.json   |  1 -
 app/soapbox/reducers/index.ts |  2 +
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/actions/tags.ts b/app/soapbox/actions/tags.ts
index 2c394ba46..75d8e00fa 100644
--- a/app/soapbox/actions/tags.ts
+++ b/app/soapbox/actions/tags.ts
@@ -1,4 +1,4 @@
-import api from '../api';
+import api, { getLinks } from '../api';
 
 import type { AxiosError } from 'axios';
 import type { AppDispatch, RootState } from 'soapbox/store';
@@ -16,6 +16,14 @@ 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());
 
@@ -95,6 +103,65 @@ const unfollowHashtagFail = (name: string, error: AxiosError) => ({
   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,
@@ -105,6 +172,12 @@ export {
   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,
@@ -117,4 +190,12 @@ export {
   unfollowHashtagRequest,
   unfollowHashtagSuccess,
   unfollowHashtagFail,
+  fetchFollowedHashtags,
+  fetchFollowedHashtagsRequest,
+  fetchFollowedHashtagsSuccess,
+  fetchFollowedHashtagsFail,
+  expandFollowedHashtags,
+  expandFollowedHashtagsRequest,
+  expandFollowedHashtagsSuccess,
+  expandFollowedHashtagsFail,
 };
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 11badebe2..919b33901 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -671,7 +671,6 @@
   "empty_column.filters": "You haven't created any muted words yet.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.followed_tags": "You haven't followed any hashtag yet.",
   "empty_column.group": "There are no posts in this group yet.",
   "empty_column.group_blocks": "The group hasn't banned any users yet.",
   "empty_column.group_membership_requests": "There are no pending membership requests for this group.",
diff --git a/app/soapbox/reducers/index.ts b/app/soapbox/reducers/index.ts
index b02ae8117..bde340b60 100644
--- a/app/soapbox/reducers/index.ts
+++ b/app/soapbox/reducers/index.ts
@@ -28,6 +28,7 @@ import custom_emojis from './custom-emojis';
 import domain_lists from './domain-lists';
 import dropdown_menu from './dropdown-menu';
 import filters from './filters';
+import followed_tags from './followed_tags';
 import group_memberships from './group-memberships';
 import group_relationships from './group-relationships';
 import groups from './groups';
@@ -93,6 +94,7 @@ const reducers = {
   dropdown_menu,
   entities,
   filters,
+  followed_tags,
   group_memberships,
   group_relationships,
   groups,

From f27933965ff63351f08427a219ba5b29dfacc121 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 12 May 2023 11:51:00 -0400
Subject: [PATCH 294/298] Allow non-owners to see pinned tags

---
 app/soapbox/components/ui/icon/icon.tsx       |  7 ++-
 .../__tests__/group-tag-list-item.test.tsx    | 43 ++++++++++---------
 .../group/components/group-tag-list-item.tsx  | 30 +++++++++----
 app/soapbox/features/group/group-tags.tsx     |  2 +-
 4 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/app/soapbox/components/ui/icon/icon.tsx b/app/soapbox/components/ui/icon/icon.tsx
index f51c3ca38..709b3126f 100644
--- a/app/soapbox/components/ui/icon/icon.tsx
+++ b/app/soapbox/components/ui/icon/icon.tsx
@@ -17,11 +17,16 @@ interface IIcon extends Pick<React.SVGAttributes<SVGAElement>, 'strokeWidth'> {
   src: string
   /** Width and height of the icon in pixels. */
   size?: number
+  /** Override the data-testid */
+  'data-testid'?: string
 }
 
 /** Renders and SVG icon with optional counter. */
 const Icon: React.FC<IIcon> = ({ src, alt, count, size, countMax, ...filteredProps }): JSX.Element => (
-  <div className='relative flex shrink-0 flex-col' data-testid='icon'>
+  <div
+    className='relative flex shrink-0 flex-col'
+    data-testid={filteredProps['data-testid'] || 'icon'}
+  >
     {count ? (
       <span className='absolute -right-3 -top-2 flex h-5 min-w-[20px] shrink-0 items-center justify-center whitespace-nowrap break-words'>
         <Counter count={count} countMax={countMax} />
diff --git a/app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx b/app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx
index 4418fff86..f91853dc4 100644
--- a/app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx
+++ b/app/soapbox/features/group/components/__tests__/group-tag-list-item.test.tsx
@@ -91,31 +91,32 @@ describe('<GroupTagListItem />', () => {
           expect(screen.queryAllByTestId('pin-icon')).toHaveLength(0);
         });
       });
+    });
 
-      describe('as a non-owner', () => {
-        const group = buildGroup({
-          relationship: buildGroupRelationship({
-            role: GroupRoles.ADMIN,
-            member: true,
-          }),
+    describe('as a non-owner', () => {
+      const group = buildGroup({
+        relationship: buildGroupRelationship({
+          role: GroupRoles.ADMIN,
+          member: true,
+        }),
+      });
+
+      describe('when the tag is pinned', () => {
+        const tag = buildGroupTag({ pinned: true, visible: true });
+
+        it('does render the pin icon', () => {
+          render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+          screen.debug();
+          expect(screen.queryAllByTestId('pin-icon')).toHaveLength(1);
         });
+      });
 
-        describe('when the tag is visible', () => {
-          const tag = buildGroupTag({ visible: true });
+      describe('when the tag is not pinned', () => {
+        const tag = buildGroupTag({ pinned: false, visible: true });
 
-          it('does not render the pin icon', () => {
-            render(<GroupTagListItem group={group} tag={tag} isPinnable />);
-            expect(screen.queryAllByTestId('pin-icon')).toHaveLength(0);
-          });
-        });
-
-        describe('when the tag is not visible', () => {
-          const tag = buildGroupTag({ visible: false });
-
-          it('does not render the pin icon', () => {
-            render(<GroupTagListItem group={group} tag={tag} isPinnable />);
-            expect(screen.queryAllByTestId('pin-icon')).toHaveLength(0);
-          });
+        it('does not render the pin icon', () => {
+          render(<GroupTagListItem group={group} tag={tag} isPinnable />);
+          expect(screen.queryAllByTestId('pin-icon')).toHaveLength(0);
         });
       });
     });
diff --git a/app/soapbox/features/group/components/group-tag-list-item.tsx b/app/soapbox/features/group/components/group-tag-list-item.tsx
index bf02cc202..07660cf21 100644
--- a/app/soapbox/features/group/components/group-tag-list-item.tsx
+++ b/app/soapbox/features/group/components/group-tag-list-item.tsx
@@ -3,7 +3,7 @@ import { defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
 import { useUpdateGroupTag } from 'soapbox/api/hooks';
-import { HStack, IconButton, Stack, Text, Tooltip } from 'soapbox/components/ui';
+import { HStack, Icon, IconButton, Stack, Text, Tooltip } from 'soapbox/components/ui';
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useAppDispatch } from 'soapbox/hooks';
@@ -84,6 +84,20 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
   };
 
   const renderPinIcon = () => {
+    if (!isOwner && tag.pinned) {
+      return (
+        <Icon
+          src={require('@tabler/icons/pin-filled.svg')}
+          className='h-5 w-5 text-gray-600'
+          data-testid='pin-icon'
+        />
+      );
+    }
+
+    if (!isOwner) {
+      return null;
+    }
+
     if (isPinnable) {
       return (
         <Tooltip
@@ -149,12 +163,12 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
         </Stack>
       </Link>
 
-      {isOwner ? (
-        <HStack alignItems='center' space={2}>
-          {tag.visible ? (
-            renderPinIcon()
-          ) : null}
+      <HStack alignItems='center' space={2}>
+        {tag.visible ? (
+          renderPinIcon()
+        ) : null}
 
+        {isOwner ? (
           <Tooltip
             text={
               tag.visible ?
@@ -173,8 +187,8 @@ const GroupTagListItem = (props: IGroupMemberListItem) => {
               iconClassName='h-5 w-5 text-primary-500 dark:text-accent-blue'
             />
           </Tooltip>
-        </HStack>
-      ) : null}
+        ) : null}
+      </HStack>
     </HStack>
   );
 };
diff --git a/app/soapbox/features/group/group-tags.tsx b/app/soapbox/features/group/group-tags.tsx
index 710a4fdb5..d5335e844 100644
--- a/app/soapbox/features/group/group-tags.tsx
+++ b/app/soapbox/features/group/group-tags.tsx
@@ -36,7 +36,7 @@ const GroupTopics: React.FC<IGroupTopics> = (props) => {
       showLoading={!group || isLoading && tags.length === 0}
       placeholderComponent={PlaceholderAccount}
       placeholderCount={3}
-      className='divide-y divide-solid divide-gray-300'
+      className='divide-y divide-solid divide-gray-300 dark:divide-gray-800'
       itemClassName='py-3 last:pb-0'
       emptyMessage={
         <Stack space={4} className='pt-6' justifyContent='center' alignItems='center'>

From 682a86049e8113be423044b62f86e4615d4c21cf Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 12 May 2023 11:51:12 -0400
Subject: [PATCH 295/298] Linkify urls inside Group note

---
 app/soapbox/features/group/components/group-header.tsx          | 1 +
 .../modals/manage-group-modal/steps/confirmation-step.tsx       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/group/components/group-header.tsx b/app/soapbox/features/group/components/group-header.tsx
index 4cfe8f786..2491a7bb7 100644
--- a/app/soapbox/features/group/components/group-header.tsx
+++ b/app/soapbox/features/group/components/group-header.tsx
@@ -155,6 +155,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
                 theme='muted'
                 align='center'
                 dangerouslySetInnerHTML={{ __html: group.note_emojified }}
+                className='[&_a]:text-primary-600 [&_a]:hover:underline [&_a]:dark:text-accent-blue'
               />
             </Stack>
 
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index 11244c3c5..785da5da1 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -56,7 +56,7 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
           <Text size='2xl' weight='bold' align='center'>{group.display_name}</Text>
           <Text
             size='md'
-            className='mx-auto max-w-sm'
+            className='mx-auto max-w-sm [&_a]:text-primary-600 [&_a]:hover:underline [&_a]:dark:text-accent-blue'
             dangerouslySetInnerHTML={{ __html: group.note_emojified }}
           />
         </Stack>

From cfaa3ea6698cee09912cc4b2a6b67d9a78940bad Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 12 May 2023 12:50:32 -0400
Subject: [PATCH 296/298] Invalidate group tags after updating Group

---
 app/soapbox/features/group/edit-group.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index c0e972604..82f4841b4 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { useGroup, useUpdateGroup } from 'soapbox/api/hooks';
+import { useGroup, useGroupTags, useUpdateGroup } from 'soapbox/api/hooks';
 import { Button, Column, Form, FormActions, FormGroup, Icon, Input, Spinner, Textarea } from 'soapbox/components/ui';
 import { useAppSelector, useInstance } from 'soapbox/hooks';
 import { useImageField, useTextField } from 'soapbox/hooks/forms';
@@ -36,6 +36,7 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { groupId } }) => {
 
   const { group, isLoading } = useGroup(groupId);
   const { updateGroup } = useUpdateGroup(groupId);
+  const { invalidate } = useGroupTags(groupId);
 
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [tags, setTags] = useState<string[]>(['']);
@@ -64,6 +65,7 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { groupId } }) => {
       tags,
     }, {
       onSuccess() {
+        invalidate();
         toast.success(intl.formatMessage(messages.groupSaved));
       },
       onError(error) {

From 275d456693978e0ec6f2949f2dca4ccf6d474fb5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 12 May 2023 20:50:30 -0500
Subject: [PATCH 297/298] Fix groups test

---
 app/soapbox/jest/factory.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index 4d8ff336a..403904209 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -1,5 +1,6 @@
 import { v4 as uuidv4 } from 'uuid';
 
+import { normalizeStatus } from 'soapbox/normalizers';
 import {
   accountSchema,
   adSchema,
@@ -17,9 +18,9 @@ import {
   type GroupRelationship,
   type GroupTag,
   type Relationship,
+  type Status,
 } from 'soapbox/schemas';
 import { GroupRoles } from 'soapbox/schemas/group-member';
-import { statusSchema, type Status } from 'soapbox/schemas/status';
 
 // TODO: there's probably a better way to create these factory functions.
 // This looks promising but didn't work on my first attempt: https://github.com/anatine/zod-plugins/tree/main/packages/zod-mock
@@ -79,7 +80,7 @@ function buildRelationship(props: Partial<Relationship> = {}): Relationship {
 }
 
 function buildStatus(props: Partial<Status> = {}): Status {
-  return statusSchema.parse(Object.assign({
+  return normalizeStatus(Object.assign({
     id: uuidv4(),
   }, props));
 }

From 829d207cead6a8002d8362f5345192e74ef15bd0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 12 May 2023 21:46:36 -0500
Subject: [PATCH 298/298] Fix type

---
 app/soapbox/jest/factory.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index 403904209..019b0b17f 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -79,7 +79,7 @@ function buildRelationship(props: Partial<Relationship> = {}): Relationship {
   }, props));
 }
 
-function buildStatus(props: Partial<Status> = {}): Status {
+function buildStatus(props: Partial<Status> = {}) {
   return normalizeStatus(Object.assign({
     id: uuidv4(),
   }, props));