mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-16 01:09:55 +00:00
[Glitch] Fix notification screen crashing in rare cases where the status no longer exists
Port 0d85a79f19 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
@@ -21,7 +21,7 @@ interface BaseNotificationGroup
|
||||
interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
|
||||
extends BaseNotificationGroup {
|
||||
type: Type;
|
||||
statusId: string;
|
||||
statusId: string | undefined;
|
||||
}
|
||||
|
||||
interface BaseNotification<Type extends NotificationType>
|
||||
@@ -126,7 +126,7 @@ export function createNotificationGroupFromJSON(
|
||||
case 'update': {
|
||||
const { status_id: statusId, ...groupWithoutStatus } = group;
|
||||
return {
|
||||
statusId,
|
||||
statusId: statusId ?? undefined,
|
||||
sampleAccountIds,
|
||||
...groupWithoutStatus,
|
||||
};
|
||||
@@ -183,7 +183,7 @@ export function createNotificationGroupFromNotificationJSON(
|
||||
case 'mention':
|
||||
case 'poll':
|
||||
case 'update':
|
||||
return { ...group, statusId: notification.status.id };
|
||||
return { ...group, statusId: notification.status?.id };
|
||||
case 'admin.report':
|
||||
return { ...group, report: createReportFromJSON(notification.report) };
|
||||
case 'severed_relationships':
|
||||
|
||||
Reference in New Issue
Block a user