From 623d1c1b190fe6221d98959866aadb0a2c801e9b Mon Sep 17 00:00:00 2001 From: asmithaxe Date: Wed, 6 Jan 2021 22:54:56 +1000 Subject: [PATCH 1/2] Add references to method signatures to fix reference errors. --- libs/events/utils.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/events/utils.js b/libs/events/utils.js index f5743021..261aa32b 100644 --- a/libs/events/utils.js +++ b/libs/events/utils.js @@ -282,10 +282,10 @@ module.exports = (s,config,lang,app,io) => { } return true } - const runMultiTrigger = (monitorConfig,eventDetails) => { + const runMultiTrigger = (monitorConfig,eventDetails, d, triggerEvent) => { s.getCamerasForMultiTrigger(monitorConfig).forEach(function(monitor){ if(monitor.mid !== d.id){ - s.triggerEvent({ + triggerEvent({ id: monitor.mid, ke: monitor.ke, details: { @@ -314,11 +314,11 @@ module.exports = (s,config,lang,app,io) => { } return true } - const runEventExecutions = async (eventTime,monitorConfig,eventDetails,forceSave,filter,d) => { + const runEventExecutions = async (eventTime,monitorConfig,eventDetails,forceSave,filter,d, triggerEvent) => { const monitorDetails = monitorConfig.details const detailString = JSON.stringify(eventDetails) if(monitorDetails.det_multi_trig === '1'){ - runMultiTrigger(monitorConfig,eventDetails) + runMultiTrigger(monitorConfig,eventDetails, d, triggerEvent) } //save this detection result in SQL, only coords. not image. if(forceSave || (filter.save && monitorDetails.detector_save === '1')){ @@ -572,7 +572,7 @@ module.exports = (s,config,lang,app,io) => { monitorDetails.detector_use_motion === '0' || d.doObjectDetection !== true ){ - runEventExecutions(eventTime,monitorConfig,eventDetails,forceSave,filter,d) + runEventExecutions(eventTime,monitorConfig,eventDetails,forceSave,filter,d, triggerEvent) } //show client machines the event s.tx({ From e77761e95abfb5e808ff2671507b540a776354a0 Mon Sep 17 00:00:00 2001 From: Moe Alam Date: Wed, 6 Jan 2021 13:50:55 -0800 Subject: [PATCH 2/2] fix multi trigger --- libs/events/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/events/utils.js b/libs/events/utils.js index f5743021..5ffb0881 100644 --- a/libs/events/utils.js +++ b/libs/events/utils.js @@ -285,7 +285,7 @@ module.exports = (s,config,lang,app,io) => { const runMultiTrigger = (monitorConfig,eventDetails) => { s.getCamerasForMultiTrigger(monitorConfig).forEach(function(monitor){ if(monitor.mid !== d.id){ - s.triggerEvent({ + triggerEvent({ id: monitor.mid, ke: monitor.ke, details: {