From 170743d448b1cd6f44c78788607222aead89cd91 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Fri, 2 Jun 2023 10:41:07 -0400 Subject: [PATCH] Fetch group relationship from notifications --- app/soapbox/actions/notifications.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/soapbox/actions/notifications.ts b/app/soapbox/actions/notifications.ts index 7b91b64d8..a7c2f11f6 100644 --- a/app/soapbox/actions/notifications.ts +++ b/app/soapbox/actions/notifications.ts @@ -12,6 +12,7 @@ import { EXCLUDE_TYPES, NOTIFICATION_TYPES } from 'soapbox/utils/notification'; import { joinPublicPath } from 'soapbox/utils/static'; import { fetchRelationships } from './accounts'; +import { fetchGroupRelationships } from './groups'; import { importFetchedAccount, importFetchedAccounts, @@ -23,7 +24,7 @@ import { getSettings, saveSettings } from './settings'; import type { AxiosError } from 'axios'; import type { AppDispatch, RootState } from 'soapbox/store'; -import type { APIEntity } from 'soapbox/types/entities'; +import type { APIEntity, Status } from 'soapbox/types/entities'; const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE'; const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP'; @@ -237,6 +238,9 @@ const expandNotifications = ({ maxId }: Record = {}, done: () => an dispatch(importFetchedAccounts(Object.values(entries.accounts))); dispatch(importFetchedStatuses(Object.values(entries.statuses))); + const statusesFromGroups = (Object.values(entries.statuses) as Status[]).filter((status) => !!status.group); + dispatch(fetchGroupRelationships(statusesFromGroups.map((status: any) => status.group?.id))); + dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore)); fetchRelatedRelationships(dispatch, response.data); done();