From e84691e459e7e192eef0b6f8fc9b8489bb9f528f Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Fri, 4 Aug 2023 14:30:33 -0700
Subject: [PATCH] Fix AUTH

---
 package.json                           |   2 +-
 src/app/App.svelte                     |   3 ++-
 src/app/shared/NoteContentQuote.svelte |   7 ++++--
 src/app/shared/PersonActions.svelte    |   6 +++++
 src/app/views/Notifications.svelte     |   4 +--
 src/engine/components/Alerts.ts        |   4 +--
 src/engine/components/Network.ts       |  33 +------------------------
 src/partials/OverflowMenu.svelte       |   4 +--
 yarn.lock                              | Bin 280749 -> 280749 bytes
 9 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index d1a18a02..5bd2dee2 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "marked": "^5.1.0",
     "nostr-tools": "^1.12.1",
     "npm-run-all": "^4.1.5",
-    "paravel": "^0.2.1",
+    "paravel": "^0.2.2",
     "qr-scanner": "^1.4.2",
     "qrcode": "^1.5.1",
     "ramda": "^0.28.0",
diff --git a/src/app/App.svelte b/src/app/App.svelte
index f9d801d0..860971cb 100644
--- a/src/app/App.svelte
+++ b/src/app/App.svelte
@@ -3,6 +3,7 @@
   import "@fortawesome/fontawesome-free/css/solid.css"
 
   import type {ComponentType, SvelteComponentTyped} from "svelte"
+  import {nip19} from "nostr-tools"
   import type {Relay} from "src/engine"
   import {onMount} from "svelte"
   import {Router, links} from "svelte-routing"
@@ -69,7 +70,7 @@
 
   const TypedRouter = Router as ComponentType<SvelteComponentTyped>
 
-  Object.assign(window, {...engine, user, bech32ToHex, hexToBech32})
+  Object.assign(window, {...engine, nip19, user, bech32ToHex, hexToBech32})
 
   export let pathname = location.pathname
   export let hash = location.hash
diff --git a/src/app/shared/NoteContentQuote.svelte b/src/app/shared/NoteContentQuote.svelte
index 2354f217..7678434a 100644
--- a/src/app/shared/NoteContentQuote.svelte
+++ b/src/app/shared/NoteContentQuote.svelte
@@ -8,7 +8,7 @@
   import Card from "src/partials/Card.svelte"
   import Spinner from "src/partials/Spinner.svelte"
   import PersonCircle from "src/app/shared/PersonCircle.svelte"
-  import {Directory, Nip65, user, Network} from "src/app/engine"
+  import {Directory, Settings, Nip65, user, Network} from "src/app/engine"
 
   export let note
   export let value
@@ -23,7 +23,10 @@
 
   const sub = Network.subscribe({
     timeout: 5000,
-    relays: Nip65.mergeHints(3, [relays, Nip65.getEventHints(3, note)]),
+    relays: Nip65.mergeHints(Settings.getSetting("relay_limit"), [
+      relays,
+      Nip65.getEventHints(3, note),
+    ]),
     filter: (id
       ? {ids: [id]}
       : filterVals(xs => xs.length > 0, {
diff --git a/src/app/shared/PersonActions.svelte b/src/app/shared/PersonActions.svelte
index 43ecbad0..dc3e4a92 100644
--- a/src/app/shared/PersonActions.svelte
+++ b/src/app/shared/PersonActions.svelte
@@ -39,6 +39,10 @@
       })
     }
 
+    if (!isSelf && false) {
+      actions.push({onClick: loginAsUser, label: "Login as", icon: "right-to-bracket"})
+    }
+
     if (Env.FORCE_RELAYS.length === 0) {
       actions.push({onClick: openProfileInfo, label: "Details", icon: "info"})
     }
@@ -52,6 +56,8 @@
     }
   }
 
+  const loginAsUser = () => Keys.login("pubkey", pubkey)
+
   const openProfileInfo = () => modal.push({type: "person/info", pubkey})
 
   const share = () => modal.push({type: "person/share", pubkey})
diff --git a/src/app/views/Notifications.svelte b/src/app/views/Notifications.svelte
index f368c009..6214c0d4 100644
--- a/src/app/views/Notifications.svelte
+++ b/src/app/views/Notifications.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {filter, slice, pluck, reverse, max, last, sortBy} from "ramda"
+  import {filter, propEq, slice, pluck, reverse, max, last, sortBy} from "ramda"
   import {onMount} from "svelte"
   import {doPipe, batch, seconds} from "hurdak"
   import {fly} from "src/util/transition"
@@ -33,7 +33,7 @@
     return reverse(
       sortBy(
         e => formatTimestampAsLocalISODate(e.created_at).slice(0, 13) + findReplyId(e),
-        user.applyMutes($events)
+        user.applyMutes($events.filter(propEq("recipient", Keys.pubkey.get())))
       )
     )
   })
