From f2e710c842dc00144347b835be79643061dcb875 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Mon, 10 Apr 2023 09:01:51 -0500
Subject: [PATCH] Fix a few small bugs

---
 src/agent/relays.ts          |  8 ++++++--
 src/partials/MediaSet.svelte |  2 +-
 src/util/html.ts             |  3 ++-
 src/util/nostr.ts            |  2 +-
 src/views/notes/Note.svelte  | 20 ++++++++++++++++----
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/agent/relays.ts b/src/agent/relays.ts
index 6450dfa1..c48f6734 100644
--- a/src/agent/relays.ts
+++ b/src/agent/relays.ts
@@ -40,7 +40,7 @@ export const initializeRelayList = async () => {
     const url = import.meta.env.VITE_DUFFLEPUD_URL + "/relay"
     const json = await fetchJson(url)
 
-    await relays.bulkPatch(map(objOf("url"), json.relays.filter(isRelay)))
+    await relays.bulkPatch(json.relays.filter(isRelay).map(objOf("url")))
   } catch (e) {
     warn("Failed to fetch relays list", e)
   }
@@ -88,7 +88,11 @@ export const getAllPubkeyWriteRelays = pubkeys => getAllPubkeyRelays(pubkeys, "w
 
 // Current user
 
-export const getUserRelays = () => user.getRelays().map(assoc("score", 1))
+export const getUserRelays = () =>
+  user
+    .getRelays()
+    .filter(({url}) => isRelay(url))
+    .map(assoc("score", 1))
 
 export const getUserReadRelays = () =>
   getUserRelays()
diff --git a/src/partials/MediaSet.svelte b/src/partials/MediaSet.svelte
index 3d9857ec..e349d2bb 100644
--- a/src/partials/MediaSet.svelte
+++ b/src/partials/MediaSet.svelte
@@ -32,7 +32,7 @@
   <div in:slide class="relative">
     <Media link={annotated[0]} onClose={close} />
     {#if annotated.length > 1}
-      <p class="text-gray-500 py-4 text-center underline" on:click={openModal}>
+      <p class="text-gray-500 cursor-pointer py-4 text-center underline" on:click={openModal}>
         <i class="fa fa-plus" /> Show {annotated.length} link previews
       </p>
     {/if}
diff --git a/src/util/html.ts b/src/util/html.ts
index ae7b88da..32fb82d3 100644
--- a/src/util/html.ts
+++ b/src/util/html.ts
@@ -119,6 +119,7 @@ export const parseContent = content => {
   }
 
   for (; i < text.length; ) {
+    const prev = last(result)
     const tail = text.slice(i)
 
     const newLine = tail.match(/^\n+/)
@@ -162,7 +163,7 @@ export const parseContent = content => {
     )
 
     // Skip url if it's just the end of a filepath
-    if (urlMatch && !last(result)?.value.endsWith("/")) {
+    if (urlMatch && (prev?.type !== "text" || !prev.value.endsWith("/"))) {
       let url = urlMatch[0]
 
       // Skip ellipses and very short non-urls
diff --git a/src/util/nostr.ts b/src/util/nostr.ts
index 7496b2da..92580c7e 100644
--- a/src/util/nostr.ts
+++ b/src/util/nostr.ts
@@ -114,7 +114,7 @@ export const isNotification = (e, pubkey) => {
 export const isRelay = url =>
   typeof url === "string" &&
   // It should have the protocol included
-  url.match(/^wss?:\/\/.+/)
+  url.match(/^wss:\/\/.+/)
 
 export const isShareableRelay = url =>
   isRelay(url) &&
diff --git a/src/views/notes/Note.svelte b/src/views/notes/Note.svelte
index 88a96041..5630cc3c 100644
--- a/src/views/notes/Note.svelte
+++ b/src/views/notes/Note.svelte
@@ -1,7 +1,19 @@
 <script lang="ts">
   import cx from "classnames"
   import {nip19} from "nostr-tools"
-  import {find, sum, last, whereEq, without, uniq, pluck, reject, propEq} from "ramda"
+  import {
+    sortBy,
+    identity,
+    find,
+    sum,
+    last,
+    whereEq,
+    without,
+    uniq,
+    pluck,
+    reject,
+    propEq,
+  } from "ramda"
   import {onMount} from "svelte"
   import {tweened} from "svelte/motion"
   import {slide} from "svelte/transition"
@@ -477,7 +489,7 @@
                 <div
                   style="transform: scale(-1, 1)"
                   class="absolute top-0 right-0 m-3 grid grid-cols-3 gap-2 sm:hidden">
-                  {#each note.seen_on as url, i}
+                  {#each sortBy(identity, note.seen_on) as url, i}
                     <div class={`cursor-pointer order-${3 - (i % 3)}`}>
                       <div
                         class="h-3 w-3 rounded-full border border-solid border-gray-6"
@@ -488,10 +500,10 @@
                 </div>
                 <!-- Desktop version -->
                 <div
-                  class={cx("hidden sm:flex transition-opacity", {
+                  class={cx("hidden transition-opacity sm:flex", {
                     "opacity-0 group-hover:opacity-100": !showEntire,
                   })}>
-                  {#each note.seen_on as url, i}
+                  {#each sortBy(identity, note.seen_on) as url, i}
                     <Popover triggerType="mouseenter" interactive={false}>
                       <div slot="trigger" class="cursor-pointer p-1">
                         <div