From 1bc684e62791055d6dd77af96e8166bdfd7da0bb Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Tue, 16 Nov 2021 18:02:27 -0800
Subject: [PATCH] event filter and mqtt fixes

---
 libs/events/utils.js       | 13 ++++++-------
 libs/notifications/mqtt.js |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/events/utils.js b/libs/events/utils.js
index 5be3baf0..e26a83ce 100644
--- a/libs/events/utils.js
+++ b/libs/events/utils.js
@@ -625,13 +625,13 @@ module.exports = (s,config,lang,app,io) => {
             halt : false,
             addToMotionCounter : true,
             useLock : true,
-            save : true,
-            webhook : true,
-            command : true,
-            record : true,
+            save : false,
+            webhook : false,
+            command : false,
+            record : false,
             forceRecord : false,
             indifference : false,
-            countObjects : true
+            countObjects : false
         }
         if(!s.group[d.ke] || !s.group[d.ke].activeMonitors[d.id]){
             return s.systemLog(lang['No Monitor Found, Ignoring Request'])
@@ -670,8 +670,7 @@ module.exports = (s,config,lang,app,io) => {
             addToEventCounter(d)
         }
         if(
-            filter.countObjects &&
-            monitorDetails.detector_obj_count === '1' &&
+            (filter.countObjects || monitorDetails.detector_obj_count === '1') &&
             monitorDetails.detector_obj_count_in_region !== '1'
         ){
             didCountingAlready = true
diff --git a/libs/notifications/mqtt.js b/libs/notifications/mqtt.js
index 502061a4..5cc803af 100644
--- a/libs/notifications/mqtt.js
+++ b/libs/notifications/mqtt.js
@@ -77,6 +77,7 @@ module.exports = function(s,config,lang,getSnapshot){
                 }
             }
             const onEventTrigger = (d,filter) => {
+                const monitorConfig = s.group[d.ke].rawMonitorConfigurations[d.id]
                 if((filter.mqttout || monitorConfig.details.notify_mqttout === '1') && !s.group[d.ke].activeMonitors[d.id].detector_mqttout){
                     var detector_mqttout_timeout
                     if(!monitorConfig.details.detector_mqttout_timeout||monitorConfig.details.detector_mqttout_timeout===''){