diff --git a/src/engine/components/Alerts.ts b/src/engine/components/Alerts.ts
index 12e2200e..18097351 100644
--- a/src/engine/components/Alerts.ts
+++ b/src/engine/components/Alerts.ts
@@ -5,7 +5,7 @@ import type {Engine} from "src/engine/Engine"
 import type {Event} from "src/engine/types"
 
 export class Alerts {
-  events = collection<Event>("id")
+  events = collection<Event & {recipient: string}>("id")
   lastChecked = writable(0)
   latestNotification = this.events.derived(reduce((n, e) => Math.max(n, e.created_at), 0))
   hasNewNotfications = derived([this.lastChecked, this.latestNotification], ([c, n]) => n > c)
@@ -28,7 +28,7 @@ export class Alerts {
         return
       }
 
-      Alerts.events.key(e.id).set(e)
+      Alerts.events.key(e.id).set({...e, recipient: pubkey})
     }
 
     noteKinds.forEach(kind => {
diff --git a/src/engine/components/Network.ts b/src/engine/components/Network.ts
index 4cb3f899..566bda31 100644
--- a/src/engine/components/Network.ts
+++ b/src/engine/components/Network.ts
@@ -81,38 +81,7 @@ export class Network {
 
     const executor = new Executor(target)
 
-    executor.handleAuth({
-      onAuth: (url: string, challenge: string) => {
-        return this.authHandler?.(url, challenge)
-      },
-      onOk: (url: string, id: string, ok: boolean, message: string) => {
-        // Once we get a good auth response don't wait to send stuff to the relay
-        if (ok) {
-          this.pool.get(url)
-          this.pool.booted = true
-        }
-      },
-    })
-
-    // Eagerly connect and handle AUTH
-    executor.target.sockets.forEach((socket: any) => {
-      const {limitation} = this.engine.Nip65.getRelayInfo(socket.url)
-      const waitForBoot = limitation?.payment_required || limitation?.auth_required
-
-      // This happens automatically, but kick it off anyway
-      socket.connect()
-
-      // Delay REQ/EVENT until AUTH flow happens. Highly hacky, as this relies on
-      // overriding the `shouldDeferWork` property of the socket. We do it this way
-      // so that we're not blocking sending to all the other public relays
-      if (!bypassBoot && waitForBoot && socket.status === Socket.STATUS.PENDING) {
-        socket.shouldDeferWork = () => {
-          return socket.booted && socket.status !== Socket.STATUS.READY
-        }
-
-        setTimeout(() => Object.assign(socket, {booted: true}), 2000)
-      }
-    })
+    executor.handleAuth({onAuth: this.authHandler})
 
     return executor
   }
diff --git a/src/partials/OverflowMenu.svelte b/src/partials/OverflowMenu.svelte
index 9dbd0803..3244c127 100644
--- a/src/partials/OverflowMenu.svelte
+++ b/src/partials/OverflowMenu.svelte
@@ -26,8 +26,8 @@
         class="relative flex flex-col gap-2"
         on:click={() => instance.hide()}>
         <div
-          class="absolute top-0 right-0 bottom-0 w-32 rounded-3xl bg-gray-8"
-          style="filter: blur(15px) opacity(0.75)" />
+          class="absolute bottom-0 right-0 top-0 w-32 rounded-3xl bg-gray-8"
+          style="filter: blur(15px)" />
         {#each actions as { label, icon, onClick }}
           <div class="relative z-10 cursor-pointer text-gray-2" on:click={onClick}>
             <span class="absolute right-0 mr-12 mt-2 whitespace-nowrap">{label}</span>
diff --git a/yarn.lock b/yarn.lock
index ea9456bba1ea90d6557d6c854497c0443ea6bf99..6f5e66b0c6bce09e6d8235da59afe329cda40640 100644
GIT binary patch
delta 185
zcmV;q07n0<krAzt5rBjNgaWh!G9j1s4g?aHqoM&IlF$s7a3KR0E;253XL=(wFl1&o
zWH4kkW??ikG&D72WMpMEV>n@AVlyx>VKp`}G+{L|Ic8>)F)|fZF-tZ|dPa9+OnFC3
zHZwOzFGqA{GHX~(bx&|&HApsbXG=>{OEoe~Giql^NN+h%OF?5*G)GZ!IZ$FpV^4Q@
nS8H}=M|n|0PjgdtOIJ}!a8qbDRhMyJ0T_oiA_KQJA_R9PSfn~T

delta 180
zcmZ2GQE=@<!G;#b7N#xCMvBw(gPDycUErBspvWwyXQ)?_UZreqlx$&<m}Y5VY-VYe
zY-VU=X=GwxXli6`WNK+_U}%<@nw*+uWNA6s&`2~iq|hM5q#(D*H8~(BJ2Su|GSS;i
z+bp*rucFW=x!m8v*+0Y}&pXsFFU369IoLa?%GV?{JHWU+)GRF0s65fY#nL%6AT=r=
g#o068IknQ!r9837V|t(>lSI3j67zO5C6;nE0AesU`v3p{