Make both comment and subject required but provide comment fallback

This matches the behavior of gitnews.
sirbrillig · Sep 8, 2024 · c6ef953 · c6ef953
1 parent 4def101
commit c6ef953
Showing 1 changed file with 32 additions and 34 deletions.
diff --git a/src/main/lib/github-interface.ts b/src/main/lib/github-interface.ts
@@ -17,42 +17,40 @@ export async function fetchNotificationsForAccount(
 	const notes: Note[] = [];
 
 	for (const notification of notificationsResponse.data) {
-		let commentAvatar;
-		let commentHtmlUrl;
-		if (notification.subject.latest_comment_url) {
-			try {
-				const commentUrl = new URL(notification.subject.latest_comment_url);
-				const commentUrlPath = commentUrl.pathname;
-				const comment = await octokit.request(`GET ${commentUrlPath}`, {});
-				commentAvatar = comment.data.user.avatar_url;
-				commentHtmlUrl = comment.data.html_url;
-			} catch (error) {
-				console.error(
-					`Failed to fetch comment for ${notification.subject.latest_comment_url}`
-				);
-				// This might fail but it's not that important so we will ignore it if
-				// that happens.
-			}
+		let commentAvatar: string;
+		let commentHtmlUrl: string;
+		try {
+			const commentUrl = new URL(
+				notification.subject.latest_comment_url ?? notification.subject.url
+			);
+			const commentUrlPath = commentUrl.pathname;
+			const comment = await octokit.request(`GET ${commentUrlPath}`, {});
+			commentAvatar = comment.data.user.avatar_url;
+			commentHtmlUrl = comment.data.html_url;
+		} catch (error) {
+			console.error(
+				`Failed to fetch comment for ${notification.subject.latest_comment_url ?? notification.subject.url}`,
+				notification
+			);
+			continue;
 		}
 
-		let noteState;
-		let noteMerged;
-		let subjectHtmlUrl;
-		if (notification.subject.url) {
-			try {
-				const subjectUrl = new URL(notification.subject.url);
-				const subjectUrlPath = subjectUrl.pathname;
-				const subject = await octokit.request(`GET ${subjectUrlPath}`, {});
-				noteState = subject.data.state;
-				noteMerged = subject.data.merged;
-				subjectHtmlUrl = subject.data.html_url;
-			} catch (error) {
-				console.error(
-					`Failed to fetch subject for ${notification.subject.url}`
-				);
-				// This might fail but it's not that important so we will ignore it if
-				// that happens.
-			}
+		let noteState: string;
+		let noteMerged: boolean;
+		let subjectHtmlUrl: string;
+		try {
+			const subjectUrl = new URL(notification.subject.url);
+			const subjectUrlPath = subjectUrl.pathname;
+			const subject = await octokit.request(`GET ${subjectUrlPath}`, {});
+			noteState = subject.data.state;
+			noteMerged = subject.data.merged;
+			subjectHtmlUrl = subject.data.html_url;
+		} catch (error) {
+			console.error(
+				`Failed to fetch subject for ${notification.subject.url}`,
+				notification.subject
+			);
+			continue;
 		}
 
 		notes.push({