Fix network load/request calls

src/app/components/NoteContentPoll.svelte

@@ -1,22 +1,20 @@
 <script lang="ts">
   import type {ComponentProps} from "svelte"
   import {onMount} from "svelte"
-  import {request} from "@welshman/net"
   import {POLL_RESPONSE} from "@welshman/util"
   import PollVotes from "@app/components/PollVotes.svelte"
   import Content from "@app/components/Content.svelte"
+  import {network} from "@app/core"
 
   const props: ComponentProps<typeof Content> = $props()
 
   onMount(() => {
-    if (!props.url) {
+    if (props.url) {
-      return
+      $network.request({
+        relays: [props.url],
+        filters: [{kinds: [POLL_RESPONSE], "#e": [props.event.id]}],
+      })
     }
-
-    request({
-      relays: [props.url],
-      filters: [{kinds: [POLL_RESPONSE], "#e": [props.event.id]}],
-    })
   })
 </script>
 

src/app/components/ReportItem.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import {formatTimestamp} from "@welshman/lib"
   import {getIdFilters, matchTag, tagSpec} from "@welshman/util"
-  import {load, LOCAL_RELAY_URL} from "@welshman/net"
+  import {LOCAL_RELAY_URL} from "@welshman/net"
   import type {TrustedEvent} from "@welshman/util"
   import Card from "@lib/components/Card.svelte"
   import Button from "@lib/components/Button.svelte"
@@ -10,6 +10,7 @@
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
   import NoteContent from "@app/components/NoteContent.svelte"
   import ReportMenu from "@app/components/ReportMenu.svelte"
+  import {network} from "@app/core"
   import {pushModal} from "@app/modal"
   import {goToEvent} from "@app/routes"
 
@@ -55,7 +56,7 @@
   {/if}
   <div class="card card-sm">
     {#if etag}
-      {#await load({relays: [url, LOCAL_RELAY_URL], filters: getIdFilters([etag[1]])})}
+      {#await $network.load({relays: [url, LOCAL_RELAY_URL], filters: getIdFilters([etag[1]])})}
         <p>Loading</p>
       {:then reportedEvents}
         {#if reportedEvents.length === 0}

src/app/components/RoomSearch.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import {onMount, tick} from "svelte"
   import {debounce} from "throttle-debounce"
-  import {load} from "@welshman/net"
   import {groupBy, uniqBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
   import type {TrustedEvent, Filter} from "@welshman/util"
   import {MESSAGE, sortEventsDesc, displayRelayUrl} from "@welshman/util"
@@ -19,6 +18,7 @@
   import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte"
   import {CONTENT_KINDS} from "@app/content"
   import {getEventsForUrl} from "@app/repository"
+  import {network} from "@app/core"
   import {popModal} from "@app/modal"
   import {goToEvent} from "@app/routes"
 
@@ -51,7 +51,7 @@
     results = sortEventsDesc(getEventsForUrl(url, [filter]))
 
     try {
-      const events = await load({
+      const events = await $network.load({
         relays: [url],
         signal: controller.signal,
         filters: [filter],

src/app/components/SpaceSearch.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import {onMount, tick} from "svelte"
   import {debounce} from "throttle-debounce"
-  import {load} from "@welshman/net"
   import {groupBy, uniqBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
   import type {TrustedEvent, Filter} from "@welshman/util"
   import {MESSAGE, sortEventsDesc, displayRelayUrl, tagValue, tagSpec} from "@welshman/util"
@@ -20,6 +19,7 @@
   import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte"
   import {CONTENT_KINDS} from "@app/content"
   import {getEventsForUrl} from "@app/repository"
+  import {network} from "@app/core"
   import {popModal} from "@app/modal"
   import {pushToast} from "@app/toast"
   import {goToEvent} from "@app/routes"
@@ -51,7 +51,7 @@
     results = sortEventsDesc(getEventsForUrl(url, [filter]))
 
     try {
-      const events = await load({
+      const events = await $network.load({
         relays: [url],
         signal: controller.signal,
         filters: [filter],

src/app/logger.ts

@@ -78,7 +78,7 @@ export const sendLogs = async () => {
   }
 
   const event = await writer(DirectMessage)
-    .setContent(lines.join("\n"))
+    .setContent("```" + lines.join("\n") + "```")
     .addRecipient(PLATFORM_LOGEE)
     .renderTemplate()
 

src/routes/[bech32]/+page.svelte

@@ -4,11 +4,12 @@
   import type {MakeNonOptional} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
   import {Address, getIdFilters} from "@welshman/util"
-  import {load, LOCAL_RELAY_URL} from "@welshman/net"
+  import {LOCAL_RELAY_URL} from "@welshman/net"
   import {page} from "$app/stores"
   import {goto} from "$app/navigation"
   import {decodePubkey} from "@lib/util"
   import Spinner from "@lib/components/Spinner.svelte"
+  import {network} from "@app/core"
   import {goToEvent, makeProfilePath} from "@app/routes"
 
   const {bech32} = $page.params as MakeNonOptional<typeof $page.params>
@@ -28,7 +29,7 @@
 
     let found = false
 
-    load({
+    $network.load({
       relays: [LOCAL_RELAY_URL, ...data.relays],
       filters: getIdFilters([type === "nevent" ? data.id : Address.fromNaddr(bech32).toString()]),
       onEvent: (event: TrustedEvent) => {

src/routes/spaces/[relay]/threads/[id]/+page.svelte

@@ -8,7 +8,6 @@
   import type {TrustedEvent} from "@welshman/util"
   import {deriveEventsAsc} from "@welshman/store"
   import {COMMENT, tagValue, tagSpec} from "@welshman/util"
-  import {request} from "@welshman/net"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import PageContent from "@lib/components/PageContent.svelte"
@@ -21,6 +20,7 @@
   import EventReply from "@app/components/EventReply.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import {deriveEvent, deriveEventsById} from "@app/repository"
+  import {network} from "@app/core"
   import {decodeRelay} from "@app/relays"
   import {makeSpacePath, scrollToEvent} from "@app/routes"
 
@@ -138,7 +138,7 @@
   onMount(() => {
     const controller = new AbortController()
 
-    request({relays: [url], filters, signal: controller.signal})
+    $network.request({relays: [url], filters, signal: controller.signal})
 
     return () => {
       controller.abort()