feat(filters): reduce api calls for filtered detailed notifications (#2158)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

---------

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 } from '../../../typesGitHub';
+import type {
+  Notification,
+  StateType,
+  SubjectUser,
+} from '../../../typesGitHub';
 import {
   filterNotificationByHandle,
   hasExcludeHandleFilters,
@@ -45,37 +49,11 @@ 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),
-          );
-      }
-
-      if (stateFilter.hasFilters(settings)) {
-        passesFilters =
-          passesFilters &&
-          settings.filterStates.some((state) =>
-            stateFilter.filterNotification(notification, state),
-          );
-      }
+      passesFilters =
+        passesFilters && passesUserFilters(notification, settings);
+
+      passesFilters =
+        passesFilters && passesStateFilter(notification, settings);
     }
 
     return passesFilters;
@@ -92,3 +70,67 @@ export function hasAnyFiltersSet(settings: SettingsState): boolean {
     reasonFilter.hasFilters(settings)
   );
 }
+
+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,
+): boolean {
+  if (stateFilter.hasFilters(settings)) {
+    return settings.filterStates.some((state) =>
+      stateFilter.filterNotification(notification, state),
+    );
+  }
+
+  return true;
+}
+
+export function isStateFilteredOut(
+  state: StateType,
+  settings: SettingsState,
+): boolean {
+  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/notifications/notifications.ts

@@ -108,7 +108,10 @@ export async function enrichNotifications(
       let additionalSubjectDetails: GitifySubject = {};
 
       try {
-        additionalSubjectDetails = await getGitifySubjectDetails(notification);
+        additionalSubjectDetails = await getGitifySubjectDetails(
+          notification,
+          settings,
+        );
       } catch (err) {
         logError(
           'enrichNotifications',