From 625c1db27c9634c82a17e84a566c7b5548058c0d Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Tue, 7 Mar 2023 13:12:26 -0600
Subject: [PATCH] Split up search and scan

---
 ROADMAP.md                           |  1 +
 src/App.svelte                       | 10 ++-
 src/agent/sync.ts                    | 13 ++--
 src/partials/EnsureData.svelte       |  4 +-
 src/routes/Scan.svelte               | 81 +++++++++++++++++++++++
 src/routes/Search.svelte             | 51 +++++++++++----
 src/views/SideNav.svelte             |  7 +-
 src/views/search/Scan.svelte         | 97 ----------------------------
 src/views/search/SearchPeople.svelte | 43 ------------
 9 files changed, 140 insertions(+), 167 deletions(-)
 create mode 100644 src/routes/Scan.svelte
 delete mode 100644 src/views/search/Scan.svelte
 delete mode 100644 src/views/search/SearchPeople.svelte

diff --git a/ROADMAP.md b/ROADMAP.md
index 5f8d8f38..546969f7 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -38,6 +38,7 @@
 
 # More
 
+- [ ] Separate mentions from other notifications
 - [ ] Performance
   - same deal as with formatTimestamp, don't use functions inline since svelte can't cache them
 - [ ] Image Uploads
diff --git a/src/App.svelte b/src/App.svelte
index 869fccb6..d11d98b8 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -43,6 +43,7 @@
   import NotFound from "src/routes/NotFound.svelte"
   import PersonDetail from "src/routes/PersonDetail.svelte"
   import Search from "src/routes/Search.svelte"
+  import Scan from "src/routes/Scan.svelte"
   import RelayDetail from "src/routes/RelayDetail.svelte"
   import RelayList from "src/routes/RelayList.svelte"
   import Profile from "src/views/Profile.svelte"
