chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 4 Wiki Activity

Fix notification screen crashing in rare cases where the status no longer exists (#31403)

Browse source
This commit is contained in:
Renaud Chaput 2024-08-14 08:47:15 +02:00 committed by GitHub
parent 6bd7da72e9
commit 0d85a79f19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/actions/notification_groups.ts
View file

@ -47,7 +47,7 @@ function dispatchAssociatedRecords(
fetchedAccounts.push(notification.moderation_warning.target_account); fetchedAccounts.push(notification.moderation_warning.target_account);
} }
if ('status' in notification) { if ('status' in notification && notification.status) {
fetchedStatuses.push(notification.status); fetchedStatuses.push(notification.status);
} }
}); });
@ -119,7 +119,7 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
if ( if (
(notification.type === 'mention' || notification.type === 'update') && (notification.type === 'mention' || notification.type === 'update') &&
notification.status.filtered notification.status?.filtered
) { ) {
const filters = notification.status.filtered.filter((result) => const filters = notification.status.filtered.filter((result) =>
result.filter.context.includes('notifications'), result.filter.context.includes('notifications'),

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

@ -60,12 +60,12 @@ export interface BaseNotificationGroupJSON {
interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON { interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
type: NotificationWithStatusType; type: NotificationWithStatusType;
status_id: string; status_id: string | null;
} }
interface NotificationWithStatusJSON extends BaseNotificationJSON { interface NotificationWithStatusJSON extends BaseNotificationJSON {
type: NotificationWithStatusType; type: NotificationWithStatusType;
status: ApiStatusJSON; status: ApiStatusJSON | null;
} }
interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON { interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON {

6
app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
View file

@ -37,7 +37,11 @@ export const NotificationMention: React.FC<{
unread: boolean; unread: boolean;
}> = ({ notification, unread }) => { }> = ({ notification, unread }) => {
const [isDirect, isReply] = useAppSelector((state) => { const [isDirect, isReply] = useAppSelector((state) => {
const status = state.statuses.get(notification.statusId) as Status; const status = state.statuses.get(notification.statusId) as
| Status
| undefined;
if (!status) return [false, false] as const;
return [ return [
status.get('visibility') === 'direct', status.get('visibility') === 'direct',

4
app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
View file

@ -23,7 +23,7 @@ export const NotificationWithStatus: React.FC<{
icon: IconProp; icon: IconProp;
iconId: string; iconId: string;
accountIds: string[]; accountIds: string[];
statusId: string; statusId: string | undefined;
count: number; count: number;
labelRenderer: LabelRenderer; labelRenderer: LabelRenderer;
unread: boolean; unread: boolean;
@ -76,6 +76,8 @@ export const NotificationWithStatus: React.FC<{
[dispatch, statusId], [dispatch, statusId],
); );
if (!statusId) return null;
return ( return (
<HotKeys handlers={handlers}> <HotKeys handlers={handlers}>
<div <div

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

@ -21,7 +21,7 @@ interface BaseNotificationGroup
interface BaseNotificationWithStatus<Type extends NotificationWithStatusType> interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
extends BaseNotificationGroup { extends BaseNotificationGroup {
type: Type; type: Type;
statusId: string; statusId: string | undefined;
} }
interface BaseNotification<Type extends NotificationType> interface BaseNotification<Type extends NotificationType>
@ -126,7 +126,7 @@ export function createNotificationGroupFromJSON(
case 'update': { case 'update': {
const { status_id: statusId, ...groupWithoutStatus } = group; const { status_id: statusId, ...groupWithoutStatus } = group;
return { return {
statusId, statusId: statusId ?? undefined,
sampleAccountIds, sampleAccountIds,
...groupWithoutStatus, ...groupWithoutStatus,
}; };
@ -183,7 +183,7 @@ export function createNotificationGroupFromNotificationJSON(
case 'mention': case 'mention':
case 'poll': case 'poll':
case 'update': case 'update':
return { ...group, statusId: notification.status.id }; return { ...group, statusId: notification.status?.id };
case 'admin.report': case 'admin.report':
return { ...group, report: createReportFromJSON(notification.report) }; return { ...group, report: createReportFromJSON(notification.report) };
case 'severed_relationships': case 'severed_relationships':