Compare commits

..

2 Commits

4 changed files with 38 additions and 6 deletions

26
filter.js Normal file
View File

@@ -0,0 +1,26 @@
export function matchFilter(filter, event) {
if (filter.id && event.id !== filter.id) return false
if (filter.kind && event.kind !== filter.kind) return false
if (filter.author && event.pubkey !== filter.author) return false
if (filter.authors && filter.author.indexOf(event.pubkey) === -1) return false
if (
filter['#e'] &&
event.tags.find(([t, v]) => t === 'e' && v === filter['#e']) === null
)
return false
if (
filter['#p'] &&
event.tags.find(([t, v]) => t === 'p' && v === filter['#p']) === null
)
return false
if (filter.since && event.created_at <= filter.since) return false
return true
}
export function matchFilters(filters, event) {
for (let i = 0; i < filters.length; i++) {
if (matchFilter(filters[i], event)) return true
}
return false
}

View File

@@ -7,6 +7,7 @@ import {
serializeEvent, serializeEvent,
getEventHash getEventHash
} from './event' } from './event'
import {matchFilter, matchFilters} from './filter'
import {makeRandom32, sha256, getPublicKey} from './utils' import {makeRandom32, sha256, getPublicKey} from './utils'
export { export {
@@ -19,5 +20,7 @@ export {
makeRandom32, makeRandom32,
sha256, sha256,
getPublicKey, getPublicKey,
getBlankEvent getBlankEvent,
matchFilter,
matchFilters
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "nostr-tools", "name": "nostr-tools",
"version": "0.9.1", "version": "0.10.1",
"description": "Tools for making a Nostr client.", "description": "Tools for making a Nostr client.",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@@ -1,6 +1,7 @@
import 'websocket-polyfill' import 'websocket-polyfill'
import {verifySignature} from './event' import {verifySignature} from './event'
import {matchFilters} from './filter'
export function normalizeRelayURL(url) { export function normalizeRelayURL(url) {
let [host, ...qs] = url.split('?') let [host, ...qs] = url.split('?')
@@ -88,10 +89,12 @@ export function relayConnect(url, onNotice) {
let channel = data[1] let channel = data[1]
let event = data[2] let event = data[2]
if (await verifySignature(event)) { if (
if (channels[channel]) { (await verifySignature(event)) &&
channels[channel](event) channels[channel] &&
} matchFilters(openSubs[channel], event)
) {
channels[channel](event)
} }
return return
} }