diff --git a/ROADMAP.md b/ROADMAP.md index ba7baaf1..e6130e14 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,6 +1,5 @@ # Current -- [ ] Fix relays notification when multiplexing - [ ] Disable self-zap - [ ] Move blog to nostr - [ ] Improve note rendering diff --git a/src/agent/pool.ts b/src/agent/pool.ts index e505250a..1048768c 100644 --- a/src/agent/pool.ts +++ b/src/agent/pool.ts @@ -161,8 +161,9 @@ function getExecutor(urls) { let target - // Try to use our multiplexer, but if it fails to connect fall back to relays - if (Config.multiplextrUrl) { + // Try to use our multiplexer, but if it fails to connect fall back to relays. If + // we're only connecting to a single relay, just do it directly + if (Config.multiplextrUrl && urls.length > 1) { const socket = pool.get(Config.multiplextrUrl) if (!socket.error) { @@ -321,7 +322,7 @@ async function count(filter) { return new Promise(resolve => { const sub = executor.count(filters, { - onCount: res => resolve(res?.count), + onCount: (url, {count}) => resolve(count), }) setTimeout(() => { diff --git a/src/views/notes/Note.svelte b/src/views/notes/Note.svelte index 0baf4636..c8aa2aca 100644 --- a/src/views/notes/Note.svelte +++ b/src/views/notes/Note.svelte @@ -124,7 +124,7 @@ $: $zapsTotal = sum(zaps.map(zap => zap.invoiceAmount)) / 1000 $: $repliesCount = note.replies.length $: visibleNotes = note.replies.filter(r => (showContext ? true : !r.isContext)) - $: canZap = $person?.zapper + $: canZap = $person?.zapper && $person?.pubkey !== user.getPubkey() const onClick = e => { const target = e.target as HTMLElement