From af3712a06d6fc213d8c607830a38af1fc6b43bb7 Mon Sep 17 00:00:00 2001
From: gsovereignty <gsovereignty@proton.me>
Date: Sat, 20 Apr 2024 21:20:51 +1200
Subject: [PATCH] problem: can't see user names

---
 src/lib/components/UserDisplayName.svelte | 58 +++++++++++++++++++++++
 src/lib/components/UserName.svelte        | 27 -----------
 src/lib/components/UserProfile.svelte     |  0
 src/lib/stores/user.ts                    |  5 +-
 src/lib/views/messages/RenderKind1.svelte |  3 +-
 5 files changed, 64 insertions(+), 29 deletions(-)
 create mode 100644 src/lib/components/UserDisplayName.svelte
 delete mode 100644 src/lib/components/UserName.svelte
 delete mode 100644 src/lib/components/UserProfile.svelte

diff --git a/src/lib/components/UserDisplayName.svelte b/src/lib/components/UserDisplayName.svelte
new file mode 100644
index 0000000..a8cb9db
--- /dev/null
+++ b/src/lib/components/UserDisplayName.svelte
@@ -0,0 +1,58 @@
+<script lang="ts">
+	import { kind0 } from '@/stores/user';
+	import { System } from '@/views/messages/snort';
+	import { RequestBuilder, type QueryLike } from '@snort/system';
+	import { nip19 } from 'nostr-tools';
+	import { onDestroy, onMount } from 'svelte';
+	import { derived } from 'svelte/store';
+	
+	export let pubkey: string;
+	let q: QueryLike;
+
+	onMount(()=>{
+		if (pubkey) {
+			if (!$kind0.get(pubkey)) {
+			const rb = new RequestBuilder(pubkey);
+			rb.withFilter().authors([pubkey]).kinds([0]);
+			rb.withOptions({ leaveOpen: false });
+			q = System.Query(rb);
+			q.on('event', (evs) => {
+				if (evs.length > 0) {
+					kind0.update((existing) => {
+						for (let e of evs) {
+							let _existing = existing.get(e.pubkey);
+							if (!_existing || (_existing && _existing.created_at <= e.created_at)) {
+								existing.set(e.pubkey, e);
+							}
+						}
+						return existing;
+					});
+				}
+			});
+			}
+		}
+	})
+	onDestroy(() => {
+		if (q) {
+			q.cancel();
+		}
+	});
+
+	
+	let displayName = derived(kind0, ($kind0) => {
+		let content = $kind0.get(pubkey)?.content
+		let name = nip19.npubEncode(pubkey).substring(0,8)
+		if (content) {
+			try {
+				let json = JSON.parse(content)
+				if (json.Name && json.Name.length > 0) {
+					name = json.Name
+				} else if (json.display_name && json.display_name.length > 0){
+					name = json.display_name
+				}
+			} catch {}
+		} 
+		return name
+	});
+</script>
+{$displayName}
diff --git a/src/lib/components/UserName.svelte b/src/lib/components/UserName.svelte
deleted file mode 100644
index 0ce5e54..0000000
--- a/src/lib/components/UserName.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-<script lang="ts">
-	import { ndk } from "@/ndk";
-	import { networkFollows } from "@/stores/session";
-	import { wot } from "@/stores/wot";
-	import type { NDKUser } from "@nostr-dev-kit/ndk";
-	import { Avatar, Name } from "@nostr-dev-kit/ndk-svelte-components";
-
-    export let pubkey: string | undefined = undefined;
-    export let user: NDKUser | undefined = undefined;
-
-    if (pubkey && !user) user = $ndk.getUser({pubkey})
-
-    if (!user) throw new Error('User not found')
-
-    console.log('networkFollows', $networkFollows)
-
-    const wotScore = $networkFollows.get(user.pubkey) ?? "";
-</script>
-
-<div class="flex flex-row items-center gap-2">
-    <Avatar ndk={$ndk} {user} class="w-8 h-8 object-cover rounded-full flex-none" />
-    <Name ndk={$ndk} {user} class="inline-block" />
-
-    <div class="text-xs opacity-50">
-        {wotScore}
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/lib/components/UserProfile.svelte b/src/lib/components/UserProfile.svelte
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts
index d4b46d2..ee5587b 100644
--- a/src/lib/stores/user.ts
+++ b/src/lib/stores/user.ts
@@ -1,3 +1,6 @@
+import type { NostrEvent } from "nostr-tools";
 import { writable, type Writable } from "svelte/store";
 
-export let currentPubkey = writable(undefined)
\ No newline at end of file
+export let currentPubkey = writable(undefined)
+
+export let kind0 = writable(new Map<string, NostrEvent>)
\ No newline at end of file
diff --git a/src/lib/views/messages/RenderKind1.svelte b/src/lib/views/messages/RenderKind1.svelte
index 1cfc11b..ceceac7 100644
--- a/src/lib/views/messages/RenderKind1.svelte
+++ b/src/lib/views/messages/RenderKind1.svelte
@@ -9,6 +9,7 @@
 	import { inview } from 'svelte-inview';
 	import { onMount } from 'svelte';
 	import { viewed } from '@/snort_workers/main';
+	import UserDisplayName from '@/components/UserDisplayName.svelte';
 
 	export let note: NostrEvent;
 	export let onClickReply: () => void;
@@ -38,7 +39,7 @@ onMount(() => {
 				alt="profile pic"
 			/>
 			<div class="grid">
-				<h5 class="text-gray-900 dark:text-orange-600 font-semibold leading-snug pb-1">Marcus</h5>
+				<h5 class="text-gray-900 dark:text-orange-600 font-semibold leading-snug pb-1"><UserDisplayName pubkey={note.pubkey}/></h5>
 				<div class="grid overflow-hidden mr-2 min-w-56">
 					<div
 						class="px-3.5 py-2 bg-gray-200 dark:bg-gray-700 rounded-e-xl rounded-es-xl flex flex-col gap-2"