From 52a79baa95f0da83491ecc5f3488a09d1f62464f Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 16 Feb 2024 11:59:42 +0000 Subject: [PATCH] fix(PrPage): show correct user all instances of EventCard would sometimes show the same user similar bug to that fixed in c03a4cd01d698b94b3aca9edc8287b15c153220d --- src/lib/wrappers/EventCard.svelte | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib/wrappers/EventCard.svelte b/src/lib/wrappers/EventCard.svelte index e7f1ee1..64436d5 100644 --- a/src/lib/wrappers/EventCard.svelte +++ b/src/lib/wrappers/EventCard.svelte @@ -8,16 +8,20 @@ import { ensureUser } from '$lib/stores/users' import type { NDKEvent } from '@nostr-dev-kit/ndk' import { onDestroy } from 'svelte' - import { writable } from 'svelte/store' + import { writable, type Unsubscriber } from 'svelte/store' export let event: NDKEvent let author = writable({ ...user_defaults }) - let author_unsubsriber = ensureUser(event.pubkey).subscribe((u) => { - author.set({ ...u }) - }) + let author_unsubsriber: Unsubscriber + $: { + if (event && event.pubkey.length > 0) + author_unsubsriber = ensureUser(event.pubkey).subscribe((u) => { + if (u.hexpubkey == event.pubkey) author.set({ ...u }) + }) + } onDestroy(() => { - author_unsubsriber() + if (author_unsubsriber) author_unsubsriber() })