From ba286e769baf3f787ee70f9a321d77f8cc057a72 Mon Sep 17 00:00:00 2001
From: Corban-Lee Jones <corbz.jones@gmail.com>
Date: Mon, 12 May 2025 23:45:37 +0100
Subject: [PATCH] bot filter work

---
 src/bot/task.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/bot/task.ts b/src/bot/task.ts
index aacca7f..75d341d 100644
--- a/src/bot/task.ts
+++ b/src/bot/task.ts
@@ -52,12 +52,12 @@ const processItems = async (items: RssParser.Item[], feed: ExpandedFeed, channel
 };
 
 const processItem = async (item: RssParser.Item, feed: ExpandedFeed, channel: DiscordChannel, client: Client) => {
-    const filterPromises = feed.filters.map(async filter => {
-        return passesFilter(filter, item);
-    });
-
-    const filterResults = await Promise.all(filterPromises);
-    if (filterResults.includes(false)) return;
+    for (const filter of feed.filters) {
+        if (!await passesFilter(filter, item)) {
+            console.log("fails filter")
+            return;
+        }
+    }
 
     const embed = new EmbedBuilder();
     embed.setTitle(item.title ?? null);
@@ -79,7 +79,7 @@ const getItemImageUrl = async (url: string) => {
 };
 
 const passesFilter = async (filter: Filter, item: RssParser.Item) => {
-    if (!filter.matching_algorithm.trim()) return !filter.is_whitelist;
+    if (!filter.value.trim()) return !filter.is_whitelist;
 
     let matchFound = false;
 
@@ -92,5 +92,7 @@ const passesFilter = async (filter: Filter, item: RssParser.Item) => {
         );
     }
 
-    return filter.is_whitelist ? matchFound : !matchFound;
+    console.log(`${matchFound} - ${filter.is_whitelist}`);
+
+    return filter.is_whitelist ? !matchFound : matchFound;
 };