From 72de2e151314a1fba320dfbb662b4bf7d0e5ca65 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Thu, 24 Oct 2024 09:21:34 -0700
Subject: [PATCH] Link back to thread from chat

---
 src/app/components/ContentQuote.svelte              | 12 ++++++++++--
 src/routes/spaces/[relay]/[[room]]/+page.svelte     |  2 +-
 src/routes/spaces/[relay]/threads/[id]/+page.svelte |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte
index 82e67ab6..3c9a8b30 100644
--- a/src/app/components/ContentQuote.svelte
+++ b/src/app/components/ContentQuote.svelte
@@ -1,10 +1,13 @@
 <script lang="ts">
   import {nip19} from "nostr-tools"
+  import {nthEq} from "@welshman/lib"
   import {Address} from "@welshman/util"
+  import {trackerStore} from "@welshman/app"
   import Link from "@lib/components/Link.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import NoteCard from "@app/components/NoteCard.svelte"
-  import {deriveEvent, entityLink} from "@app/state"
+  import {deriveEvent, entityLink, userMembership, getMembershipUrls, REPLY} from "@app/state"
+  import {makeThreadPath} from "@app/routes"
 
   export let value
   export let depth = 0
@@ -14,9 +17,14 @@
   const idOrAddress = id || addr.toString()
   const event = deriveEvent(idOrAddress, relays)
   const entity = id ? nip19.neventEncode({id, relays}) : addr.toNaddr()
+
+  // If we found this event on a relay that the user is a member of, redirect internally
+  $: url = getMembershipUrls($userMembership).find(url => $trackerStore.hasRelay($event.id, url))
+  $: root = $event?.kind === REPLY ? $event.tags.find(nthEq(0, 'E'))?.[1] : $event?.id
+  $: href = url && root ? makeThreadPath(url, root) : entityLink(entity)
 </script>
 
-<Link external href={entityLink(entity)} class="my-2 block max-w-full text-left">
+<Link external={!url} {href} class="my-2 block max-w-full text-left">
   {#if $event}
     <NoteCard event={$event} class="bg-alt rounded-box p-4">
       <slot name="note-content" event={$event} {depth} />
diff --git a/src/routes/spaces/[relay]/[[room]]/+page.svelte b/src/routes/spaces/[relay]/[[room]]/+page.svelte
index 01d02d71..c7c0b796 100644
--- a/src/routes/spaces/[relay]/[[room]]/+page.svelte
+++ b/src/routes/spaces/[relay]/[[room]]/+page.svelte
@@ -120,7 +120,7 @@
           </Button>
         {/if}
       {/if}
-      <Button on:click={openMenu} class="btn btn-neutral btn-sm">
+      <Button on:click={openMenu} class="btn btn-neutral btn-sm md:hidden">
         <Icon icon="menu-dots" />
       </Button>
     </div>
diff --git a/src/routes/spaces/[relay]/threads/[id]/+page.svelte b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
index b312716a..2acbba2b 100644
--- a/src/routes/spaces/[relay]/threads/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
@@ -58,7 +58,7 @@
   </NoteCard>
   <Button class="mb-2 mt-5 flex items-center gap-2" on:click={back}>
     <Icon icon="alt-arrow-left" />
-    Back to threads
+    Go back
   </Button>
 </div>
 {#if showReply}