From ff3eaf8a096d9bed4af2767ee89855cdaa5a605e Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Sat, 20 Aug 2022 10:29:35 -0700
Subject: [PATCH] Alter Event Filter execution

---
 libs/events/utils.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/events/utils.js b/libs/events/utils.js
index bc2871e7..34be5838 100644
--- a/libs/events/utils.js
+++ b/libs/events/utils.js
@@ -199,7 +199,7 @@ module.exports = (s,config,lang,app,io) => {
             Object.keys(filters).forEach(function(key){
                 var conditionChain = {}
                 var dFilter = filters[key]
-                if(!dFilter || !dFilter.where || dFilter.enabled === '0')return;
+                if(dFilter.enabled === '0')return;
                 var numberOfOpenAndCloseBrackets = 0
                 dFilter.where.forEach(function(condition,place){
                     const hasOpenBracket = condition.openBracket === '1';
@@ -683,12 +683,13 @@ module.exports = (s,config,lang,app,io) => {
         if(!monitorConfig){
             return s.systemLog(lang['No Monitor Found, Ignoring Request'])
         }
+        const activeMonitor = s.group[d.ke].activeMonitors[d.id]
         const monitorDetails = monitorConfig.details
         s.onEventTriggerBeforeFilterExtensions.forEach(function(extender){
             extender(d,filter)
         })
         const eventDetails = d.details
-        const passedEventFilters = checkEventFilters(d,monitorDetails,filter)
+        const passedEventFilters = checkEventFilters(d,activeMonitor.details,filter)
         if(!passedEventFilters)return;
         const eventTime = new Date()
         if(