@@ -177,9 +178,14 @@
     {#if $ready}
     <div class="pt-16 text-white h-full lg:ml-56">
       <Route path="/alerts" component={Alerts} />
-      <Route path="/search/:activeTab" let:params>
+      <Route path="/search">
         <EnsureData enforcePeople={false}>
-          <Search activeTab={params.activeTab} />
+          <Search />
+        </EnsureData>
+      </Route>
+      <Route path="/scan">
+        <EnsureData enforcePeople={false}>
+          <Scan />
         </EnsureData>
       </Route>
       <Route path="/notes/:activeTab" let:params>
diff --git a/src/agent/sync.ts b/src/agent/sync.ts
index 33ba4fc0..49e31528 100644
--- a/src/agent/sync.ts
+++ b/src/agent/sync.ts
@@ -1,7 +1,7 @@
 import {uniq, pick, identity, isEmpty} from 'ramda'
 import {nip05} from 'nostr-tools'
 import {noop, createMap, ensurePlural, chunk, switcherFn} from 'hurdak/lib/hurdak'
-import {log, warn} from 'src/util/logger'
+import {log} from 'src/util/logger'
 import {lnurlEncode, lnurlDecode, tryFetch, now, sleep, tryJson, timedelta, shuffle, hash} from 'src/util/misc'
 import {Tags, roomAttrs, personKinds, isRelay, isShareableRelay, normalizeRelayUrl} from 'src/util/nostr'
 import database from 'src/agent/database'
@@ -307,7 +307,7 @@ const verifyNip05 = (pubkey, as) =>
   }, noop)
 
 const verifyZapper = async (pubkey, address) => {
-  let url, zapper, lnurl
+  let url
 
   // Try to parse it as a lud06 LNURL or as a lud16 address
   if (address.startsWith('lnurl1')) {
@@ -325,13 +325,8 @@ const verifyZapper = async (pubkey, address) => {
   }
 
   const res = await tryFetch(() => fetch(url))
-
-  try {
-    zapper = await res.json()
-    lnurl = lnurlEncode('lnurl', url)
-  } catch (e) {
-    warn(e)
-  }
+  const zapper = await tryJson(() => res.json())
+  const lnurl = lnurlEncode('lnurl', url)
 
   if (zapper?.allowsNostr && zapper?.nostrPubkey) {
     database.people.patch({pubkey, zapper, lnurl})
diff --git a/src/partials/EnsureData.svelte b/src/partials/EnsureData.svelte
index 1d0d1c98..ca8b4757 100644
--- a/src/partials/EnsureData.svelte
+++ b/src/partials/EnsureData.svelte
@@ -5,7 +5,7 @@
   import PersonInfo from "src/views/person/PersonInfo.svelte"
   import RelaySearch from "src/views/relays/RelaySearch.svelte"
   import RelayCard from "src/views/relays/RelayCard.svelte"
-  import SearchPeople from "src/views/search/SearchPeople.svelte"
+  import Search from "src/routes/Search.svelte"
   import database from 'src/agent/database'
   import user from 'src/agent/user'
 
@@ -76,8 +76,8 @@
       </div>
     </div>
     {/each}
-    <SearchPeople hideFollowing />
   </Content>
+  <Search hideFollowing />
 </Modal>
 {:else if needsPeople()}
 <Content size="lg">
diff --git a/src/routes/Scan.svelte b/src/routes/Scan.svelte
new file mode 100644
index 00000000..7f04767c
--- /dev/null
+++ b/src/routes/Scan.svelte
@@ -0,0 +1,81 @@
+<script lang="ts">
+  import QrScanner from 'qr-scanner'
+  import {onDestroy} from 'svelte'
+  import {navigate} from 'svelte-routing'
+  import {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 Content from "src/partials/Content.svelte"
+  import {toast} from "src/app/ui"
+
+  let video, value, scanner, status = ''
+
+  const onDecode = result => {
+    handleInput(result.data)
+  }
+
+  const handleInput = async input => {
+    input = input.replace('nostr:', '')
+
+    if (find(s => input.startsWith(s), ["note1", "npub1", "nevent1", "nprofile1"])) {
+      navigate("/" + input)
+      return
+    }
+
+    if (input.match(/^[a-f0-9]{64}$/)) {
+      navigate("/" + nip19.npubEncode(input))
+      return
+    }
+
+    let profile = await nip05.queryProfile(input)
+    if (profile) {
+      navigate("/" + nip19.nprofileEncode(profile))
+      return
+    }
+
+    toast.show("warning", "That isn't a valid nostr identifier")
+  }
+
+  const showVideo = async () => {
+    status = 'loading'
+
+    scanner = new QrScanner(video, onDecode, {
+      returnDetailedScanResult: true,
+    })
+
+    await scanner.start()
+
+    status = 'ready'
+  }
+
+  onDestroy(async () => {
+    if (scanner) {
+      await scanner.stop()
+      await scanner.destroy()
+    }
+  })
+</script>
+
+<Content>
+  <form class="flex gap-2" on:submit|preventDefault={() => handleInput(value)}>
+    <Input placeholder="nprofile..." bind:value={value} wrapperClass="flex-grow" />
+    <Anchor type="button" on:click={() => handleInput(value)}>
+      <i class="fa fa-arrow-right" />
+    </Anchor>
+    <Anchor type="button" on:click={showVideo}>
+      <i class="fa fa-camera" />
+    </Anchor>
+  </form>
+  <div class="text-center text-light">
+    Enter any nostr identifier (npub, nevent, nprofile, note or user@domain.tld), or click on the
+    camera icon to scan with your device's camera instead.
+  </div>
+  {#if status === 'loading'}
+  <Spinner>
+    Loading your camera...
+  </Spinner>
+  {/if}
+  <video bind:this={video} />
+</Content>
diff --git a/src/routes/Search.svelte b/src/routes/Search.svelte
index a8039e86..b762f044 100644
--- a/src/routes/Search.svelte
+++ b/src/routes/Search.svelte
@@ -1,22 +1,47 @@
 <script>
-  import {navigate} from 'svelte-routing'
-  import Content from 'src/partials/Content.svelte'
-  import Tabs from 'src/partials/Tabs.svelte'
-  import SearchPeople from 'src/views/search/SearchPeople.svelte'
-  import Scan from 'src/views/search/Scan.svelte'
+  import {fuzzy} from "src/util/misc"
+  import {personKinds} from "src/util/nostr"
+  import Input from "src/partials/Input.svelte"
+  import Spinner from "src/partials/Spinner.svelte"
+  import Content from "src/partials/Content.svelte"
+  import PersonInfo from 'src/views/person/PersonInfo.svelte'
+  import {getUserReadRelays} from 'src/agent/relays'
+  import database from 'src/agent/database'
+  import network from 'src/agent/network'
+  import user from 'src/agent/user'
 
-  export let activeTab
+  export let hideFollowing = false
 
-  const setActiveTab = tab => navigate(`/search/${tab}`)
+  let q
+  let search
+
+  const {petnamePubkeys} = user
+
+  database.watch('people', table => {
+    search = fuzzy(
+      table.all({'kind0.name:!nil': null}),
+      {keys: ["kind0.name", "kind0.about", "pubkey"]}
+    )
+  })
+
+  // Prime our database, in case we don't have any people stored yet
+  network.load({
+    relays: getUserReadRelays(),
+    filter: {kinds: personKinds, limit: 10},
+  })
 
   document.title = "Search"
 </script>
 
 <Content>
-  <Tabs tabs={['people', 'advanced']} {activeTab} {setActiveTab} />
-  {#if activeTab === 'people'}
-  <SearchPeople />
-  {:else if activeTab === 'advanced'}
-  <Scan />
-  {/if}
+  <Input bind:value={q} placeholder="Search for people">
+    <i slot="before" class="fa-solid fa-search" />
+  </Input>
+  {#each (search ? search(q) : []).slice(0, 50) as person (person.pubkey)}
+    {#if person.pubkey !== user.getPubkey() && !(hideFollowing && $petnamePubkeys.includes(person.pubkey))}
+    <PersonInfo {person} />
+    {/if}
+  {:else}
+  <Spinner />
+  {/each}
 </Content>
diff --git a/src/views/SideNav.svelte b/src/views/SideNav.svelte
index e254a628..4840f640 100644
--- a/src/views/SideNav.svelte
+++ b/src/views/SideNav.svelte
@@ -46,10 +46,15 @@
   </li>
   {/if}
   <li class="cursor-pointer">
-    <a class="block px-4 py-2 hover:bg-accent transition-all" href="/search/people">
+    <a class="block px-4 py-2 hover:bg-accent transition-all" href="/search">
       <i class="fa fa-search mr-2" /> Search
     </a>
   </li>
+  <li class="cursor-pointer">
+    <a class="block px-4 py-2 hover:bg-accent transition-all" href="/scan">
+      <i class="fa fa-qrcode mr-2" /> Scan
+    </a>
+  </li>
   <li class="cursor-pointer">
     <a class="block px-4 py-2 hover:bg-accent transition-all" href="/notes/follows">
       <i class="fa fa-rss mr-2" /> Feed
diff --git a/src/views/search/Scan.svelte b/src/views/search/Scan.svelte
deleted file mode 100644
index 78eec68a..00000000
--- a/src/views/search/Scan.svelte
+++ /dev/null
@@ -1,97 +0,0 @@
-<script lang="ts">
-  import QrScanner from 'qr-scanner'
-  import {onDestroy} from 'svelte'
-  import {navigate} from 'svelte-routing'
-  import {waitFor} from 'hurdak/lib/hurdak'
-  import {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 {toast} from "src/app/ui"
-
-  let mode = 'input', video, ready, value, scanner
-
-  const onDecode = result => {
-    handleInput(result.data)
-  }
-
-  const handleInput = async input => {
-    input = input.replace('nostr:', '')
-
-    if (find(s => input.startsWith(s), ["note1", "npub1", "nevent1", "nprofile1"])) {
-      navigate("/" + input)
-      return
-    }
-
-    if (input.match(/^[a-f0-9]{64}$/)) {
-      navigate("/" + nip19.npubEncode(input))
-      return
-    }
-
-    let profile = await nip05.queryProfile(input)
-    if (profile) {
-      navigate("/" + nip19.nprofileEncode(profile))
-      return
-    }
-
-    toast.show("warning", "That isn't a valid nostr identifier")
-    return
-  }
-
-  const setMode = async newMode => {
-    mode = newMode
-
-    if (newMode === 'scan') {
-      await waitFor(() => video)
-
-      scanner = new QrScanner(video, onDecode, {
-        returnDetailedScanResult: true,
-      })
-
-      await scanner.start()
-
-      ready = true
-    } else if (scanner) {
-      ready = false
-      await scanner.stop()
-      await scanner.destroy()
-    }
-  }
-
-  onDestroy(async () => {
-    if (scanner) {
-      await scanner.stop()
-      await scanner.destroy()
-    }
-  })
-</script>
-
-{#if mode === 'input'}
-<form class="flex gap-2" on:submit|preventDefault={() => handleInput(value)}>
-  <Input placeholder="nprofile..." bind:value={value} wrapperClass="flex-grow" />
-  <Anchor type="button" on:click={() => handleInput(value)}>
-    <i class="fa fa-arrow-right" />
-  </Anchor>
-  <Anchor type="button" on:click={() => setMode('scan')}>
-    <i class="fa fa-qrcode" />
-  </Anchor>
-</form>
-<div class="text-center text-light">
-  Enter any nostr identifier (npub, nevent, nprofile, note or user@domain.tld), or click on the
-  camera icon to scan with your device's camera instead.
-</div>
-{:else}
-  {#if !ready}
-  <Spinner>
-    Loading your camera...
-  </Spinner>
-  {/if}
-  <video bind:this={video} />
-  {#if ready}
-  <Anchor type="unstyled" class="flex gap-2 items-center" on:click={() => setMode('input')}>
-    <i class="fa fa-arrow-left" />
-    <span class="underline">Go back</span>
-  </Anchor>
-  {/if}
-{/if}
diff --git a/src/views/search/SearchPeople.svelte b/src/views/search/SearchPeople.svelte
deleted file mode 100644
index 1a0ec8c3..00000000
--- a/src/views/search/SearchPeople.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-<script>
-  import {fuzzy} from "src/util/misc"
-  import {personKinds} from "src/util/nostr"
-  import Input from "src/partials/Input.svelte"
-  import Spinner from "src/partials/Spinner.svelte"
-  import PersonInfo from 'src/views/person/PersonInfo.svelte'
-  import {getUserReadRelays} from 'src/agent/relays'
-  import database from 'src/agent/database'
-  import network from 'src/agent/network'
-  import user from 'src/agent/user'
-
-  export let hideFollowing = false
-
-  let q
-  let search
-
-  const {petnamePubkeys} = user
-
-  database.watch('people', table => {
-    search = fuzzy(
-      table.all({'kind0.name:!nil': null}),
-      {keys: ["kind0.name", "kind0.about", "pubkey"]}
-    )
-  })
-
-  // Prime our database, in case we don't have any people stored yet
-  network.load({
-    relays: getUserReadRelays(),
-    filter: {kinds: personKinds, limit: 10},
-  })
-</script>
-
-<Input bind:value={q} placeholder="Search for people">
-  <i slot="before" class="fa-solid fa-search" />
-</Input>
-
-{#each (search ? search(q) : []).slice(0, 50) as person (person.pubkey)}
-  {#if person.pubkey !== user.getPubkey() && !(hideFollowing && $petnamePubkeys.includes(person.pubkey))}
-  <PersonInfo {person} />
-  {/if}
-{:else}
-<Spinner />
-{/each}