post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix: #804 リスト新着投稿通知をストリーミングで受け取った場合、通知メッセージがおかしい (#816)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-08-22 12:02:48 +09:00 • committed by GitHub
parent 6d108e5de3
commit 36f29b4b76
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/mastodon/api_types/notifications.ts
View file

@ -69,6 +69,7 @@ export interface BaseNotificationJSON {
group_key: string; group_key: string;
account: ApiAccountJSON; account: ApiAccountJSON;
emoji_reaction?: NotifyEmojiReactionJSON; emoji_reaction?: NotifyEmojiReactionJSON;
list?: ApiListJSON_KmyDummy;
} }
export interface BaseNotificationGroupJSON { export interface BaseNotificationGroupJSON {

7
app/javascript/mastodon/models/notification_group.ts
View file

@ -248,12 +248,17 @@ export function createNotificationGroupFromNotificationJSON(
case 'favourite': case 'favourite':
case 'reblog': case 'reblog':
case 'status': case 'status':
case 'list_status':
case 'mention': case 'mention':
case 'status_reference': case 'status_reference':
case 'poll': case 'poll':
case 'update': case 'update':
return { ...group, statusId: notification.status?.id }; return { ...group, statusId: notification.status?.id };
case 'list_status':
return {
...group,
statusId: notification.status?.id,
list: notification.list,
};
case 'emoji_reaction': case 'emoji_reaction':
return { return {
...group, ...group,