From 6250a5d7017f3a9cb8108c3b65104cad55e451bf Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 26 Feb 2024 12:41:30 -0800
Subject: [PATCH] Bump paravel to fix slow loading from local relay

---
 package.json                     |   2 +-
 src/app/shared/Feed.svelte       |   5 +----
 src/app/views/GroupDetail.svelte |   1 -
 src/engine/network/utils/feed.ts |  15 +++++----------
 yarn.lock                        | Bin 285192 -> 285192 bytes
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index dd4dc15d..81350a33 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "normalize-url": "^8.0.0",
     "nostr-tools": "^2.1.5",
     "npm-run-all": "^4.1.5",
-    "paravel": "^0.4.20",
+    "paravel": "^0.4.21",
     "qr-scanner": "^1.4.2",
     "qrcode": "^1.5.3",
     "ramda": "^0.29.1",
diff --git a/src/app/shared/Feed.svelte b/src/app/shared/Feed.svelte
index 17209c19..f4e87a0a 100644
--- a/src/app/shared/Feed.svelte
+++ b/src/app/shared/Feed.svelte
@@ -7,7 +7,6 @@
   import {fly} from "src/util/transition"
   import {getModal} from "src/partials/state"
   import Spinner from "src/partials/Spinner.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
   import FeedControls from "src/app/shared/FeedControls.svelte"
   import Note from "src/app/shared/Note.svelte"
   import type {DynamicFilter} from "src/engine"
@@ -25,7 +24,6 @@
   export let anchor = null
   export let shouldDisplay = null
   export let shouldListen = false
-  export let shouldDefer = true
   export let hideControls = false
   export let hideSpinner = false
   export let showGroup = false
@@ -60,7 +58,6 @@
       filters: compileFilters([filter], {includeReposts: true}),
       relays: getRelays(),
       anchor,
-      shouldDefer,
       shouldListen,
       shouldLoadParents: true,
       shouldHideReplies: $hideReplies,
@@ -86,7 +83,7 @@
   })
 
   onMount(() => {
-    const scroller = createScroller(loadMore, {element: getModal(), delay: 300})
+    const scroller = createScroller(loadMore, {element: getModal()})
 
     return () => {
       feed?.stop()
diff --git a/src/app/views/GroupDetail.svelte b/src/app/views/GroupDetail.svelte
index e7ac44b6..00eba0cc 100644
--- a/src/app/views/GroupDetail.svelte
+++ b/src/app/views/GroupDetail.svelte
@@ -146,7 +146,6 @@
   <Feed
     shouldListen
     hideControls
-    shouldDefer={!address.startsWith("35834:")}
     filter={{kinds: without([30402], noteKinds), "#a": [address]}}
     relays={address.startsWith("35834:") ? [LOCAL_RELAY_URL] : relays} />
 {:else if activeTab === "calendar"}
diff --git a/src/engine/network/utils/feed.ts b/src/engine/network/utils/feed.ts
index a64bd163..c3754e6f 100644
--- a/src/engine/network/utils/feed.ts
+++ b/src/engine/network/utils/feed.ts
@@ -1,10 +1,9 @@
-import {partition, equals, prop, uniqBy, identity, without, assoc} from "ramda"
+import {partition, prop, uniqBy, identity, without, assoc} from "ramda"
 import {ensurePlural, doPipe, batch} from "hurdak"
 import {now} from "paravel"
 import {race} from "src/util/misc"
 import {info} from "src/util/logger"
 import {
-  LOCAL_RELAY_URL,
   getIdOrAddress,
   getIdAndAddress,
   noteKinds,
@@ -94,14 +93,10 @@ export class FeedLoader {
 
     // Wait until a good number of subscriptions have completed to reduce the chance of
     // out of order notes
-    if (equals([LOCAL_RELAY_URL], opts.relays)) {
-      this.ready = Promise.resolve()
-    } else {
-      this.ready = race(
-        0.4,
-        remoteSubs.map(s => new Promise(r => s.on("close", r))),
-      )
-    }
+    this.ready = race(
+      0.4,
+      remoteSubs.map(s => new Promise(r => s.on("close", r))),
+    )
   }
 
   discardEvents(events) {
diff --git a/yarn.lock b/yarn.lock
index 045a8e78c141de3c8107d564d60ec9fc48a0f969..8a1bcc8008c4f291bcabcc4fbe367c82234f574d 100644
GIT binary patch
delta 194
zcmV;z06qVRv=NB35rBjNgaWh!Z7>lrItm~lc4cyNX>V>IA}}sAmqFkHBA1{r10yXl
zE_7#lBW7keW@IunIAk|BI5#&nH)b+4W-~cqI5J~mVKgx}FfwB{HZx^rlkw*kRcKgD
zVQhFbX*FU`b3#>gLr^qXS!^_EWi)YFY(_$QLP0c2ZcSM*D|SscPf12^QdCDrYc)`5
wW^ztYSx+=MbZ1aPFiBE4Lp5h`OHX-2FF{RGaYUEF^8*@(buk0Cbuk2!C^maO2mk;8

delta 195
zcmeC!BG|D-u%U&qg=q_Ou7R+D6_<iSS!z*nW`3T6l7XIyp3!8*4+_&47%(gA8R(Uy
zS1FsPq@|=8r=+G?q#9dTniv@;8JQ-hrdS%KSsJG#B_^9D8Jj1j8kkL1lokywG0x7_
z4sy>oOi3(s@iER!b_%ozN)ONu^$*T8$c_jztPFDW&3B0~4Xm)JEDZ}bNi_({2ud+_
vEpqhq%W?AvH8n0b(GT)YjtUOV^))OkN;3{jom|K*(OzuGyuH|vWvT`M9)CQ?