coracle-social · staab · Nov 12, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 8, 2024
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,13 +51,13 @@
     "@types/ramda": "^0.30.2",
     "@types/throttle-debounce": "^5.0.2",
     "@vite-pwa/assets-generator": "^0.2.6",
-    "@welshman/app": "~0.0.23",
+    "@welshman/app": "~0.0.24",
     "@welshman/content": "~0.0.12",
     "@welshman/dvm": "~0.0.10",
-    "@welshman/feeds": "~0.0.23",
+    "@welshman/feeds": "~0.0.25",
     "@welshman/lib": "~0.0.24",
-    "@welshman/net": "~0.0.33",
-    "@welshman/signer": "~0.0.11",
+    "@welshman/net": "~0.0.34",
+    "@welshman/signer": "~0.0.12",
     "@welshman/store": "~0.0.12",
     "@welshman/util": "~0.0.45",
     "autoprefixer": "^10.4.20",

diff --git a/src/app/App.svelte b/src/app/App.svelte
@@ -7,13 +7,7 @@
   import {ctx, ago, max, sleep, memoize} from "@welshman/lib"
   import * as lib from "@welshman/lib"
   import * as util from "@welshman/util"
-  import {
-    relaysByUrl,
-    getRelayQuality,
-    getPubkeyRelays,
-    trackRelayStats,
-    loadRelay,
-  } from "@welshman/app"
+  import {getRelayQuality, getPubkeyRelays, trackRelayStats, loadRelay} from "@welshman/app"
   import * as app from "@welshman/app"
   import logger from "src/util/logger"
   import * as misc from "src/util/misc"
@@ -447,20 +441,16 @@
       slowConnections.set(getPubkeyRelays($pubkey).filter(url => getRelayQuality(url) < 0.5))
 
       // Prune connections we haven't used in a while
-      for (const url of ctx.net.pool.data.keys()) {
-        const relay = relaysByUrl.get().get(url)
-
-        if (relay?.stats) {
-          const lastActivity = max([
-            relay.stats.last_open,
-            relay.stats.last_publish,
-            relay.stats.last_request,
-            relay.stats.last_event,
-          ])
-
-          if (lastActivity < ago(30)) {
-            ctx.net.pool.remove(url)
-          }
+      for (const connection of ctx.net.pool.data.values()) {
+        const lastActivity = max([
+          connection.stats.lastOpen,
+          connection.stats.lastPublish,
+          connection.stats.lastRequest,
+          connection.stats.lastEvent,
+        ])
+
+        if (lastActivity && lastActivity < ago(30)) {
+          ctx.net.pool.remove(connection.url)
         }
       }
     }, 5_000)

diff --git a/src/app/editor/EditBolt11.svelte b/src/app/editor/EditBolt11.svelte
@@ -14,7 +14,7 @@
 
 <NodeViewWrapper class="inline">
   <Anchor on:click={copy} class={cx("link-content", {"link-content-selected": selected})}>
-    <i class="fas fa-bolt inline-block translate-y-px"></i>
+    <i class="fas fa-xs fa-bolt inline-block translate-y-px"></i>
     {node.attrs.lnbc.slice(0, 16)}...
   </Anchor>
 </NodeViewWrapper>
diff --git a/src/app/editor/EditLink.svelte b/src/app/editor/EditLink.svelte
@@ -2,7 +2,7 @@
   import cx from "classnames"
   import type {NodeViewProps} from "@tiptap/core"
   import {NodeViewWrapper} from "svelte-tiptap"
-  import {displayUrl} from "@welshman/lib"
+  import {displayUrl, normalizeUrl} from "@welshman/lib"
 
   export let node: NodeViewProps["node"]
   export let selected: NodeViewProps["selected"]
@@ -12,9 +12,9 @@
   <a
     target="_blank"
     rel="noopener noreferrer"
-    href={node.attrs.url}
+    href={normalizeUrl(node.attrs.url)}
     class={cx("link-content", {"link-content-selected": selected})}>
-    <i class="fas fa-link inline-block"></i>
+    <i class="fas fa-xs fa-link inline-block"></i>
     {displayUrl(node.attrs.url)}
   </a>
 </NodeViewWrapper>
diff --git a/src/app/editor/EditMedia.svelte b/src/app/editor/EditMedia.svelte
@@ -31,7 +31,7 @@
     "link-content-selected": selected,
   })}>
   <span class:loading={node.attrs.uploading}>
-    <i class="fas fa-paperclip"></i>
+    <i class="fas fa-xs fa-paperclip"></i>
     {node.attrs.file?.name || node.attrs.src}
   </span>
 </NodeViewWrapper>
diff --git a/src/app/shared/FeedFormSectionKinds.svelte b/src/app/shared/FeedFormSectionKinds.svelte
@@ -19,8 +19,6 @@
     EVENT_RSVP,
     HANDLER_RECOMMENDATION,
     HANDLER_INFORMATION,
-    COMMUNITY,
-    GROUP,
     FILE_METADATA,
     RELAYS,
   } from "@welshman/util"
