fix tag in matchFilter for kinds and ids.

filter.js

@@ -1,19 +1,21 @@
 export function matchFilter(filter, event) {
-  if (filter.id && event.id !== filter.id) return false
-  if (typeof filter.kind === 'number' && event.kind !== filter.kind) return false
+  if (filter.ids && filter.ids.indexOf(event.id) === -1) return false
+  if (filter.kinds && filter.kinds.indexOf(event.kind) === -1) return false
   if (filter.authors && filter.authors.indexOf(event.pubkey) === -1)
     return false
-  if (
-    filter['#e'] &&
-    !event.tags.find(([t, v]) => t === 'e' && v === filter['#e'])
-  )
-    return false
-  if (
-    filter['#p'] &&
-    !event.tags.find(([t, v]) => t === 'p' && v === filter['#p'])
-  )
-    return false
-  if (filter.since && event.created_at <= filter.since) return false
+
+  for (let f in filter) {
+    if (f[0] === '#') {
+      if (
+        filter[f] &&
+        !event.tags.find(([t, v]) => t === f.slice(1) && v === filter[f])
+      )
+        return false
+    }
+  }
+
+  if (filter.since && event.created_at < filter.since) return false
+  if (filter.until && event.created_at >= filter.until) return false
 
   return true
 }

nip04.js

@@ -1,6 +1,6 @@
 import aes from 'browserify-cipher'
 import {Buffer} from 'buffer'
-import randomBytes from 'randombytes'
+import {randomBytes} from '@noble/hashes/utils'
 import * as secp256k1 from '@noble/secp256k1'
 
 export function encrypt(privkey, pubkey, text) {

package.json

@@ -1,12 +1,13 @@
 {
   "name": "nostr-tools",
-  "version": "0.15.1",
+  "version": "0.16.1",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",
     "url": "https://github.com/fiatjaf/nostr-tools.git"
   },
   "dependencies": {
+    "@noble/hashes": "^0.5.7",
     "@noble/secp256k1": "^1.3.0",
     "browserify-cipher": ">=1",
     "buffer": ">=5",
@@ -14,7 +15,6 @@
     "dns-packet": "^5.2.4",
     "micro-bip32": "^0.1.0",
     "micro-bip39": "^0.1.3",
-    "randombytes": ">=2",
     "websocket-polyfill": "^0.0.3"
   },
   "keywords": [