Merge branch 'main' into glitch-soc/merge-upstream

2021-08-27 11:29:03 +02:00
parent 70909c5b09 7283a5d3b9
commit 463d23dfd5
12 changed files with 255 additions and 122 deletions
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@ -1,6 +1,6 @@
 import api, { getLinks } from '../api';
 import IntlMessageFormat from 'intl-messageformat';
-import { fetchRelationships } from './accounts';
+import { fetchFollowRequests, fetchRelationships } from './accounts';
 import {
  importFetchedAccount,
  importFetchedAccounts,
@ -78,6 +78,10 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
      filtered = regex && regex.test(searchIndex);
    }

+    if (['follow_request'].includes(notification.type)) {
+      dispatch(fetchFollowRequests());
+    }
+
    dispatch(submitMarkers());

    if (showInColumn) {