From 17afc35d1cbd6dc9f298e3becc669abb9ef24cce Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Thu, 2 Mar 2023 16:33:02 -0600
Subject: [PATCH] Fix nprofile scan when there are no relays

---
 src/views/Bech32Entity.svelte |  7 ++++---
 src/views/search/Scan.svelte  | 12 +++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/Bech32Entity.svelte b/src/views/Bech32Entity.svelte
index 24b4b09f..a49c27b4 100644
--- a/src/views/Bech32Entity.svelte
+++ b/src/views/Bech32Entity.svelte
@@ -2,10 +2,11 @@
   import {objOf} from 'ramda'
   import {onMount} from 'svelte'
   import {nip19} from 'nostr-tools'
+  import {warn} from 'src/util/logger'
   import Content from 'src/partials/Content.svelte'
   import NoteDetail from 'src/views/notes/NoteDetail.svelte'
   import Person from 'src/views/person/PersonDetail.svelte'
-  import {getUserReadRelays} from 'src/agent/relays'
+  import {sampleRelays} from 'src/agent/relays'
 
   export let entity
 
@@ -14,9 +15,9 @@
   onMount(() => {
     try {
       ({type, data} = nip19.decode(entity) as {type: string, data: any})
-      relays = (data.relays || []).map(objOf('url')).concat(getUserReadRelays())
+      relays = sampleRelays((data.relays || []).map(objOf('url')))
     } catch (e) {
-      // pass
+      warn(e)
     }
   })
 </script>
diff --git a/src/views/search/Scan.svelte b/src/views/search/Scan.svelte
index 8857aea0..aad0870a 100644
--- a/src/views/search/Scan.svelte
+++ b/src/views/search/Scan.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
+  import type {ProfilePointer} from 'nostr-tools/nip19'
   import QrScanner from 'qr-scanner'
   import {onDestroy} from 'svelte'
   import {navigate} from 'svelte-routing'
   import {waitFor} from 'hurdak/lib/hurdak'
-  import {any, flip, startsWith} from 'ramda'
+  import {pluck, find} from 'ramda'
   import {nip05, nip19} from 'nostr-tools'
   import Input from 'src/partials/Input.svelte'
   import Anchor from 'src/partials/Anchor.svelte'
   import Spinner from 'src/partials/Spinner.svelte'
+  import {getUserReadRelays} from 'src/agent/relays'
   import {toast} from "src/app/ui"
 
   let mode = 'input', video, ready, value, scanner
@@ -19,7 +21,7 @@
   const handleInput = async input => {
     input = input.replace('nostr:', '')
 
-    if (any(flip(startsWith)(input), ["note1", "npub1", "nevent1", "nprofile1"])) {
+    if (find(s => input.startsWith(s), ["note1", "npub1", "nevent1", "nprofile1"])) {
       navigate("/" + input)
       return
     }
@@ -29,8 +31,12 @@
       return
     }
 
-    let profile = await nip05.queryProfile(input)
+    let profile = await nip05.queryProfile(input) as ProfilePointer
     if (profile) {
+      if (profile.relays.length === 0) {
+        profile.relays = pluck('url', getUserReadRelays())
+      }
+
       navigate("/" + nip19.nprofileEncode(profile))
       return
     }