Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream

CHANGELOG.md

@@ -10,21 +10,24 @@ The following changelog entries focus on changes visible to users, administrator
 
 - **Add confirmation interstitial instead of silently redirecting logged-out visitors to remote resources** (#27792, #28902, and #30651 by @ClearlyClaire and @Gargron)\
   This fixes a longstanding open redirect in Mastodon, at the cost of added friction when local links to remote resources are shared.
+- Change `form-action` Content-Security-Policy directive to be more restrictive (#26897 by @ClearlyClaire)
+- Update dependencies
 
 ### Added
 
-- **Add experimental server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, and #31513 by @ClearlyClaire, @mgmn, and @renchap)\
+- **Add server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, #31513, #31592, #31594, #31638, #31746, #31652, #31709, #31725, #31745, #31613, #31657, #31840, #31610 and #31929 by @ClearlyClaire, @Gargron, @mgmn, and @renchap)\
   Group notifications of the same type for the same target, so that your notifications no longer get cluttered by boost and favorite notifications as soon as a couple of your posts get traction.\
   This is done server-side so that clients can efficiently get relevant groups without having to go through numerous pages of individual notifications.\
   As part of this, the visual design of the entire notifications feature has been revamped.\
   This feature is intended to eventually replace the existing notifications column, but for this first beta, users will have to enable it in the “Experimental features” section of the notifications column settings.\
   The API is not final yet, but it consists of:
   - a new `group_key` attribute to `Notification` entities
-  - `GET /api/v2_alpha/notifications`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-grouped
+  - `GET /api/v2/notifications`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-grouped
-  - `GET /api/v2_alpha/notifications/:group_key`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-notification-group
+  - `GET /api/v2/notifications/:group_key`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-notification-group
-  - `POST /api/v2_alpha/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/notifications_alpha/#dismiss-group
+  - `GET /api/v2/notifications/:group_key/accounts`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-group-accounts
-  - `GET /api/v2_alpha/notifications/:unread_count`: https://docs.joinmastodon.org/methods/notifications_alpha/#unread-group-count
+  - `POST /api/v2/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/grouped_notifications/#dismiss-group
-- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, and #31541 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
+  - `GET /api/v2/notifications/:unread_count`: https://docs.joinmastodon.org/methods/grouped_notifications/#unread-group-count
+- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, #31541, and #31723 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
   The old “Block notifications from non-followers”, “Block notifications from people you don't follow” and “Block direct messages from people you don't follow” notification settings have been replaced by a new set of settings found directly in the notification column.\
   You can now separately filter or drop notifications from people you don't follow, people who don't follow you, accounts created within the past 30 days, as well as unsolicited private mentions, and accounts limited by the moderation.\
   Instead of being outright dropped, notifications that you chose to filter are put in a separate “Filtered notifications” box that you can review separately without it clogging your main notifications.\
@@ -57,19 +60,22 @@ The following changelog entries focus on changes visible to users, administrator
 - **Add timeline of public posts about a trending link** (#30381 and #30840 by @Gargron)\
   You can now see public posts mentioning currently-trending articles from people who have opted into discovery features.\
   This adds a new REST API endpoint: https://docs.joinmastodon.org/methods/timelines/#link
-- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, and #30846 by @Gargron)\
+- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, #30846, #31819, and #31900 by @Gargron and @oneiros)\
   This adds a mechanism to [highlight the author of news articles](https://blog.joinmastodon.org/2024/07/highlighting-journalism-on-mastodon/) shared on Mastodon.\
   Articles hosted outside the fediverse can indicate a fediverse author with a meta tag:
   ```html
   <meta name="fediverse:creator" content="username@domain" />
   ```
   On the API side, this is represented by a new `authors` attribute to the `PreviewCard` entity: https://docs.joinmastodon.org/entities/PreviewCard/#authors\
-  Note that this feature is still work in progress and the tagging format and verification mechanisms may change in future releases.
+  Users can allow arbitrary domains to use `fediverse:creator` to credit them by visiting `/settings/verification`.\
+  This is federated as a new `attributionDomains` property in the `http://joinmastodon.org/ns` namespace, containing an array of domain names: https://docs.joinmastodon.org/spec/activitypub/#properties-used-1
 - **Add in-app notifications for moderation actions and warnings** (#30065, #30082, and #30081 by @ClearlyClaire)\
   In addition to email notifications, also notify users of moderation actions or warnings against them directly within the app, so they are less likely to miss important communication from their moderators.\
   This adds the `moderation_warning` notification type to the REST API and streaming, with a new [`moderation_warning` attribute](https://docs.joinmastodon.org/entities/Notification/#moderation_warning).
 - **Add domain information to profiles in web UI** (#29602 by @Gargron)\
   Clicking the domain of a user in their profile will now open a tooltip with a short explanation about servers and federation.
+- **Add support for Redis sentinel** (#31694, #31623, #31744, #31767, and #31768 by @ThisIsMissEm and @oneiros)\
+  See https://docs.joinmastodon.org/admin/scaling/#redis-sentinel
 - Add ability to reorder uploaded media before posting in web UI (#28456 by @Gargron)
 - Add moderation interface for searching hashtags (#30880 by @ThisIsMissEm)
 - Add ability for admins to configure instance favicon and logo (#30040, #30208, #30259, #30375, #30734, #31016, and #30205 by @ClearlyClaire, @FawazFarid, @JasonPunyon, @mgmn, and @renchap)\
@@ -77,6 +83,8 @@ The following changelog entries focus on changes visible to users, administrator
 - Add `api_versions` to `/api/v2/instance` (#31354 by @ClearlyClaire)\
   Add API version number to make it easier for clients to detect compatible features going forward.\
   See API documentation at https://docs.joinmastodon.org/entities/Instance/#api-versions
+- Add quick links to Administration and Moderation Reports from Web UI (#24838 by @ThisIsMissEm)
+- Add link to `/admin/roles` in moderation interface when changing someone's role (#31791 by @ClearlyClaire)
 - Add recent audit log entries in federation moderation interface (#27386 by @ThisIsMissEm)
 - Add profile setup to onboarding in web UI (#27829, #27876, and #28453 by @Gargron)
 - Add prominent share/copy button on profiles in web UI (#27865 and #27889 by @ClearlyClaire and @Gargron)
@@ -113,21 +121,24 @@ The following changelog entries focus on changes visible to users, administrator
 - Add support for multiple `redirect_uris` when creating OAuth 2.0 Applications (#29192 by @ThisIsMissEm)
 - Add Interlingue and Interlingua to interface languages (#28630 and #30828 by @Dhghomon and @renchap)
 - Add Kashubian, Pennsylvania Dutch, Vai, Jawi Malay, Mohawk and Low German to posting languages (#26024, #26634, #27136, #29098, #27115, and #27434 by @EngineerDali, @HelgeKrueger, and @gunchleoc)
-- Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm)
 - Add option to use native Ruby driver for Redis through `REDIS_DRIVER=ruby` (#30717 by @vmstan)
 - Add support for libvips in addition to ImageMagick (#30090, #30590, #30597, #30632, #30857, #30869, and #30858 by @ClearlyClaire, @Gargron, and @mjankowski)\
   Server admins can now use libvips as a faster and lighter alternative to ImageMagick for processing user-uploaded images.\
   This requires libvips 8.13 or newer, and needs to be enabled with `MASTODON_USE_LIBVIPS=true`.\
   This is enabled by default in the official Docker images, and is intended to completely replace ImageMagick in the future.
+- Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm)
+- Add anchors to each authorized application in `/oauth/authorized_applications` (#31677 by @fowl2)
 - Add active animation to header settings button (#30221, #30307, and #30388 by @daudix)
 - Add OpenTelemetry instrumentation (#30130, #30322, #30353, and #30350 by @julianocosta89, @renchap, and @robbkidd)\
   See https://docs.joinmastodon.org/admin/config/#otel for documentation
 - Add API to get multiple accounts and statuses (#27871 and #30465 by @ClearlyClaire)\
   This adds `GET /api/v1/accounts` and `GET /api/v1/statuses` to the REST API, see https://docs.joinmastodon.org/methods/accounts/#index and https://docs.joinmastodon.org/methods/statuses/#index
+- Add support for CORS to `POST /oauth/revoke` (#31743 by @ClearlyClaire)
 - Add redirection back to previous page after site upload deletion (#30141 by @FawazFarid)
 - Add RFC8414 OAuth 2.0 server metadata (#29191 by @ThisIsMissEm)
 - Add loading indicator and empty result message to advanced interface search (#30085 by @ClearlyClaire)
 - Add `profile` OAuth 2.0 scope, allowing more limited access to user data (#29087 and #30357 by @ThisIsMissEm)
+- Add global Regexp timeout (#31928 by @ClearlyClaire)
 - Add the role ID to the badge component (#29707 by @renchap)
 - Add diagnostic message for failure during CLI search deploy (#29462 by @mjankowski)
 - Add pagination `Link` headers on API accounts/statuses when pinned true (#29442 by @mjankowski)
@@ -156,14 +167,14 @@ The following changelog entries focus on changes visible to users, administrator
 - **Change icons throughout the web interface** (#27385, #27539, #27555, #27579, #27700, #27817, #28519, #28709, #28064, #28775, #28780, #27924, #29294, #29395, #29537, #29569, #29610, #29612, #29649, #29844, #27780, #30974, #30963, #30962, #30961, #31362, #31363, #31359, #31371, #31360, #31512, #31511, and #31525 by @ClearlyClaire, @Gargron, @arbolitoloco1, @mjankowski, @nclm, @renchap, @ronilaukkarinen, and @zunda)\
   This changes all the interface icons from FontAwesome to Material Symbols for a more modern look, consistent with the official Mastodon Android app.\
   In addition, better care is given to pixel alignment, and icon variants are used to better highlight active/inactive state.
-- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, and #29659 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
+- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, #29659, and #31889 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
   The compose form has been completely redesigned for a more modern and consistent look, as well as spelling out the chosen privacy setting and language name at all times.\
   As part of this, the “Unlisted” privacy setting has been renamed to “Quiet public”.
-- **Change design of confirmation modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, and #31399 by @ClearlyClaire, @Gargron, and @tribela)\
+- **Change design of modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, #31399, #31555, #31752, #31801, #31883, #31844, #31864, and #31943 by @ClearlyClaire, @Gargron, @tribela and @vmstan)\
   The mute, block, and domain block confirmation modals have been completely redesigned to be clearer and include more detailed information on the action to be performed.\
   They also have a more modern and consistent design, along with other confirmation modals in the application.
 - **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, and #31510 by @ClearlyClaire, @Gargron, @renchap, and @vmstan)
-- **Change onboarding prompt to follow suggestions carousel in web UI** (#28878 and #29272 by @Gargron)
+- **Change onboarding prompt to follow suggestions carousel in web UI** (#28878, #29272, and #31912 by @Gargron)
 - **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, and #29879 by @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\
   All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to read and keeping maximum compatibility across mail clients.
 - **Change follow recommendations algorithm** (#28314, #28433, #29017, #29108, #29306, #29550, #29619, and #31474 by @ClearlyClaire, @Gargron, @kernal053, @mjankowski, and @wheatear-dev)\
@@ -171,19 +182,28 @@ The following changelog entries focus on changes visible to users, administrator
   In addition, the implementation has been significantly reworked, and all follow recommendations are now dismissable.\
   This change deprecates the `source` attribute in `Suggestion` entities in the REST API, and replaces it with the new [`sources` attribute](https://docs.joinmastodon.org/entities/Suggestion/#sources).
 - Change account search algorithm (#30803 by @Gargron)
-- **Change streaming server to use its own dependencies and its own docker image** (#24702, #27967, #26850, #28112, #28115, #28137, #28138, #28497, #28548, and #30795 by @TheEssem, @ThisIsMissEm, @jippi, @timetinytim, and @vmstan)\
+- **Change streaming server to use its own dependencies and its own docker image** (#24702, #27967, #26850, #28112, #28115, #28137, #28138, #28497, #28548, #30795, #31612, and #31615 by @TheEssem, @ThisIsMissEm, @jippi, @renchap, @timetinytim, and @vmstan)\
   In order to reduce the amount of runtime dependencies, the streaming server has been moved into a separate package and Docker image.\
   The `mastodon` image does not contain the streaming server anymore, as it has been moved to its own `mastodon-streaming` image.\
   Administrators may need to update their setup accordingly.
-- Change how content warnings and filters are displayed in web UI (#31365 by @Gargron)
+- Change how content warnings and filters are displayed in web UI (#31365, and #31761 by @Gargron)
+- Change preview card processing to ignore `undefined` as canonical url (#31882 by @oneiros)
+- Change embedded posts to use web UI (#31766 by @Gargron)
+- Change inner borders in media galleries in web UI (#31852 by @Gargron)
+- Change design of hide media button in web UI (#31807 by @Gargron)
+- Change labels on thread indicators in web UI (#31806 by @Gargron)
+- Change report action buttons to be disabled when action has already been taken (#31773, #31822, and #31899 by @ClearlyClaire and @ThisIsMissEm)
+- Change width of columns in advanced web UI (#31762 by @Gargron)
+- Change design of unread conversations in web UI (#31763 by @Gargron)
 - Change Web UI to allow viewing and severing relationships with suspended accounts (#27667 by @ClearlyClaire)\
   This also adds a `with_suspended` parameter to `GET /api/v1/accounts/relationships` in the REST API.
+- Change preview card image size limit from 2MB to 8MB when using libvips (#31904 by @ClearlyClaire)
 - Change avatars border radius (#31390 by @renchap)
 - Change counters to be displayed on profile timelines in web UI (#30525 by @Gargron)
 - Change disabled buttons color in light mode to make the difference more visible (#30998 by @renchap)
 - Change design of people tab on explore in web UI (#30059 by @Gargron)
 - Change sidebar text in web UI (#30696 by @Gargron)
-- Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452 and #28465 by @Gargron and @renchap)
+- Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452, #28465, and #31934 by @ClearlyClaire, @Gargron and @renchap)
 - Change media to be hidden/blurred by default in report modal (#28522 by @ClearlyClaire)
 - Change order of the "muting" and "blocking" list options in “Data Exports” (#26088 by @fixermark)
 - Change admin and moderation notes character limit from 500 to 2000 characters (#30288 by @ThisIsMissEm)
@@ -197,6 +217,7 @@ The following changelog entries focus on changes visible to users, administrator
 - Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532 by @Gargron)
 - Change back button to always appear in advanced web UI (#29551 and #29669 by @Gargron)
 - Change border of active compose field search inputs (#29832 and #29839 by @vmstan)
+- Change instances of Nokogiri HTML4 parsing to HTML5 (#31812, #31815, #31813, and #31814 by @flavorjones)
 - Change link detection to allow `@` at the end of an URL (#31124 by @adamniedzielski)
 - Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192 by @ClearlyClaire)
 - Change layout and wording of the Content Retention server settings page (#27733 by @vmstan)
@@ -249,8 +270,17 @@ The following changelog entries focus on changes visible to users, administrator
 - Fix various issues when in link preview card generation (#28748, #30017, #30362, #30173, #30853, #30929, #30933, #30957, #30987, and #31144 by @adamniedzielski, @oneiros, @phocks, @timothyjrogers, and @tribela)
 - Fix handling of missing links in Webfinger responses (#31030 by @adamniedzielski)
 - Fix HTTP 500 error in `/api/v1/polls/:id/votes` when required `choices` parameter is missing (#25598 by @danielmbrasil)
+- Fix security context sometimes not being added in LD-Signed activities (#31871 by @ClearlyClaire)
 - Fix cross-origin loading of `inert.css` polyfill (#30687 by @louis77)
 - Fix cutoff of instance name in sign-up form (#30598 by @oneiros)
+- Fix invalid date searches returning 503 errors (#31526 by @notchairmk)
+- Fix invalid `visibility` values in `POST /api/v1/statuses` returning 500 errors (#31571 by @c960657)
+- Fix some components re-rendering spuriously in web UI (#31879 and #31881 by @ClearlyClaire and @Gargron)
+- Fix sort order of moderation notes on Reports and Accounts (#31528 by @ThisIsMissEm)
+- Fix email language when recipient has no selected locale (#31747 by @ClearlyClaire)
+- Fix frequently-used languages not correctly updating in the web UI (#31386 by @c960657)
+- Fix `POST /api/v1/statuses` silently ignoring invalid `media_ids` parameter (#31681 by @c960657)
+- Fix handling of the `BIND` environment variable in the streaming server (#31624 by @ThisIsMissEm)
 - Fix empty `aria-hidden` attribute value in logo resources area (#30570 by @mjankowski)
 - Fix “Redirect URI” field not being marked as required in “New application” form (#30311 by @ThisIsMissEm)
 - Fix right-to-left text in preview cards (#30930 by @ClearlyClaire)

app/javascript/mastodon/actions/markers.ts

@@ -2,7 +2,6 @@ import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'mastodon/api_types/markers';
 import { getAccessToken } from 'mastodon/initial_state';
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 import type { AppDispatch, RootState } from 'mastodon/store';
 import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
 
@@ -76,12 +75,7 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return state.notificationGroups.lastReadId;
-  return selectUseGroupedNotifications(state)
-    ? state.notificationGroups.lastReadId
-    : // @ts-expect-error state.notifications is not yet typed
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-      state.getIn(['notifications', 'lastReadId']);
 }
 
 const buildPostMarkersParams = (state: RootState) => {

app/javascript/mastodon/actions/notifications_migration.tsx

@@ -1,14 +1,10 @@
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 import { createAppAsyncThunk } from 'mastodon/store';
 
 import { fetchNotifications } from './notification_groups';
-import { expandNotifications } from './notifications';
 
 export const initializeNotifications = createAppAsyncThunk(
   'notifications/initialize',
-  (_, { dispatch, getState }) => {
+  (_, { dispatch }) => {
-    if (selectUseGroupedNotifications(getState()))
     void dispatch(fetchNotifications());
-    else void dispatch(expandNotifications({}));
   },
 );

app/javascript/mastodon/actions/streaming.js

@@ -1,7 +1,5 @@
 // @ts-check
 
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
-
 import { getLocale } from '../locales';
 import { connectStream } from '../stream';
 
@@ -105,18 +103,14 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const notificationJSON = JSON.parse(data.payload);
           dispatch(updateNotifications(notificationJSON, messages, locale));
           // TODO: remove this once the groups feature replaces the previous one
-          if(selectUseGroupedNotifications(getState())) {
           dispatch(processNewNotificationForGroups(notificationJSON));
-          }
           break;
         }
         case 'notifications_merged':
           const state = getState();
           if (state.notifications.top || !state.notifications.mounted)
             dispatch(expandNotifications({ forceLoad: true, maxId: undefined }));
-          if (selectUseGroupedNotifications(state)) {
           dispatch(refreshStaleNotificationGroups());
-          }
           break;
         case 'conversation':
           // @ts-expect-error
@@ -141,22 +135,16 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
 
 /**
  * @param {Function} dispatch
- * @param {Function} getState
  */
-async function refreshHomeTimelineAndNotification(dispatch, getState) {
+async function refreshHomeTimelineAndNotification(dispatch) {
   await dispatch(expandHomeTimeline({ maxId: undefined }));
 
-  // TODO: remove this once the groups feature replaces the previous one
-  if(selectUseGroupedNotifications(getState())) {
   // TODO: polling for merged notifications
   try {
     await dispatch(pollRecentGroupNotifications());
   } catch {
     // TODO
   }
-  } else {
-    await dispatch(expandNotifications({}));
-  }
 
   await dispatch(fetchAnnouncements());
 }

app/javascript/mastodon/components/follow_button.tsx

@@ -75,10 +75,10 @@ export const FollowButton: React.FC<{
     label = <LoadingIndicator />;
   } else if (relationship.following && relationship.followed_by) {
     label = intl.formatMessage(messages.mutual);
-  } else if (!relationship.following && relationship.followed_by) {
-    label = intl.formatMessage(messages.followBack);
   } else if (relationship.following || relationship.requested) {
     label = intl.formatMessage(messages.unfollow);
+  } else if (relationship.followed_by) {
+    label = intl.formatMessage(messages.followBack);
   } else {
     label = intl.formatMessage(messages.follow);
   }

app/javascript/mastodon/features/account/components/header.jsx

@@ -92,10 +92,10 @@ const messageForFollowButton = relationship => {
 
   if (relationship.get('following') && relationship.get('followed_by')) {
     return messages.mutual;
-  } else if (!relationship.get('following') && relationship.get('followed_by')) {
-    return messages.followBack;
   } else if (relationship.get('following') || relationship.get('requested')) {
     return messages.unfollow;
+  } else if (relationship.get('followed_by')) {
+    return messages.followBack;
   } else {
     return messages.follow;
   }

app/javascript/mastodon/features/notifications/components/column_settings.jsx

@@ -6,7 +6,6 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { forceGroupedNotifications } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
 import ClearColumnButton from './clear_column_button';
@@ -36,7 +35,6 @@ class ColumnSettings extends PureComponent {
 
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
-    const groupingShowStr = <FormattedMessage id='notifications.column_settings.beta.grouping' defaultMessage='Group notifications' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
     const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
@@ -68,18 +66,6 @@ class ColumnSettings extends PureComponent {
 
         <PolicyControls />
 
-        {!forceGroupedNotifications && (
-          <section role='group' aria-labelledby='notifications-beta'>
-            <h3 id='notifications-beta'>
-              <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
-            </h3>
-
-            <div className='column-settings__row'>
-              <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
-            </div>
-          </section>
-        )}
-
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>
             <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />

app/javascript/mastodon/features/notifications_wrapper.jsx

@@ -1,13 +1,8 @@
-import Notifications from 'mastodon/features/notifications';
 import Notifications_v2 from 'mastodon/features/notifications_v2';
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
-import { useAppSelector } from 'mastodon/store';
 
 export const NotificationsWrapper = (props) => {
-  const optedInGroupedNotifications = useAppSelector(selectUseGroupedNotifications);
-
   return (
-    optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
+    <Notifications_v2 {...props} />
   );
 };
 

app/javascript/mastodon/features/ui/components/columns_area.jsx

@@ -63,8 +63,8 @@ export default class ColumnsArea extends ImmutablePureComponent {
     children: PropTypes.node,
   };
 
-  // Corresponds to (max-width: $no-gap-breakpoint + 285px - 1px) in SCSS
+  // Corresponds to (max-width: $no-gap-breakpoint - 1px) in SCSS
-  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1174px)');
+  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1206px)');
 
   state = {
     renderComposePanel: !(this.mediaQuery && this.mediaQuery.matches),

app/javascript/mastodon/features/ui/components/navigation_panel.jsx

@@ -37,7 +37,6 @@ import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
 import { canManageReports, canViewAdminDashboard } from 'mastodon/permissions';
 import { selectUnreadNotificationGroupsCount } from 'mastodon/selectors/notifications';
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
@@ -65,19 +64,17 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
-  const optedInGroupedNotifications = useSelector(selectUseGroupedNotifications);
-  const count = useSelector(state => state.getIn(['notifications', 'unread']));
-  const intl = useIntl();
 
-  const newCount = useSelector(selectUnreadNotificationGroupsCount);
+  const count = useSelector(selectUnreadNotificationGroupsCount);
+  const intl = useIntl();
 
   return (
     <ColumnLink
       key='notifications'
       transparent
       to='/notifications'
-      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );

app/javascript/mastodon/initial_state.js

@@ -43,7 +43,6 @@
  * @property {boolean=} use_pending_items
  * @property {string} version
  * @property {string} sso_redirect
- * @property {boolean} force_grouped_notifications
  */
 
 /**
@@ -119,7 +118,6 @@ export const criticalUpdatesPending = initialState?.critical_updates_pending;
 // @ts-expect-error
 export const statusPageUrl = getMeta('status_page_url');
 export const sso_redirect = getMeta('sso_redirect');
-export const forceGroupedNotifications = getMeta('force_grouped_notifications');
 
 /**
  * @returns {string | undefined}

app/javascript/mastodon/locales/ar.json

@@ -528,8 +528,6 @@
   "notifications.column_settings.admin.report": "التبليغات الجديدة:",
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
-  "notifications.column_settings.beta.category": "ميزات تجريبية",
-  "notifications.column_settings.beta.grouping": "جمّع الإشعارات",
   "notifications.column_settings.favourite": "المفضلة:",
   "notifications.column_settings.filter_bar.advanced": "عرض جميع الفئات",
   "notifications.column_settings.filter_bar.category": "شريط التصفية السريعة",

app/javascript/mastodon/locales/ast.json

@@ -297,7 +297,6 @@
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
-  "notifications.column_settings.beta.category": "Funciones esperimentales",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",

app/javascript/mastodon/locales/be.json

@@ -523,8 +523,6 @@
   "notifications.column_settings.admin.report": "Новыя скаргі:",
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
-  "notifications.column_settings.beta.category": "Эксперыментальныя функцыі",
-  "notifications.column_settings.beta.grouping": "Групаваць апавяшчэннi",
   "notifications.column_settings.favourite": "Упадабанае:",
   "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
   "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",

app/javascript/mastodon/locales/bg.json

@@ -540,8 +540,6 @@
   "notifications.column_settings.admin.report": "Нови доклади:",
   "notifications.column_settings.admin.sign_up": "Нови регистрации:",
   "notifications.column_settings.alert": "Известия на работния плот",
-  "notifications.column_settings.beta.category": "Експериментални функции",
-  "notifications.column_settings.beta.grouping": "Групови известия",
   "notifications.column_settings.favourite": "Любими:",
   "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
   "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",

app/javascript/mastodon/locales/ca.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nous informes:",
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
-  "notifications.column_settings.beta.category": "Característiques experimentals",
-  "notifications.column_settings.beta.grouping": "Notificacions de grup",
   "notifications.column_settings.favourite": "Favorits:",
   "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",

app/javascript/mastodon/locales/cs.json

@@ -509,8 +509,6 @@
   "notifications.column_settings.admin.report": "Nová hlášení:",
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
-  "notifications.column_settings.beta.category": "Experimentální funkce",
-  "notifications.column_settings.beta.grouping": "Seskupit notifikace",
   "notifications.column_settings.favourite": "Oblíbené:",
   "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",

app/javascript/mastodon/locales/cy.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Adroddiadau newydd:",
   "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
-  "notifications.column_settings.beta.category": "Nodweddion arbrofol",
-  "notifications.column_settings.beta.grouping": "Grŵpio hysbysiadau",
   "notifications.column_settings.favourite": "Ffefrynnau:",
   "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
   "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",

app/javascript/mastodon/locales/da.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
-  "notifications.column_settings.beta.category": "Eksperimentelle funktioner",
-  "notifications.column_settings.beta.grouping": "Gruppér notifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",

app/javascript/mastodon/locales/de.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
-  "notifications.column_settings.beta.category": "Experimentelle Funktionen",
-  "notifications.column_settings.beta.grouping": "Benachrichtigungen gruppieren",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
   "notifications.column_settings.filter_bar.category": "Filterleiste",
@@ -777,7 +775,7 @@
   "status.admin_domain": "{domain} moderieren",
   "status.admin_status": "Beitrag moderieren",
   "status.block": "@{name} blockieren",
-  "status.bookmark": "Beitrag als Lesezeichen setzen",
+  "status.bookmark": "Lesezeichen setzen",
   "status.cancel_reblog_private": "Beitrag nicht mehr teilen",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
   "status.continued_thread": "Fortgeführter Thread",

app/javascript/mastodon/locales/el.json

@@ -551,8 +551,6 @@
   "notifications.column_settings.admin.report": "Νέες αναφορές:",
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
-  "notifications.column_settings.beta.category": "Πειραματικές λειτουργίες",
-  "notifications.column_settings.beta.grouping": "Ομαδοποίηση ειδοποιήσεων",
   "notifications.column_settings.favourite": "Αγαπημένα:",
   "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
   "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",

app/javascript/mastodon/locales/en-GB.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.beta.category": "Experimental features",
-  "notifications.column_settings.beta.grouping": "Group notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",

app/javascript/mastodon/locales/en.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.beta.category": "Experimental features",
-  "notifications.column_settings.beta.grouping": "Group notifications",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",

app/javascript/mastodon/locales/es-AR.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
-  "notifications.column_settings.beta.category": "Funciones experimentales",
-  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",

app/javascript/mastodon/locales/es-MX.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
-  "notifications.column_settings.beta.category": "Características experimentales",
-  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",

app/javascript/mastodon/locales/es.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
-  "notifications.column_settings.beta.category": "Características experimentales",
-  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",

app/javascript/mastodon/locales/et.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Uued teavitused:",
   "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
-  "notifications.column_settings.beta.category": "Eksperimentaalsed oskused",
-  "notifications.column_settings.beta.grouping": "Teavituste rühmitamine",
   "notifications.column_settings.favourite": "Lemmikud:",
   "notifications.column_settings.filter_bar.advanced": "Näita kõiki kategooriaid",
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",

app/javascript/mastodon/locales/eu.json

@@ -555,8 +555,6 @@
   "notifications.column_settings.admin.report": "Txosten berriak:",
   "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
-  "notifications.column_settings.beta.category": "Ezaugarri esperimentalak",
-  "notifications.column_settings.beta.grouping": "Multzokatu jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
   "notifications.column_settings.filter_bar.advanced": "Bistaratu kategoria guztiak",
   "notifications.column_settings.filter_bar.category": "Iragazki-barra bizkorra",

app/javascript/mastodon/locales/fa.json

@@ -534,8 +534,6 @@
   "notifications.column_settings.admin.report": "گزارش‌های جدید:",
   "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
-  "notifications.column_settings.beta.category": "ویژگی‌های آزمایشی",
-  "notifications.column_settings.beta.grouping": "گروه‌بندی آگاهی‌ها",
   "notifications.column_settings.favourite": "برگزیده‌ها:",
   "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها",
   "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",

app/javascript/mastodon/locales/fi.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Uudet raportit:",
   "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
-  "notifications.column_settings.beta.category": "Kokeelliset ominaisuudet",
-  "notifications.column_settings.beta.grouping": "Ryhmittele ilmoitukset",
   "notifications.column_settings.favourite": "Suosikit:",
   "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",

app/javascript/mastodon/locales/fo.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
   "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
   "notifications.column_settings.alert": "Skriviborðsfráboðanir",
-  "notifications.column_settings.beta.category": "Royndarhentleikar",
-  "notifications.column_settings.beta.grouping": "Bólkafráboðanir",
   "notifications.column_settings.favourite": "Dámdir postar:",
   "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
   "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",

app/javascript/mastodon/locales/fr-CA.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nouveaux signalements:",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
   "notifications.column_settings.alert": "Notifications navigateur",
-  "notifications.column_settings.beta.category": "Fonctionnalités expérimentales",
-  "notifications.column_settings.beta.grouping": "Grouper les notifications",
   "notifications.column_settings.favourite": "Favoris:",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",

app/javascript/mastodon/locales/fr.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nouveaux signalements :",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
-  "notifications.column_settings.beta.category": "Fonctionnalités expérimentales",
-  "notifications.column_settings.beta.grouping": "Grouper les notifications",
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",

app/javascript/mastodon/locales/fy.json

@@ -558,8 +558,6 @@
   "notifications.column_settings.admin.report": "Nije rapportaazjes:",
   "notifications.column_settings.admin.sign_up": "Nije registraasjes:",
   "notifications.column_settings.alert": "Desktopmeldingen",
-  "notifications.column_settings.beta.category": "Eksperimintele funksjes",
-  "notifications.column_settings.beta.grouping": "Notifikaasjes groepearje",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
   "notifications.column_settings.filter_bar.category": "Flugge filterbalke",

app/javascript/mastodon/locales/ga.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.admin.sign_up": "Clárúcháin nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
-  "notifications.column_settings.beta.category": "Gnéithe turgnamhacha",
-  "notifications.column_settings.beta.grouping": "Fógraí grúpa",
   "notifications.column_settings.favourite": "Ceanáin:",
   "notifications.column_settings.filter_bar.advanced": "Taispeáin gach catagóir",
   "notifications.column_settings.filter_bar.category": "Barra scagairí tapa",

app/javascript/mastodon/locales/gd.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Gearanan ùra:",
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
-  "notifications.column_settings.beta.category": "Gleusan deuchainneil",
-  "notifications.column_settings.beta.grouping": "Buidhnich na brathan",
   "notifications.column_settings.favourite": "Annsachdan:",
   "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",

app/javascript/mastodon/locales/gl.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Novas denuncias:",
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
-  "notifications.column_settings.beta.category": "Características experimentais",
-  "notifications.column_settings.beta.grouping": "Notificacións de grupo",
   "notifications.column_settings.favourite": "Favoritas:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",

app/javascript/mastodon/locales/he.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
-  "notifications.column_settings.beta.category": "יכולות ניסיוניות",
-  "notifications.column_settings.beta.grouping": "התראות קבוצה",
   "notifications.column_settings.favourite": "חיבובים:",
   "notifications.column_settings.filter_bar.advanced": "להציג את כל הקטגוריות",
   "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",

app/javascript/mastodon/locales/hu.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Új jelentések:",
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
-  "notifications.column_settings.beta.category": "Kísérleti funkciók",
-  "notifications.column_settings.beta.grouping": "Csoportértesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
   "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
   "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",

app/javascript/mastodon/locales/ia.json

@@ -535,8 +535,6 @@
   "notifications.column_settings.admin.report": "Nove reportos:",
   "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
-  "notifications.column_settings.beta.category": "Functionalitates experimental",
-  "notifications.column_settings.beta.grouping": "Notificationes de gruppo",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rapide",

app/javascript/mastodon/locales/is.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nýjar kærur:",
   "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
-  "notifications.column_settings.beta.category": "Eiginleikar á tilraunastigi",
-  "notifications.column_settings.beta.grouping": "Tilkynningar hópa",
   "notifications.column_settings.favourite": "Eftirlæti:",
   "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
   "notifications.column_settings.filter_bar.category": "Skyndisíustika",

app/javascript/mastodon/locales/it.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
-  "notifications.column_settings.beta.category": "Funzioni sperimentali",
-  "notifications.column_settings.beta.grouping": "Notifiche di gruppo",
   "notifications.column_settings.favourite": "Preferiti:",
   "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
   "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",

app/javascript/mastodon/locales/ja.json

@@ -558,8 +558,6 @@
   "notifications.column_settings.admin.report": "新しい通報:",
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
-  "notifications.column_settings.beta.category": "実験段階の機能",
-  "notifications.column_settings.beta.grouping": "通知をグループにまとめる",
   "notifications.column_settings.favourite": "お気に入り:",
   "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
   "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",

app/javascript/mastodon/locales/kab.json

@@ -411,7 +411,6 @@
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk alɣuten-inek·em i lebda?",
   "notifications.column_settings.admin.report": "Ineqqisen imaynuten:",
   "notifications.column_settings.alert": "Alɣuten n tnarit",
-  "notifications.column_settings.beta.grouping": "Segrew alɣuten",
   "notifications.column_settings.favourite": "Imenyafen:",
   "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
   "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",

app/javascript/mastodon/locales/ko.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "새 신고:",
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
-  "notifications.column_settings.beta.category": "실험적인 기능",
-  "notifications.column_settings.beta.grouping": "알림 그룹화",
   "notifications.column_settings.favourite": "좋아요:",
   "notifications.column_settings.filter_bar.advanced": "모든 범주 표시",
   "notifications.column_settings.filter_bar.category": "빠른 필터 막대",

app/javascript/mastodon/locales/lad.json

@@ -490,7 +490,6 @@
   "notifications.column_settings.admin.report": "Muveos raportos:",
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
   "notifications.column_settings.alert": "Avizos de ensimameza",
-  "notifications.column_settings.beta.category": "Funksyones eksperimentalas",
   "notifications.column_settings.favourite": "Te plazen:",
   "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
   "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",

app/javascript/mastodon/locales/lt.json

@@ -552,8 +552,6 @@
   "notifications.column_settings.admin.report": "Naujos ataskaitos:",
   "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
-  "notifications.column_settings.beta.category": "Eksperimentinės funkcijos",
-  "notifications.column_settings.beta.grouping": "Grupuoti pranešimus",
   "notifications.column_settings.favourite": "Mėgstami:",
   "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
   "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",

app/javascript/mastodon/locales/lv.json

@@ -91,6 +91,7 @@
   "block_modal.show_more": "Parādīt mazāk",
   "block_modal.they_cant_mention": "Nevar Tevi pieminēt vai sekot Tev.",
   "block_modal.they_cant_see_posts": "Nevar redzēt Tavus ierakstus, un Tu neredzēsi lietotāja.",
+  "block_modal.title": "Bloķēt lietotāju?",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "boost_modal.reblog": "Pastiprināt ierakstu?",
   "boost_modal.undo_reblog": "Atcelt ieraksta pastiprināšanu?",
@@ -155,6 +156,7 @@
   "compose_form.poll.single": "Jāizvēlas viens",
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
+  "compose_form.poll.type": "Stils",
   "compose_form.publish": "Iesūtīt",
   "compose_form.publish_form": "Jauns ieraksts",
   "compose_form.reply": "Atbildēt",
@@ -181,6 +183,7 @@
   "confirmations.mute.confirm": "Apklusināt",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
   "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
+  "confirmations.redraft.title": "Dzēst un rakstīt vēlreiz?",
   "confirmations.reply.confirm": "Atbildēt",
   "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
   "confirmations.reply.title": "Pārrakstīt ierakstu?",
@@ -208,7 +211,11 @@
   "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
   "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
   "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
+  "domain_block_modal.block": "Bloķēt serveri",
   "domain_block_modal.they_cant_follow": "Neviens šajā serverī nevar Tev sekot.",
+  "domain_block_modal.they_wont_know": "Viņi nezinās, ka tikuši bloķēti.",
+  "domain_block_modal.title": "Bloķēt domēnu?",
+  "domain_block_modal.you_will_lose_followers": "Tiks noņemti visi tavi sekotāji no šī servera.",
   "domain_pill.server": "Serveris",
   "domain_pill.username": "Lietotājvārds",
   "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
@@ -277,6 +284,7 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
+  "filter_warning.matches_filter": "Atbilst filtram “{title}”",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Citi serveri",
@@ -285,6 +293,7 @@
   "follow_requests.unlocked_explanation": "Lai gan Tavs konts nav slēgts, {domain} darbinieki iedomājās, ka Tu varētu vēlēties pašrocīgi pārskatīt sekošanas pieprasījumus no šiem kontiem.",
   "follow_suggestions.curated_suggestion": "Darbinieku izvēle",
   "follow_suggestions.dismiss": "Vairs nerādīt",
+  "follow_suggestions.friends_of_friends_longer": "Populārs to cilvēku vidū, kuriem tu seko",
   "follow_suggestions.personalized_suggestion": "Pielāgots ieteikums",
   "follow_suggestions.similar_to_recently_followed_longer": "Līdzīgi profieliem, kuriem nesen sāki sekot",
   "follow_suggestions.view_all": "Skatīt visu",
@@ -315,6 +324,7 @@
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "hashtags.and_other": "… un {count, plural, other {vēl #}}",
+  "hints.threads.replies_may_be_missing": "Var trūkt atbildes no citiem serveriem.",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",

app/javascript/mastodon/locales/nl.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
-  "notifications.column_settings.beta.category": "Experimentele functies",
-  "notifications.column_settings.beta.grouping": "Gegroepeerde meldingen",
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",

app/javascript/mastodon/locales/nn.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nye rapportar:",
   "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
-  "notifications.column_settings.beta.category": "Eksperimentelle funksjonar",
-  "notifications.column_settings.beta.grouping": "Grupper varslingar",
   "notifications.column_settings.favourite": "Favorittar:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
   "notifications.column_settings.filter_bar.category": "Snøggfilterline",

app/javascript/mastodon/locales/pl.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nowe zgłoszenia:",
   "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
-  "notifications.column_settings.beta.category": "Funkcje eksperymentalne",
-  "notifications.column_settings.beta.grouping": "Powiadomienia grupowe",
   "notifications.column_settings.favourite": "Ulubione:",
   "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
   "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",

app/javascript/mastodon/locales/pt-BR.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
-  "notifications.column_settings.beta.category": "Recursos experimentais",
-  "notifications.column_settings.beta.grouping": "Agrupar notificações",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Exibir todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",

app/javascript/mastodon/locales/pt-PT.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no ambiente de trabalho",
-  "notifications.column_settings.beta.category": "Funcionalidades experimentais",
-  "notifications.column_settings.beta.grouping": "Agrupar notificações",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",

app/javascript/mastodon/locales/ru.json

@@ -502,7 +502,6 @@
   "notifications.column_settings.admin.report": "Новые жалобы:",
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
-  "notifications.column_settings.beta.category": "Экспериментальные функции",
   "notifications.column_settings.favourite": "Избранные:",
   "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
   "notifications.column_settings.filter_bar.category": "Панель сортировки",

app/javascript/mastodon/locales/sc.json

@@ -421,8 +421,6 @@
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
   "notifications.column_settings.admin.report": "Informes noos:",
   "notifications.column_settings.alert": "Notìficas de iscrivania",
-  "notifications.column_settings.beta.category": "Funtzionalidades isperimentales",
-  "notifications.column_settings.beta.grouping": "Notìficas de grupu",
   "notifications.column_settings.favourite": "Preferidos:",
   "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtru lestru",

app/javascript/mastodon/locales/sl.json

@@ -520,8 +520,6 @@
   "notifications.column_settings.admin.report": "Nove prijave:",
   "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
-  "notifications.column_settings.beta.category": "Poskusne funkcionalnosti",
-  "notifications.column_settings.beta.grouping": "Skupine obvestil",
   "notifications.column_settings.favourite": "Priljubljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
   "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",

app/javascript/mastodon/locales/sq.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Raportime të reja:",
   "notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
   "notifications.column_settings.alert": "Njoftime desktopi",
-  "notifications.column_settings.beta.category": "Veçori eksperimentale",
-  "notifications.column_settings.beta.grouping": "Njoftime grupi",
   "notifications.column_settings.favourite": "Të parapëlqyer:",
   "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
   "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",

app/javascript/mastodon/locales/sv.json

@@ -554,8 +554,6 @@
   "notifications.column_settings.admin.report": "Nya rapporter:",
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
-  "notifications.column_settings.beta.category": "Experimentella funktioner",
-  "notifications.column_settings.beta.grouping": "Gruppera notifikationer",
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",

app/javascript/mastodon/locales/th.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "รายงานใหม่:",
   "notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
   "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
-  "notifications.column_settings.beta.category": "คุณลักษณะการทดลอง",
-  "notifications.column_settings.beta.grouping": "การแจ้งเตือนกลุ่ม",
   "notifications.column_settings.favourite": "รายการโปรด:",
   "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
   "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",

app/javascript/mastodon/locales/tr.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Yeni bildirimler:",
   "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
-  "notifications.column_settings.beta.category": "Deneysel özellikler",
-  "notifications.column_settings.beta.grouping": "Grup bildirimleri",
   "notifications.column_settings.favourite": "Favorilerin:",
   "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
   "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",

app/javascript/mastodon/locales/uk.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Нові скарги:",
   "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
   "notifications.column_settings.alert": "Сповіщення стільниці",
-  "notifications.column_settings.beta.category": "Експериментальні функції",
-  "notifications.column_settings.beta.grouping": "Групові сповіщення",
   "notifications.column_settings.favourite": "Уподобане:",
   "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
   "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",

app/javascript/mastodon/locales/vi.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Báo cáo mới:",
   "notifications.column_settings.admin.sign_up": "Người mới tham gia:",
   "notifications.column_settings.alert": "Báo trên máy tính",
-  "notifications.column_settings.beta.category": "Tính năng thử nghiệm",
-  "notifications.column_settings.beta.grouping": "Gộp thông báo theo loại",
   "notifications.column_settings.favourite": "Lượt thích:",
   "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
   "notifications.column_settings.filter_bar.category": "Thanh lọc nhanh",

app/javascript/mastodon/locales/zh-CN.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "新举报：",
   "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
-  "notifications.column_settings.beta.category": "实验性功能",
-  "notifications.column_settings.beta.grouping": "通知分组",
   "notifications.column_settings.favourite": "喜欢：",
   "notifications.column_settings.filter_bar.advanced": "显示所有类别",
   "notifications.column_settings.filter_bar.category": "快速筛选栏",

app/javascript/mastodon/locales/zh-TW.json

@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "新檢舉報告：",
   "notifications.column_settings.admin.sign_up": "新註冊帳號：",
   "notifications.column_settings.alert": "桌面通知",
-  "notifications.column_settings.beta.category": "實驗性功能",
-  "notifications.column_settings.beta.grouping": "分組通知",
   "notifications.column_settings.favourite": "最愛：",
   "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
   "notifications.column_settings.filter_bar.category": "快速過濾器",

app/javascript/mastodon/reducers/accounts_map.js

@@ -4,11 +4,10 @@ import { ACCOUNT_LOOKUP_FAIL } from '../actions/accounts';
 import { importAccounts } from '../actions/accounts_typed';
 import { domain } from '../initial_state';
 
-export const normalizeForLookup = str => {
+const pattern = new RegExp(`@${domain}$`, 'gi');
-  str = str.toLowerCase();
+
-  const trailingIndex = str.indexOf(`@${domain.toLowerCase()}`);
+export const normalizeForLookup = str =>
-  return (trailingIndex > 0) ? str.slice(0, trailingIndex) : str;
+  str.toLowerCase().replace(pattern, '');
-};
 
 const initialState = ImmutableMap();
 

app/javascript/mastodon/selectors/settings.ts

@@ -1,18 +1,27 @@
-import { forceGroupedNotifications } from 'mastodon/initial_state';
+import { createSelector } from '@reduxjs/toolkit';
+
 import type { RootState } from 'mastodon/store';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
 // state.settings is not yet typed, so we disable some ESLint checks for those selectors
-export const selectSettingsNotificationsShows = (state: RootState) =>
+export const selectSettingsNotificationsShows = createSelector(
-  state.settings.getIn(['notifications', 'shows']).toJS() as Record<
+  [
+    (state) =>
+      state.settings.getIn(['notifications', 'shows']) as Immutable.Map<
         string,
         boolean
-  >;
+      >,
+  ],
+  (shows) => shows.toJS() as Record<string, boolean>,
+);
 
-export const selectSettingsNotificationsExcludedTypes = (state: RootState) =>
+export const selectSettingsNotificationsExcludedTypes = createSelector(
-  Object.entries(selectSettingsNotificationsShows(state))
+  [selectSettingsNotificationsShows],
+  (shows) =>
+    Object.entries(shows)
       .filter(([_type, enabled]) => !enabled)
-    .map(([type, _enabled]) => type);
+      .map(([type, _enabled]) => type),
+);
 
 export const selectSettingsNotificationsQuickFilterShow = (state: RootState) =>
   state.settings.getIn(['notifications', 'quickFilter', 'show']) as boolean;
@@ -26,10 +35,6 @@ export const selectSettingsNotificationsQuickFilterAdvanced = (
 ) =>
   state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
 
-export const selectUseGroupedNotifications = (state: RootState) =>
-  forceGroupedNotifications ||
-  (state.settings.getIn(['notifications', 'groupingBeta']) as boolean);
-
 export const selectSettingsNotificationsShowUnread = (state: RootState) =>
   state.settings.getIn(['notifications', 'showUnread']) as boolean;
 

app/javascript/styles/mastodon/components.scss

@@ -3921,7 +3921,7 @@ $ui-header-logo-wordmark-width: 99px;
   }
 
   &__wrapper {
-    background: $white;
+    background: $ui-base-color;
     border: 1px solid var(--background-border-color);
     margin-bottom: 10px;
     border-radius: 4px;

app/javascript/styles/mastodon/variables.scss

@@ -87,7 +87,7 @@ $media-modal-media-max-width: 100%;
 // put margins on top and bottom of image to avoid the screen covered by image.
 $media-modal-media-max-height: 80%;
 
-$no-gap-breakpoint: 1175px;
+$no-gap-breakpoint: 1207px;
 $mobile-breakpoint: 630px;
 
 $font-sans-serif: 'mastodon-font-sans-serif' !default;

app/serializers/initial_state_serializer.rb

@@ -126,7 +126,6 @@ class InitialStateSerializer < ActiveModel::Serializer
       trends_as_landing_page: Setting.trends_as_landing_page,
       trends_enabled: Setting.trends,
       version: instance_presenter.version,
-      force_grouped_notifications: ENV['FORCE_GROUPED_NOTIFICATIONS'] == 'true',
     }
   end
 

docker-compose.yml

@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
+    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.2
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.1
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.2
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
+    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.2
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

lib/mastodon/version.rb

@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def default_prerelease
-      'beta.1'
+      'beta.2'
     end
 
     def prerelease