From aa430de168b6086b3b0c8584aa8143bd57bbc6b6 Mon Sep 17 00:00:00 2001 From: Martti Malmi Date: Mon, 15 Jan 2024 10:23:00 +0200 Subject: [PATCH] rm nip 113 --- packages/system/src/nips.ts | 1 - packages/system/src/query-manager.ts | 14 -------------- packages/system/src/query.ts | 11 +---------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/packages/system/src/nips.ts b/packages/system/src/nips.ts index 72c15921..decdfa3c 100644 --- a/packages/system/src/nips.ts +++ b/packages/system/src/nips.ts @@ -1,4 +1,3 @@ export enum Nips { Search = 50, - NotFilter = 113, } diff --git a/packages/system/src/query-manager.ts b/packages/system/src/query-manager.ts index 5c03b221..dff53449 100644 --- a/packages/system/src/query-manager.ts +++ b/packages/system/src/query-manager.ts @@ -122,20 +122,6 @@ export class QueryManager extends EventEmitter { } qSend.filters = fNew; - const alreadyHave = new Set(); - qSend.filters.forEach(f => { - // check what we already have locally - q.feed.takeSnapshot().forEach(e => alreadyHave.add(e.id)); - if (alreadyHave.size) { - f.not = f.not || {}; - f.not.ids = f.not.ids || []; - // if there's multiple filters in the query, should we only add alreadyHave events that actually match the filter? - f.not.ids.push(...alreadyHave); - console.log("already have", f, alreadyHave); - } - // query relays one at a time at intervals, updating alreadyHave in between? - }); - if (qSend.relay) { this.#log("Sending query to %s %s %O", qSend.relay, q.id, qSend); const s = this.#system.pool.getConnection(qSend.relay); diff --git a/packages/system/src/query.ts b/packages/system/src/query.ts index 49e1ca33..1099d9c2 100644 --- a/packages/system/src/query.ts +++ b/packages/system/src/query.ts @@ -380,16 +380,7 @@ export class Query extends EventEmitter { #sendQueryInternal(c: Connection, q: BuiltRawReqFilter) { let filters = q.filters; - if (!c.SupportsNip(Nips.NotFilter)) { - filters = filters.map(f => { - if (f.not) { - const copy = { ...f }; - delete copy.not; - return copy; - } - return f; - }); - } + const qt = new QueryTrace(c.Address, filters, c.Id); qt.on("close", x => c.CloseReq(x)); qt.on("change", () => this.#onProgress());