DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 37 Pull Requests 1 Releases Wiki Activity

Implemented alert field AND/OR logic.

This commit is contained in:
DebaucheryLibrarian 2024-05-20 06:29:44 +02:00
parent 00a52c5f83
commit 0f05abcd27
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migrations/20240414003818_alerts_any.js
View File

@ -16,6 +16,16 @@ exports.up = async (knex) => {
.notNullable() .notNullable()
.defaultTo(true); .defaultTo(true);
}); });
await knex.raw(`
UPDATE alerts
SET
all_actors = false,
all_entities = false,
all_tags = false,
all_matches= false
WHERE alerts.all = false;
`);
}; };
exports.down = async (knex) => { exports.down = async (knex) => {

18
src/alerts.js
View File

@ -129,6 +129,10 @@ async function notify(scenes) {
notify: alert.notify, notify: alert.notify,
email: alert.email, email: alert.email,
all: alert.all, all: alert.all,
allActors: alert.all_actors,
allEntities: alert.all_entities,
allTags: alert.all_tags,
allMatches: alert.all_matches,
actors: alertsActorsByAlertId[alert.id] || [], actors: alertsActorsByAlertId[alert.id] || [],
tags: alertsTagsByAlertId[alert.id] || [], tags: alertsTagsByAlertId[alert.id] || [],
entities: alertsEntitiesByAlertId[alert.id] || [], entities: alertsEntitiesByAlertId[alert.id] || [],
@ -149,11 +153,11 @@ async function notify(scenes) {
const triggers = alerts.flatMap((alert) => { const triggers = alerts.flatMap((alert) => {
const alertScenes = curatedScenes.filter((scene) => { const alertScenes = curatedScenes.filter((scene) => {
if (alert.all) { if (alert.all) {
if (alert.actors.length > 0 && !alert.actors.every((actorId) => scene.actorIds.includes(actorId))) { if (alert.actors.length > 0 && !alert.actors[alert.allActors ? 'every' : 'some']((actorId) => scene.actorIds.includes(actorId))) {
return false; return false;
} }
if (alert.tags.length > 0 && !alert.tags.every((tagId) => scene.tagIds.includes(tagId))) { if (alert.tags.length > 0 && !alert.tags[alert.allTags ? 'every' : 'some']((tagId) => scene.tagIds.includes(tagId))) {
return false; return false;
} }
@ -162,27 +166,27 @@ async function notify(scenes) {
return false; return false;
} }
if (alert.matches.length > 0 && !alert.matches.every((match) => match.expression.test(scene[match.property]))) { if (alert.matches.length > 0 && !alert.matches[alert.allMatches ? 'every' : 'some']((match) => match.expression.test(scene[match.property]))) {
return false; return false;
} }
return true; return true;
} }
if (alert.actors.some((actorId) => scene.actorIds.includes(actorId))) { if (alert.matches.length > 0 && alert.actors[alert.allActors ? 'every' : 'some']((actorId) => scene.actorIds.includes(actorId))) {
return true; return true;
} }
if (alert.tags.some((tagId) => scene.tagIds.includes(tagId))) { if (alert.tags.length > 0 && alert.tags[alert.allTags ? 'every' : 'some']((tagId) => scene.tagIds.includes(tagId))) {
return true; return true;
} }
// multiple entities can only be matched in OR mode // multiple entities can only be matched in OR mode
if (alert.entities.some((alertEntityId) => alertEntityId === scene.entityId || alertEntityId === scene.parentEntityId)) { if (alert.entities.length > 0 && alert.entities.some((alertEntityId) => alertEntityId === scene.entityId || alertEntityId === scene.parentEntityId)) {
return true; return true;
} }
if (alert.matches.some((match) => match.expression.test(scene[match.property]))) { if (alert.matches.length > 0 && alert.matches[alert.allMatches ? 'every' : 'some']((match) => match.expression.test(scene[match.property]))) {
return true; return true;
} }