From 36f29b4b76abb4b7d579f1f41996635526dadf5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Thu, 22 Aug 2024 12:02:48 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20#804=20=E3=83=AA=E3=82=B9=E3=83=88?= =?UTF-8?q?=E6=96=B0=E7=9D=80=E6=8A=95=E7=A8=BF=E9=80=9A=E7=9F=A5=E3=82=92?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=AA=E3=83=BC=E3=83=9F=E3=83=B3=E3=82=B0?= =?UTF-8?q?=E3=81=A7=E5=8F=97=E3=81=91=E5=8F=96=E3=81=A3=E3=81=9F=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=80=81=E9=80=9A=E7=9F=A5=E3=83=A1=E3=83=83=E3=82=BB?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97=E3=81=84?= =?UTF-8?q?=20(#816)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/mastodon/api_types/notifications.ts | 1 + app/javascript/mastodon/models/notification_group.ts | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts index bd4292ccda..512bec9ae3 100644 --- a/app/javascript/mastodon/api_types/notifications.ts +++ b/app/javascript/mastodon/api_types/notifications.ts @@ -69,6 +69,7 @@ export interface BaseNotificationJSON { group_key: string; account: ApiAccountJSON; emoji_reaction?: NotifyEmojiReactionJSON; + list?: ApiListJSON_KmyDummy; } export interface BaseNotificationGroupJSON { diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts index 87f924571f..28fa8f513d 100644 --- a/app/javascript/mastodon/models/notification_group.ts +++ b/app/javascript/mastodon/models/notification_group.ts @@ -248,12 +248,17 @@ export function createNotificationGroupFromNotificationJSON( case 'favourite': case 'reblog': case 'status': - case 'list_status': case 'mention': case 'status_reference': case 'poll': case 'update': return { ...group, statusId: notification.status?.id }; + case 'list_status': + return { + ...group, + statusId: notification.status?.id, + list: notification.list, + }; case 'emoji_reaction': return { ...group,