ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Object Detection > Check for Motion first

merge-requests/210/merge
Moe 2021-04-29 17:58:28 -07:00
parent 14bb429c54
commit 4bb8738a87
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/events/utils.js
View File

@ -127,13 +127,13 @@ module.exports = (s,config,lang,app,io) => {
return s.group[eventData.ke].activeMonitors[eventData.id].detector_motion_count.length
}
const hasMatrices = (eventDetails) => {
return (eventDetails.matrices && eventDetails.matrices.length > 0)
return (eventDetails.matrices && eventDetails.matrices.length > 0) && eventDetails.reason !== 'motion'
}
const checkEventFilters = (d,monitorDetails,filter) => {
const eventDetails = d.details
if(
monitorDetails.use_detector_filters === '1' &&
((monitorDetails.use_detector_filters_object === '1' && d.details.matrices) ||
((monitorDetails.use_detector_filters_object === '1' && d.details.matrices && d.details.reason !== 'motion') ||
monitorDetails.use_detector_filters_object !== '1')
){
const parseValue = function(key,val){
@ -244,7 +244,7 @@ module.exports = (s,config,lang,app,io) => {
}
}
})
if(d.details.matrices && d.details.matrices.length === 0 || filter.halt === true){
if(d.details.matrices && d.details.matrices.length === 0 && d.details.reason !== 'motion' || filter.halt === true){
return false
}else if(hasMatrices(d.details)){
var reviewedMatrix = []