Optimize handlers, update welshman

Author: Jon Staab

package.json

@@ -43,16 +43,16 @@
     "@tsconfig/svelte": "^5.0.4",
     "@types/throttle-debounce": "^5.0.2",
     "@vite-pwa/assets-generator": "^0.2.6",
-    "@welshman/app": "^0.6.1",
-    "@welshman/content": "^0.6.1",
-    "@welshman/editor": "^0.6.1",
-    "@welshman/feeds": "^0.6.1",
-    "@welshman/lib": "^0.6.1",
-    "@welshman/net": "^0.6.1",
-    "@welshman/router": "^0.6.1",
-    "@welshman/signer": "^0.6.1",
-    "@welshman/store": "^0.6.1",
-    "@welshman/util": "^0.6.1",
+    "@welshman/app": "^0.6.3",
+    "@welshman/content": "^0.6.3",
+    "@welshman/editor": "^0.6.3",
+    "@welshman/feeds": "^0.6.3",
+    "@welshman/lib": "^0.6.3",
+    "@welshman/net": "^0.6.3",
+    "@welshman/router": "^0.6.3",
+    "@welshman/signer": "^0.6.3",
+    "@welshman/store": "^0.6.3",
+    "@welshman/util": "^0.6.3",
     "autoprefixer": "^10.4.21",
     "bowser": "^2.11.0",
     "classnames": "^2.5.1",

pnpm-lock.yaml

@@ -4,14 +4,14 @@
   import FlexColumn from "src/partials/FlexColumn.svelte"
   import ImageCircle from "src/partials/ImageCircle.svelte"
   import PeopleAction from "src/app/shared/PeopleAction.svelte"
-  import {recommendationsByHandlerAddress} from "src/engine"
+  import {deriveRecommendations} from "src/engine"
   import {pluralize} from "src/util/misc"
 
   export let handler
 
   const address = getAddress(handler.event)
-  const recommendations = $recommendationsByHandlerAddress.get(address) || []
-  const pubkeys = uniq(pluck("pubkey", recommendations))
+  const recommendations = deriveRecommendations(address)
+  const pubkeys = uniq(pluck("pubkey", $recommendations))
   const actionText = `${pluralize(pubkeys.length, "recommends", "recommend")} this app`
 </script>
 
@@ -23,7 +23,7 @@
       <p class="text-tinted-200">{handler.about}</p>
     {/if}
     <slot />
-    {#if recommendations.length > 0}
+    {#if $recommendations.length > 0}
       <div class="text-tinted-200">
         <PeopleAction {pubkeys} {actionText} />
       </div>

src/app/shared/HandlerSummary.svelte

@@ -2,19 +2,19 @@
   import * as nip19 from "nostr-tools/nip19"
   import {tweened} from "svelte/motion"
   import {derived} from "svelte/store"
-  import {sum, pluck, spec, nthEq, remove, uniqBy, prop} from "@welshman/lib"
+  import {sum, pluck, spec, remove, uniqBy, prop} from "@welshman/lib"
   import {Router} from "@welshman/router"
   import type {TrustedEvent, Handler} from "@welshman/util"
   import {LOCAL_RELAY_URL} from "@welshman/net"
   import {
     isReplaceable,
     Address,
     toNostrURI,
+    getTag,
     getPubkeyTagValues,
     ZAP_RESPONSE,
     REACTION,
   } from "@welshman/util"
-  import {repository} from "@welshman/app"
   import {fly} from "src/util/transition"
   import {copyToClipboard} from "src/util/html"
   import {replyKinds} from "src/util/nostr"
@@ -28,7 +28,7 @@
   import HandlerCard from "src/app/shared/HandlerCard.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import {deriveValidZaps} from "src/app/util"
-  import {trackerStore, sortEventsDesc} from "src/engine"
+  import {trackerStore, sortEventsDesc, deriveHandlerEvent} from "src/engine"
   import {getHandlerKey, readHandlers, displayHandler} from "src/domain"
 
   export let event: TrustedEvent
@@ -43,8 +43,7 @@
   const likesCount = tweened(0, {interpolate})
   const zapsTotal = tweened(0, {interpolate})
   const repliesCount = tweened(0, {interpolate})
-  const handlerId = String(event.tags.find(nthEq(0, "client"))?.[2] || "")
-  const handlerEvent = handlerId ? repository.getEvent(handlerId) : null
+  const handlerEvent = deriveHandlerEvent(getTag("client", event.tags)?.[2] || "")
   const seenOn = derived(trackerStore, $t =>
     remove(LOCAL_RELAY_URL, Array.from($t.getRelays(event.id))),
   )
@@ -111,10 +110,10 @@
     {/each}
   </div>
 {/if}
-{#if handlers.length > 0 || handlerEvent}
+{#if handlers.length > 0 || $handlerEvent}
   <h1 class="staatliches text-2xl">Apps</h1>
-  {#if handlerEvent}
-    {@const [handler] = readHandlers(handlerEvent)}
+  {#if $handlerEvent}
+    {@const [handler] = readHandlers($handlerEvent)}
     {#if handler}
       <p>This note was published using {displayHandler(handler)}.</p>
       <HandlerCard {handler} />

src/app/shared/NoteInfo.svelte

@@ -58,9 +58,9 @@
       })
     }
 
-    if ($relay?.profile?.contact) {
+    if ($relay?.contact) {
       actions.push({
-        onClick: () => window.open(ensureMailto($relay.profile.contact)),
+        onClick: () => window.open(ensureMailto($relay.contact)),
         label: "Contact",
         icon: "envelope",
       })