Merge remote-tracking branch 'upstream/main'

This commit is contained in:
James McGauran 2023-11-12 22:46:51 +00:00
commit 6db13c05c6
2 changed files with 3 additions and 1 deletions

View File

@ -153,6 +153,7 @@ export class NostrSystem extends EventEmitter<NostrSystemEvents> implements Syst
c.on("eose", s => this.#onEndOfStoredEvents(c, s)); c.on("eose", s => this.#onEndOfStoredEvents(c, s));
c.on("disconnect", code => this.#onRelayDisconnect(c, code)); c.on("disconnect", code => this.#onRelayDisconnect(c, code));
c.on("connected", r => this.#onRelayConnected(c, r)); c.on("connected", r => this.#onRelayConnected(c, r));
c.on("auth", (c, r, cb) => this.emit("auth", c, r, cb));
await c.Connect(); await c.Connect();
} else { } else {
// update settings if already connected // update settings if already connected
@ -219,6 +220,7 @@ export class NostrSystem extends EventEmitter<NostrSystemEvents> implements Syst
c.on("eose", s => this.#onEndOfStoredEvents(c, s)); c.on("eose", s => this.#onEndOfStoredEvents(c, s));
c.on("disconnect", code => this.#onRelayDisconnect(c, code)); c.on("disconnect", code => this.#onRelayDisconnect(c, code));
c.on("connected", r => this.#onRelayConnected(c, r)); c.on("connected", r => this.#onRelayConnected(c, r));
c.on("auth", (c, r, cb) => this.emit("auth", c, r, cb));
await c.Connect(); await c.Connect();
return c; return c;
} }

View File

@ -193,7 +193,7 @@ export class Query extends EventEmitter<QueryEvents> implements QueryBase {
if (t.filters.some(v => eventMatchesFilter(e, v))) { if (t.filters.some(v => eventMatchesFilter(e, v))) {
this.feed.add(e); this.feed.add(e);
} else { } else {
this.#log("Event did not match filter, rejecting %O", e); this.#log("Event did not match filter, rejecting %O %O", e, t);
} }
break; break;
} }