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

Alter Event Filter execution

refactor-sql-commands-on-startup
Moe 2022-08-20 10:29:35 -07:00
parent 28f16a1c73
commit ff3eaf8a09
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/events/utils.js
View File

@ -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(