From 98d3897e7cf793b02066ddf2671dfd0f4fab9c4d Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Fri, 13 Jan 2023 04:12:49 -0800
Subject: [PATCH] Support more bech32 entities

---
 README.md                      | 2 --
 src/routes/Bech32Entity.svelte | 8 ++++++++
 src/routes/Person.svelte       | 7 ++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 697d6414..c2326221 100644
--- a/README.md
+++ b/README.md
@@ -63,9 +63,7 @@ If you like Coracle and want to support its development, you can donate sats via
 - [ ] Warn that everything will be cleared on logout
 - [ ] Clean up login page to prefer extension, make private key entry "advanced"
 - [ ] Do I need to implement re-connecting now?
-- [ ] handle localstorage limits more robustly (prune accounts) https://stackoverflow.com/questions/2989284/what-is-the-max-size-of-localstorage-values
 - [ ] Improve login UX for bootstrap delay. Nostr facts?
-- [ ] Use bech32 entities
 - [ ] Revisit pagination. Use bigger timedelta + limit, set earliest seen timestamp when paginating? Handle no results on page.
 - [ ] We often get the root as the reply, figure out why that is, compared to astral/damus
 - [ ] Alerts still aren't great. Maybe lazy load? We delete old events, so context will disappear and notes will become empty.
diff --git a/src/routes/Bech32Entity.svelte b/src/routes/Bech32Entity.svelte
index 4a797b1d..b29f4bb1 100644
--- a/src/routes/Bech32Entity.svelte
+++ b/src/routes/Bech32Entity.svelte
@@ -1,6 +1,8 @@
 <script>
   import {nip19} from 'nostr-tools'
+  import {getRelays} from 'src/agent'
   import NoteDetail from 'src/views/NoteDetail.svelte'
+  import Person from 'src/routes/Person.svelte'
 
   export let entity
 
@@ -10,6 +12,12 @@
 <div class="py-4 max-w-xl m-auto">
   {#if type === "nevent"}
     <NoteDetail note={{id: data.id}} relays={data.relays} />
+  {:else if type === "note"}
+    <NoteDetail note={{id: data}} relays={getRelays()} />
+  {:else if type === "nprofile"}
+    <Person npub={nip19.npubEncode(data.pubkey)} relays={data.relays} activeTab="notes" />
+  {:else if type === "npub"}
+    <Person npub={entity} activeTab="notes" />
   {/if}
 </div>
 
diff --git a/src/routes/Person.svelte b/src/routes/Person.svelte
index d5d26c70..b62bb55d 100644
--- a/src/routes/Person.svelte
+++ b/src/routes/Person.svelte
@@ -20,6 +20,7 @@
 
   export let npub
   export let activeTab
+  export let relays = null
 
   let subs = []
   let pubkey = nip19.decode(npub).data
@@ -30,13 +31,13 @@
 
   onMount(async () => {
     // Refresh our person if needed
-    loaders.loadPeople(getRelays(pubkey), [pubkey]).then(() => {
+    loaders.loadPeople(relays || getRelays(pubkey), [pubkey]).then(() => {
       person = getPerson(pubkey, true)
     })
 
     // Get our followers count
     subs.push(await listen(
-      getRelays(pubkey),
+      relays || getRelays(pubkey),
       [{kinds: [3], '#p': [pubkey]}],
       e => {
         followers.add(e.pubkey)
@@ -57,7 +58,7 @@
   const follow = async () => {
     following = true
 
-    const relay = first(getRelays(pubkey))
+    const relay = first(relays || getRelays(pubkey))
     const tag = ["p", pubkey, relay, person.name || ""]
     const petnames = reject(t => t[1] === pubkey, $user.petnames).concat(tag)