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

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

Author: setchy

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

@@ -1,5 +1,9 @@
 import type { SettingsState } from '../../../types';
-import type { Notification, StateType } from '../../../typesGitHub';
+import type {
+  Notification,
+  StateType,
+  SubjectUser,
+} from '../../../typesGitHub';
 import {
   filterNotificationByHandle,
   hasExcludeHandleFilters,
@@ -45,29 +49,8 @@ export function filterDetailedNotifications(
     let passesFilters = true;
 
     if (settings.detailedNotifications) {
-      if (userTypeFilter.hasFilters(settings)) {
-        passesFilters =
-          passesFilters &&
-          settings.filterUserTypes.some((userType) =>
-            userTypeFilter.filterNotification(notification, userType),
-          );
-      }
-
-      if (hasIncludeHandleFilters(settings)) {
-        passesFilters =
-          passesFilters &&
-          settings.filterIncludeHandles.some((handle) =>
-            filterNotificationByHandle(notification, handle),
-          );
-      }
-
-      if (hasExcludeHandleFilters(settings)) {
-        passesFilters =
-          passesFilters &&
-          !settings.filterExcludeHandles.some((handle) =>
-            filterNotificationByHandle(notification, handle),
-          );
-      }
+      passesFilters =
+        passesFilters && passesUserFilters(notification, settings);
 
       passesFilters =
         passesFilters && passesStateFilter(notification, settings);
@@ -88,6 +71,39 @@ export function hasAnyFiltersSet(settings: SettingsState): boolean {
   );
 }
 
+function passesUserFilters(
+  notification: Notification,
+  settings: SettingsState,
+): boolean {
+  let passesFilters = true;
+
+  if (userTypeFilter.hasFilters(settings)) {
+    passesFilters =
+      passesFilters &&
+      settings.filterUserTypes.some((userType) =>
+        userTypeFilter.filterNotification(notification, userType),
+      );
+  }
+
+  if (hasIncludeHandleFilters(settings)) {
+    passesFilters =
+      passesFilters &&
+      settings.filterIncludeHandles.some((handle) =>
+        filterNotificationByHandle(notification, handle),
+      );
+  }
+
+  if (hasExcludeHandleFilters(settings)) {
+    passesFilters =
+      passesFilters &&
+      !settings.filterExcludeHandles.some((handle) =>
+        filterNotificationByHandle(notification, handle),
+      );
+  }
+
+  return passesFilters;
+}
+
 function passesStateFilter(
   notification: Notification,
   settings: SettingsState,
@@ -105,7 +121,16 @@ export function isStateFilteredOut(
   state: StateType,
   settings: SettingsState,
 ): boolean {
-  const notification = { subject: { state } } as Notification;
+  const notification = { subject: { state: state } } as Notification;
 
   return !passesStateFilter(notification, settings);
 }
+
+export function isUserFilteredOut(
+  user: SubjectUser,
+  settings: SettingsState,
+): boolean {
+  const notification = { subject: { user: user } } as Notification;
+
+  return !passesUserFilters(notification, settings);
+}

src/renderer/utils/subject.ts

@@ -26,7 +26,10 @@ import {
   getPullRequestReviews,
   getRelease,
 } from './api/client';
-import { isStateFilteredOut } from './notifications/filters/filter';
+import {
+  isStateFilteredOut,
+  isUserFilteredOut,
+} from './notifications/filters/filter';
 
 export async function getGitifySubjectDetails(
   notification: Notification,
@@ -274,12 +277,12 @@ async function getGitifySubjectForPullRequest(
     prState = 'draft';
   }
 
-  let prCommentUser: User;
-
-  // Return early if this notification would be hidden by filters
+  // Return early if this notification would be hidden by state filters
   if (isStateFilteredOut(prState, settings)) {
     return null;
   }
+
+  let prCommentUser: User;
   if (
     notification.subject.latest_comment_url &&
     notification.subject.latest_comment_url !== notification.subject.url
@@ -293,13 +296,20 @@ async function getGitifySubjectForPullRequest(
     prCommentUser = prComment.user;
   }
 
+  const prUser = getSubjectUser([prCommentUser, pr.user]);
+
+  // Return early if this notification would be hidden by user filters
+  if (isUserFilteredOut(prUser, settings)) {
+    return null;
+  }
+
   const reviews = await getLatestReviewForReviewers(notification);
   const linkedIssues = parseLinkedIssuesFromPr(pr);
 
   return {
     number: pr.number,
     state: prState,
-    user: getSubjectUser([prCommentUser, pr.user]),
+    user: prUser,
     reviews: reviews,
     comments: pr.comments,
     labels: pr.labels?.map((label) => label.name) ?? [],