Fix error when dismissing PR notifications

src/github/graphql.ts

@@ -15,11 +15,12 @@ interface PageInfo {
 export interface MergedEvent {
 	__typename: string;
 	id: string;
-	actor: Actor;
+	actor: Actor | null;
 	createdAt: string;
 	mergeRef: {
 		name: string;
-	};
+	} | null;
+	mergeRefName: string;
 	commit: {
 		oid: string;
 		commitUrl: string;
@@ -194,12 +195,12 @@ export interface Commit {
 	id: string;
 	commit: {
 		author: {
-			user: Account;
-		};
+			user: Account | null;
+		} | null;
 		committer: {
 			avatarUrl: string;
 			name: string;
-		};
+		} | null;
 		oid: string;
 		message: string;
 		committedDate: Date;

src/github/queriesShared.gql

@@ -55,6 +55,7 @@ fragment Merged on MergedEvent {
 	mergeRef {
 		name
 	}
+	mergeRefName
 	commit {
 		oid
 		commitUrl

src/github/utils.ts

@@ -1307,9 +1307,9 @@ export async function parseCombinedTimelineEvents(
 					id: commitEv.id,
 					event: type,
 					sha: commitEv.commit.oid,
-					author: commitEv.commit.author.user
+					author: commitEv.commit.author?.user
 						? parseAccount(commitEv.commit.author.user, githubRepository)
-						: { login: commitEv.commit.committer.name },
+						: { login: commitEv.commit.committer?.name ?? '' },
 					htmlUrl: commitEv.url,
 					message: commitEv.commit.message,
 					committedDate: new Date(commitEv.commit.committedDate),
@@ -1337,7 +1337,7 @@ export async function parseCombinedTimelineEvents(
 					event: type,
 					user: parseActor(mergeEv.actor, githubRepository),
 					createdAt: mergeEv.createdAt,
-					mergeRef: mergeEv.mergeRef.name,
+					mergeRef: mergeEv.mergeRef?.name ?? mergeEv.mergeRefName,
 					sha: mergeEv.commit.oid,
 					commitUrl: mergeEv.commit.commitUrl,
 					url: mergeEv.url,

src/test/github/utils.test.ts

@@ -5,10 +5,12 @@
 
 import { default as assert } from 'assert';
 import { AccountType } from '../../github/interface';
-import { getPRFetchQuery, insertNewCommitsSinceReview, sanitizeIssueTitle, variableSubstitution } from '../../github/utils';
+import { getPRFetchQuery, insertNewCommitsSinceReview, parseCombinedTimelineEvents, sanitizeIssueTitle, variableSubstitution } from '../../github/utils';
 import { IssueModel } from '../../github/issueModel';
 import { GitHubRef } from '../../common/githubRef';
 import { CommitEvent, EventType, ReviewEvent, TimelineEvent } from '../../common/timelineEvent';
+import * as GraphQL from '../../github/graphql';
+import { GitHubRepository } from '../../github/githubRepository';
 
 describe('utils', () => {
 
@@ -80,6 +82,51 @@ describe('utils', () => {
 		});
 	});
 
+	describe('parseCombinedTimelineEvents', () => {
+		it('handles commits without an author or committer', async () => {
+			const commit = {
+				__typename: 'PullRequestCommit',
+				id: 'commit-id',
+				commit: {
+					author: null,
+					committer: null,
+					oid: 'sha',
+					message: 'Commit message',
+					committedDate: new Date('2024-01-01T12:00:00Z'),
+				},
+				url: 'https://github.com/octocat/repo/commit/sha',
+			} satisfies GraphQL.Commit;
+
+			const events = await parseCombinedTimelineEvents([commit], [], {} as GitHubRepository);
+
+			assert.strictEqual(events.length, 1);
+			assert.strictEqual(events[0].event, EventType.Committed);
+			assert.strictEqual((events[0] as CommitEvent).author.login, '');
+		});
+
+		it('handles merged events whose merge ref was deleted', async () => {
+			const mergedEvent = {
+				__typename: 'MergedEvent',
+				id: 'merged-event-id',
+				actor: null,
+				createdAt: '2024-01-01T12:00:00Z',
+				mergeRef: null,
+				mergeRefName: 'main',
+				commit: {
+					oid: 'sha',
+					commitUrl: 'https://github.com/octocat/repo/commit/sha',
+				},
+				url: 'https://github.com/octocat/repo/pull/1',
+			} satisfies GraphQL.MergedEvent;
+
+			const events = await parseCombinedTimelineEvents([mergedEvent], [], {} as GitHubRepository);
+
+			assert.strictEqual(events.length, 1);
+			assert.strictEqual(events[0].event, EventType.Merged);
+			assert.strictEqual(events[0].mergeRef, 'main');
+		});
+	});
+
 	describe('insertNewCommitsSinceReview', () => {
 		const CURRENT_USER = 'octocat';
 		const LATEST_REVIEW_SHA = 'shaA';