feat(filter): avoid further enrichment if state not visible

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/utils/notifications/filters/filter.ts

@@ -1,5 +1,5 @@
 import type { SettingsState } from '../../../types';
-import type { Notification } from '../../../typesGitHub';
+import type { Notification, StateType } from '../../../typesGitHub';
 import {
   filterNotificationByHandle,
   hasExcludeHandleFilters,
@@ -88,7 +88,7 @@ export function hasAnyFiltersSet(settings: SettingsState): boolean {
   );
 }
 
-export function isNotificationStateVisible(
+function isNotificationStateVisible(
   notification: Notification,
   settings: SettingsState,
 ): boolean {
@@ -100,3 +100,12 @@ export function isNotificationStateVisible(
 
   return true;
 }
+
+export function wouldStateBeHiddenByFilters(
+  state: StateType,
+  settings: SettingsState,
+): boolean {
+  const notification = { subject: { state } } as Notification;
+
+  return !isNotificationStateVisible(notification, settings);
+}

src/renderer/utils/subject.ts

@@ -25,7 +25,7 @@ import {
   getPullRequestReviews,
   getRelease,
 } from './api/client';
-import { isNotificationStateVisible } from './notifications/filters/filter';
+import { wouldStateBeHiddenByFilters } from './notifications/filters/filter';
 
 export async function getGitifySubjectDetails(
   notification: Notification,
@@ -165,22 +165,15 @@ async function getGitifySubjectForDiscussion(
     }
   }
 
-  let latestDiscussionComment: DiscussionComment;
-  if (
-    isNotificationStateVisible(
-      {
-        subject: {
-          state: discussionState,
-        },
-      } as Notification,
-      settings,
-    )
-  ) {
-    latestDiscussionComment = getLatestDiscussionComment(
-      discussion.comments.nodes,
-    );
+  // Return early if this notification would be hidden by filters
+  if (wouldStateBeHiddenByFilters(discussionState, settings)) {
+    return null;
   }
 
+  const latestDiscussionComment = getLatestDiscussionComment(
+    discussion.comments.nodes,
+  );
+
   let discussionUser: SubjectUser = {
     login: discussion.author.login,
     html_url: discussion.author.url,
@@ -231,27 +224,21 @@ async function getGitifySubjectForIssue(
 
   const issueState = issue.state_reason ?? issue.state;
 
+  // Return early if this notification would be hidden by filters
+  if (wouldStateBeHiddenByFilters(issueState, settings)) {
+    return null;
+  }
+
   let issueCommentUser: User;
 
-  if (
-    isNotificationStateVisible(
-      {
-        subject: {
-          state: issueState,
-        },
-      } as Notification,
-      settings,
-    )
-  ) {
-    if (notification.subject.latest_comment_url) {
-      const issueComment = (
-        await getIssueOrPullRequestComment(
-          notification.subject.latest_comment_url,
-          notification.account.token,
-        )
-      ).data;
-      issueCommentUser = issueComment.user;
-    }
+  if (notification.subject.latest_comment_url) {
+    const issueComment = (
+      await getIssueOrPullRequestComment(
+        notification.subject.latest_comment_url,
+        notification.account.token,
+      )
+    ).data;
+    issueCommentUser = issueComment.user;
   }
 
   return {
@@ -280,36 +267,27 @@ async function getGitifySubjectForPullRequest(
   }
 
   let prCommentUser: User;
-  let reviews: GitifyPullRequestReview[];
-  let linkedIssues: string[];
 
+  // Return early if this notification would be hidden by filters
+  if (wouldStateBeHiddenByFilters(prState, settings)) {
+    return null;
+  }
   if (
-    isNotificationStateVisible(
-      {
-        subject: {
-          state: prState,
-        },
-      } as Notification,
-      settings,
-    )
+    notification.subject.latest_comment_url &&
+    notification.subject.latest_comment_url !== notification.subject.url
   ) {
-    if (
-      notification.subject.latest_comment_url &&
-      notification.subject.latest_comment_url !== notification.subject.url
-    ) {
-      const prComment = (
-        await getIssueOrPullRequestComment(
-          notification.subject.latest_comment_url,
-          notification.account.token,
-        )
-      ).data;
-      prCommentUser = prComment.user;
-    }
-
-    reviews = await getLatestReviewForReviewers(notification);
-    linkedIssues = parseLinkedIssuesFromPr(pr);
+    const prComment = (
+      await getIssueOrPullRequestComment(
+        notification.subject.latest_comment_url,
+        notification.account.token,
+      )
+    ).data;
+    prCommentUser = prComment.user;
   }
 
+  const reviews = await getLatestReviewForReviewers(notification);
+  const linkedIssues = parseLinkedIssuesFromPr(pr);
+
   return {
     number: pr.number,
     state: prState,