@@ -57,8 +55,6 @@
     {label: "Calendar event RSVP", kind: EVENT_RSVP},
     {label: "Handler recommendation", kind: HANDLER_RECOMMENDATION},
     {label: "Handler information", kind: HANDLER_INFORMATION},
-    {label: "Community definition", kind: COMMUNITY},
-    {label: "Group definition", kind: GROUP},
     {label: "Image", kind: FILE_METADATA},
     {label: "Relay selections", kind: RELAYS},
   ])

diff --git a/src/app/shared/RelayStatus.svelte b/src/app/shared/RelayStatus.svelte
@@ -2,6 +2,7 @@
   import {onMount} from "svelte"
   import {ctx} from "@welshman/lib"
   import {SocketStatus, AuthStatus} from "@welshman/net"
+  import {getRelayQuality} from "@welshman/app"
   import Popover from "src/partials/Popover.svelte"
 
   export let url
@@ -35,6 +36,9 @@
       } else if (cxn.socket.status === SocketStatus.New) {
         className = "bg-neutral-600"
         description = "Not connected"
+      } else if (getRelayQuality(cxn.url) < 0.5) {
+        className = "bg-warning"
+        description = "Unstable connection"
       } else {
         className = "bg-success"
         description = "Connected"

diff --git a/src/app/state.ts b/src/app/state.ts
@@ -1,6 +1,6 @@
-import {writable} from "svelte/store"
+import {writable, get} from "svelte/store"
 import {uniq} from "@welshman/lib"
-import {COMMUNITIES, FEEDS, APP_DATA} from "@welshman/util"
+import {FEEDS, APP_DATA, getAddressTagValues, getIdFilters, getListTags} from "@welshman/util"
 import {
   pubkey,
   loadZapper,
@@ -26,6 +26,7 @@ import {
   loadNotifications,
   loadFeedsAndLists,
   listenForNotifications,
+  userFeedFavorites,
   getSetting,
 } from "src/engine"
 
@@ -65,16 +66,22 @@ export const loadUserData = async (hints: string[] = []) => {
   // Load less important user data
   loadZapper($pubkey)
   loadHandle($pubkey)
+
+  // Load user feed selections, app data, and feeds that were favorited by the user
   load({
     relays,
     filters: [
-      {authors: [$pubkey], kinds: [COMMUNITIES, FEEDS]},
+      {authors: [$pubkey], kinds: [FEEDS]},
       {
         authors: [$pubkey],
         kinds: [APP_DATA],
         "#d": Object.values(appDataKeys),
       },
     ],
+  }).then(() => {
+    const addrs = getAddressTagValues(getListTags(get(userFeedFavorites)))
+
+    load({filters: getIdFilters(addrs)})
   })
 
   // Load enough to figure out web of trust

diff --git a/src/app/views/FeedList.svelte b/src/app/views/FeedList.svelte
@@ -24,7 +24,6 @@
     userFeeds,
     feedSearch,
     userListFeeds,
-    feedFavorites,
     userFavoritedFeeds,
     userFollows,
     addSinceToFilter,
@@ -59,8 +58,6 @@
     sortBy(displayFeed, [...$userFeeds, ...$userListFeeds, ...$userFavoritedFeeds]),
   )
 
-  loadFeeds($feedFavorites.flatMap(s => getAddressTagValues(s.event.tags)))
-
   load({
     skipCache: true,
     forcePlatform: false,

diff --git a/src/app/views/Help.svelte b/src/app/views/Help.svelte
@@ -6,7 +6,7 @@
 
   export let topic
 
-  const topics = ["web-of-trust", "nip-17-dms"]
+  const topics = ["web-of-trust", "nip-17-dms", "remote-signers"]
   const nip17Url = "https://github.com/nostr-protocol/nips/blob/master/17.md"
 </script>
 
@@ -27,6 +27,24 @@
       You can set a minimum web of trust score on your content settings page, which will
       automatically mute anyone with a lower score than your threshold.
     </p>
+  {:else if topic === "remote-signers"}
+    <p>
+      Nostr uses cryptographic key pairs instead of passwords to authenticate users. This means that
+      you and nobody else controls your social identity - however it also requires some care to
+      avoid losing your keys, or having them stolen.
+    </p>
+    <p>
+      Instead of pasting your private key (also known as an "nsec") into every nostr app you use,
+      it's wise to choose a single signer application to keep them for you.
+    </p>
+    <p>
+      These signer apps may live on the internet, in which case you can simply log in by specifying
+      the signer's url. You can also run your own signer on your phone or computer. This method is
+      more secure, but a little more complicated to manage.
+    </p>
+    <Anchor external button tall low href="https://nostrapps.com/#Signers">
+      <i class="fa fa-compass" /> Browse Signer Apps
+    </Anchor>
   {:else if topic === "nip-17-dms"}
     <p>
       <Anchor underline external href={nip17Url}>NIP 17</Anchor> improves upon the old NIP 04 direct