tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error when collection is null in collection notification (#38831)

Browse Source
This commit is contained in:
diondiondion 2026-04-28 17:25:17 +02:00 committed by GitHub
parent ffd7160980
commit 31f89617d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/collections/detail/revoke_collection_inclusion_modal.tsx
View File

@ -27,7 +27,7 @@ const messages = defineMessages({
}, },
}); });
export function useConfirmRevoke(collection?: ApiCollectionJSON) { export function useConfirmRevoke(collection?: ApiCollectionJSON | null) {
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const { id, items = [] } = collection ?? {}; const { id, items = [] } = collection ?? {};
const ownCollectionItemId = items.find((item) => item.account_id === me)?.id; const ownCollectionItemId = items.find((item) => item.account_id === me)?.id;

7
app/javascript/mastodon/features/notifications_v2/components/notification_collection.tsx
View File

@ -24,9 +24,14 @@ export const NotificationCollection: React.FC<{
unread: boolean; unread: boolean;
}> = ({ notification, unread }) => { }> = ({ notification, unread }) => {
const { collection, type } = notification; const { collection, type } = notification;
const collectionCreatorAccount = useAccount(collection.account_id);
const collectionCreatorAccount = useAccount(collection?.account_id);
const confirmRevoke = useConfirmRevoke(collection); const confirmRevoke = useConfirmRevoke(collection);
if (!collection) {
return null;
}
return ( return (
<div <div
className={classNames( className={classNames(

4
app/javascript/mastodon/models/notification_group.ts
View File

@ -91,11 +91,11 @@ export interface NotificationGroupAdminReport extends BaseNotification<'admin.re
type Collection = ApiCollectionJSON; type Collection = ApiCollectionJSON;
export interface NotificationGroupAddedToCollection extends BaseNotification<'added_to_collection'> { export interface NotificationGroupAddedToCollection extends BaseNotification<'added_to_collection'> {
collection: Collection; collection: Collection | null;
} }
export interface NotificationGroupCollectionUpdate extends BaseNotification<'collection_update'> { export interface NotificationGroupCollectionUpdate extends BaseNotification<'collection_update'> {
collection: Collection; collection: Collection | null;
} }
export type NotificationGroup = export type NotificationGroup =