diff --git a/package-lock.json b/package-lock.json index b9651a7..f659d8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3097,7 +3097,7 @@ "dependencies": { "@welshman/lib": "0.0.11", "@welshman/net": "0.0.14", - "@welshman/util": "0.0.21", + "@welshman/util": "0.0.22", "nostr-tools": "^2.7.0" }, "devDependencies": { @@ -3111,7 +3111,7 @@ "version": "0.0.12", "license": "MIT", "dependencies": { - "@welshman/util": "0.0.21" + "@welshman/util": "0.0.22" }, "devDependencies": { "gts": "^5.0.1", @@ -3149,7 +3149,7 @@ "license": "MIT", "dependencies": { "@welshman/lib": "0.0.11", - "@welshman/util": "0.0.21", + "@welshman/util": "0.0.22", "isomorphic-ws": "^5.0.0", "ws": "^8.16.0" }, @@ -3161,7 +3161,7 @@ }, "packages/util": { "name": "@welshman/util", - "version": "0.0.21", + "version": "0.0.22", "license": "MIT", "dependencies": { "@welshman/lib": "0.0.11", diff --git a/packages/dvm/package.json b/packages/dvm/package.json index 70ea42a..b0d59e1 100644 --- a/packages/dvm/package.json +++ b/packages/dvm/package.json @@ -33,7 +33,7 @@ "dependencies": { "@welshman/lib": "0.0.11", "@welshman/net": "0.0.14", - "@welshman/util": "0.0.21", + "@welshman/util": "0.0.22", "nostr-tools": "^2.7.0" } } diff --git a/packages/feeds/package.json b/packages/feeds/package.json index 18f90b6..bf28140 100644 --- a/packages/feeds/package.json +++ b/packages/feeds/package.json @@ -31,6 +31,6 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/util": "0.0.21" + "@welshman/util": "0.0.22" } } diff --git a/packages/net/package.json b/packages/net/package.json index 638c986..78f960c 100644 --- a/packages/net/package.json +++ b/packages/net/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@welshman/lib": "0.0.11", - "@welshman/util": "0.0.21", + "@welshman/util": "0.0.22", "isomorphic-ws": "^5.0.0", "ws": "^8.16.0" } diff --git a/packages/util/package.json b/packages/util/package.json index 848c999..3c96687 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/util", - "version": "0.0.21", + "version": "0.0.22", "author": "hodlbod", "license": "MIT", "description": "A collection of nostr-related utilities.", diff --git a/packages/util/src/Repository.ts b/packages/util/src/Repository.ts index dd486ea..8e7a789 100644 --- a/packages/util/src/Repository.ts +++ b/packages/util/src/Repository.ts @@ -1,4 +1,4 @@ -import {flatten, Emitter, max, sortBy, inc, chunk, sleep, uniq, omit, now, range, identity} from '@welshman/lib' +import {flatten, Emitter, sortBy, inc, chunk, sleep, uniq, omit, now, range, identity} from '@welshman/lib' import {DELETE} from './Kinds' import {EPOCH, matchFilter} from './Filters' import {isReplaceable, isTrustedEvent} from './Events' @@ -203,8 +203,11 @@ export class Repository extends Emitter { return true } - isDeleted = (event: TrustedEvent) => - max([this.deletes.get(event.id) || 0, this.deletes.get(getAddress(event)) || 0]) > event.created_at + isDeletedByAddress = (event: TrustedEvent) => (this.deletes.get(getAddress(event)) || 0) > event.created_at + + isDeletedById = (event: TrustedEvent) => (this.deletes.get(event.id) || 0) > event.created_at + + isDeleted = (event: TrustedEvent) => this.isDeletedByAddress(event) || this.isDeletedById(event) // Utilities