Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add sql AND tags filter

Browse Source
This commit is contained in:
Sandwich 2024-11-14 13:14:11 +01:00
parent 7002647ffc
commit 497e12c644
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/worker-relay/src/sqlite/sqlite-relay.ts
View File

@ -325,9 +325,9 @@ export class SqliteRelay extends EventEmitter<RelayHandlerEvents> implements Rel
operation = "delete"; operation = "delete";
} }
let sql = `${operation} from events`; let sql = `${operation} from events`;
const tags = Object.entries(req).filter(([k]) => k.startsWith("#")); const orTags = Object.entries(req).filter(([k]) => k.startsWith("#"));
let tx = 0; let tx = 0;
for (const [key, values] of tags) { for (const [key, values] of orTags) {
const vArray = values as Array<string>; const vArray = values as Array<string>;
sql += ` inner join tags t_${tx} on events.id = t_${tx}.event_id and t_${tx}.key = ? and t_${tx}.value in (${this.#repeatParams( sql += ` inner join tags t_${tx} on events.id = t_${tx}.event_id and t_${tx}.key = ? and t_${tx}.value in (${this.#repeatParams(
vArray.length, vArray.length,
@ -336,6 +336,15 @@ export class SqliteRelay extends EventEmitter<RelayHandlerEvents> implements Rel
params.push(...vArray); params.push(...vArray);
tx++; tx++;
} }
const andTags = Object.entries(req).filter(([k]) => k.startsWith("&"));
for (const [key, values] of andTags) {
for (const value of values as Array<string>) {
sql += ` inner join tags t_${tx} on events.id = t_${tx}.event_id and t_${tx}.key = ? and t_${tx}.value = ?`;
params.push(key.slice(1));
params.push(value);
tx++;
}
}
if (req.search) { if (req.search) {
sql += " inner join search_content on search_content.id = events.id"; sql += " inner join search_content on search_content.id = events.id";
conditions.push("search_content match ?"); conditions.push("search_content match ?");