Fix missing null check when importing collections from notifications (#39300)

2026-08-26 16:04:51 -05:00 · 2026-06-05 12:01:55 +02:00
parent 2d2a7ec8d6
commit c08d13a65c
2 changed files with 5 additions and 5 deletions
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -88,7 +88,7 @@ function dispatchAssociatedRecords(
      fetchedStatuses.push(notification.status);
    }

-    if ('collection' in notification) {
+    if ('collection' in notification && notification.collection) {
      collections.push(notification.collection);
    }
  });
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -90,22 +90,22 @@ interface ReportNotificationJSON extends BaseNotificationJSON {

 interface AddedToCollectionNotificationGroupJSON extends BaseNotificationGroupJSON {
  type: 'added_to_collection';
-  collection: ApiCollectionJSON;
+  collection: ApiCollectionJSON | null;
 }

 interface AddedToCollectionNotificationJSON extends BaseNotificationJSON {
  type: 'added_to_collection';
-  collection: ApiCollectionJSON;
+  collection: ApiCollectionJSON | null;
 }

 interface CollectionUpdateNotificationGroupJSON extends BaseNotificationGroupJSON {
  type: 'collection_update';
-  collection: ApiCollectionJSON;
+  collection: ApiCollectionJSON | null;
 }

 interface CollectionUpdateNotificationJSON extends BaseNotificationJSON {
  type: 'collection_update';
-  collection: ApiCollectionJSON;
+  collection: ApiCollectionJSON | null;
 }

 type SimpleNotificationTypes = 'follow' | 'follow_request' | 'admin.sign_up';