fix: change filter logic to avoid early returning (#1852)

Signed-off-by: Adam Setch <adam.setch@outlook.com>
gitify-app · Feb 25, 2025 · da58488 · da58488
1 parent 6702763
commit da58488
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts
@@ -13,33 +13,43 @@ export function filterNotifications(
   settings: SettingsState,
 ): Notification[] {
   return notifications.filter((notification) => {
+    let passesFilters = true;
+
     if (settings.detailedNotifications) {
       if (hasUserTypeFilters(settings)) {
-        return settings.filterUserTypes.some((userType) =>
-          filterNotificationByUserType(notification, userType),
-        );
+        passesFilters =
+          passesFilters &&
+          settings.filterUserTypes.some((userType) =>
+            filterNotificationByUserType(notification, userType),
+          );
       }
 
       if (hasIncludeHandleFilters(settings)) {
-        return settings.filterIncludeHandles.some((handle) =>
-          filterNotificationByHandle(notification, handle),
-        );
+        passesFilters =
+          passesFilters &&
+          settings.filterIncludeHandles.some((handle) =>
+            filterNotificationByHandle(notification, handle),
+          );
       }
 
       if (hasExcludeHandleFilters(settings)) {
-        return !settings.filterExcludeHandles.some((handle) =>
-          filterNotificationByHandle(notification, handle),
-        );
+        passesFilters =
+          passesFilters &&
+          !settings.filterExcludeHandles.some((handle) =>
+            filterNotificationByHandle(notification, handle),
+          );
       }
     }
 
     if (hasReasonFilters(settings)) {
-      return settings.filterReasons.some((reason) =>
-        filterNotificationByReason(notification, reason),
-      );
+      passesFilters =
+        passesFilters &&
+        settings.filterReasons.some((reason) =>
+          filterNotificationByReason(notification, reason),
+        );
     }
 
-    return true;
+    return passesFilters;
   });
 }