chore: redesign threads as a linear phpBB-style forum view

src/app/components/ThreadPagination.svelte

@@ -0,0 +1,65 @@
+<script lang="ts">
+  import cx from "classnames"
+  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
+  import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"
+  import DoubleAltArrowLeft from "@assets/icons/double-alt-arrow-left.svg?dataurl"
+  import DoubleAltArrowRight from "@assets/icons/double-alt-arrow-right.svg?dataurl"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+
+  type Props = {
+    page: number
+    pageCount: number
+    onPage: (page: number) => void
+  }
+
+  const {page, pageCount, onPage}: Props = $props()
+
+  const goFirst = () => onPage(1)
+  const goPrev = () => onPage(page - 1)
+  const goNext = () => onPage(page + 1)
+  const goLast = () => onPage(pageCount)
+
+  const pages = $derived.by(() => {
+    if (pageCount <= 7) {
+      return Array.from({length: pageCount}, (_, i) => i + 1)
+    }
+
+    const result = new Set<number>([1, pageCount, page])
+
+    if (page > 2) result.add(page - 1)
+    if (page < pageCount - 1) result.add(page + 1)
+    if (page > 3) result.add(page - 2)
+    if (page < pageCount - 2) result.add(page + 2)
+
+    return Array.from(result).sort((a, b) => a - b)
+  })
+</script>
+
+<div class="flex flex-col items-center gap-3 border-t border-base-content/10 py-4">
+  <p class="text-sm opacity-75">Page {page} of {pageCount}</p>
+  <div class="join">
+    <Button class="btn join-item btn-sm" disabled={page <= 1} onclick={goFirst}>
+      <Icon icon={DoubleAltArrowLeft} size={4} />
+    </Button>
+    <Button class="btn join-item btn-sm" disabled={page <= 1} onclick={goPrev}>
+      <Icon icon={AltArrowLeft} size={4} />
+    </Button>
+    {#each pages as p, i (p)}
+      {#if i > 0 && p - pages[i - 1] > 1}
+        <Button class="btn join-item btn-sm btn-disabled" disabled>…</Button>
+      {/if}
+      <Button
+        class={cx("btn join-item btn-sm", page === p && "btn-primary")}
+        onclick={() => onPage(p)}>
+        {p}
+      </Button>
+    {/each}
+    <Button class="btn join-item btn-sm" disabled={page >= pageCount} onclick={goNext}>
+      <Icon icon={AltArrowRight} size={4} />
+    </Button>
+    <Button class="btn join-item btn-sm" disabled={page >= pageCount} onclick={goLast}>
+      <Icon icon={DoubleAltArrowRight} size={4} />
+    </Button>
+  </div>
+</div>

src/app/components/ThreadPost.svelte

@@ -0,0 +1,131 @@
+<script lang="ts">
+  import {page} from "$app/stores"
+  import {formatTimestamp, removeUndefined} from "@welshman/lib"
+  import type {TrustedEvent, EventContent} from "@welshman/util"
+  import {COMMENT, getTagValue} from "@welshman/util"
+  import {deriveHandleForPubkey, deriveProfileDisplay, displayHandle} from "@welshman/app"
+  import Reply from "@assets/icons/reply-2.svg?dataurl"
+  import SquareArrowRightUp from "@assets/icons/square-arrow-right-up.svg?dataurl"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import Link from "@lib/components/Link.svelte"
+  import ProfileCircle from "@app/components/ProfileCircle.svelte"
+  import ProfileDetail from "@app/components/ProfileDetail.svelte"
+  import NoteContent from "@app/components/NoteContent.svelte"
+  import Content from "@app/components/Content.svelte"
+  import ReactionSummary from "@app/components/ReactionSummary.svelte"
+  import ThunkStatusOrDeleted from "@app/components/ThunkStatusOrDeleted.svelte"
+  import EventActions from "@app/components/EventActions.svelte"
+  import RoomName from "@app/components/RoomName.svelte"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
+  import {makeSpacePath} from "@app/routes"
+  import {pushModal} from "@app/modal"
+  import {clip} from "@app/toast"
+
+  type Props = {
+    url: string
+    event: TrustedEvent
+    number: number
+    threadPubkey: string
+    showRoom?: boolean
+    onReply: () => void
+  }
+
+  const {url, event, number, threadPubkey, showRoom, onReply}: Props = $props()
+
+  const relays = removeUndefined([url])
+  const profileDisplay = deriveProfileDisplay(event.pubkey, relays)
+  const handle = deriveHandleForPubkey(event.pubkey)
+  const isOp = event.pubkey === threadPubkey
+  const h = getTagValue("h", event.tags)
+  const shouldProtect = canEnforceNip70(url)
+  const noun = event.kind === COMMENT ? "Comment" : "Thread"
+
+  const openProfile = () => pushModal(ProfileDetail, {pubkey: event.pubkey, url})
+
+  const copyPermalink = () => {
+    const path = makeSpacePath(url, "threads", $page.params.id!)
+    const link = `${window.location.origin}${path}#post-${number}`
+
+    clip(link)
+  }
+
+  const deleteReaction = async (event: TrustedEvent) =>
+    publishDelete({relays: [url], event, protect: await shouldProtect})
+
+  const createReaction = async (template: EventContent) =>
+    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
+</script>
+
+<article
+  id="post-{number}"
+  data-event={event.id}
+  class="border-b border-base-content/10 bg-base-100">
+  <div class="flex flex-col gap-3 p-4 md:flex-row md:gap-6">
+    <div
+      class="flex shrink-0 flex-row items-center gap-3 md:w-36 md:flex-col md:items-center md:text-center">
+      <Button onclick={openProfile}>
+        <ProfileCircle pubkey={event.pubkey} {url} size={12} class="md:size-16" />
+      </Button>
+      <div class="flex min-w-0 flex-col gap-1 md:items-center">
+        <Button onclick={openProfile} class="text-bold ellipsize text-sm md:text-base">
+          {$profileDisplay}
+        </Button>
+        {#if $handle}
+          <span class="ellipsize text-xs opacity-75">{displayHandle($handle)}</span>
+        {/if}
+        {#if isOp}
+          <span class="badge badge-primary badge-sm">OP</span>
+        {/if}
+        {#if showRoom && h}
+          <Link
+            href={makeSpacePath(url, h)}
+            class="btn btn-neutral btn-xs mt-1 hidden rounded-full md:inline-flex">
+            #<RoomName {url} {h} />
+          </Link>
+        {/if}
+      </div>
+    </div>
+    <div class="flex min-w-0 grow flex-col gap-3">
+      <div class="flex flex-wrap items-center justify-between gap-2 text-sm">
+        <span class="opacity-75">{formatTimestamp(event.created_at)}</span>
+        <Button class="btn btn-ghost btn-xs gap-1" onclick={copyPermalink}>
+          #{number}
+          <Icon icon={SquareArrowRightUp} size={3} />
+        </Button>
+      </div>
+      {#if showRoom && h}
+        <Link
+          href={makeSpacePath(url, h)}
+          class="btn btn-neutral btn-xs w-fit rounded-full md:hidden">
+          Posted in #<RoomName {url} {h} />
+        </Link>
+      {/if}
+      <div class="min-w-0">
+        {#if event.kind === COMMENT}
+          <Content showEntire {event} {url} />
+        {:else}
+          <NoteContent showEntire {event} {url} />
+        {/if}
+      </div>
+      <div class="flex flex-wrap items-center justify-between gap-2">
+        <Button class="btn btn-neutral btn-xs gap-1" onclick={onReply}>
+          <Icon icon={Reply} size={4} />
+          Reply
+        </Button>
+        <div class="flex flex-wrap items-center justify-end gap-2">
+          <ReactionSummary
+            {url}
+            {event}
+            {deleteReaction}
+            {createReaction}
+            reactionClass="tooltip-left" />
+          <ThunkStatusOrDeleted {event} />
+          <EventActions {url} {event} {noun} />
+        </div>
+      </div>
+    </div>
+  </div>
+</article>

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

@@ -16,7 +16,9 @@
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import ThreadItem from "@app/components/ThreadItem.svelte"
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
+  import RoomName from "@app/components/RoomName.svelte"
   import {decodeRelay} from "@app/relays"
+  import {roomsByUrl} from "@app/groups"
   import {makeCommentFilter} from "@app/content"
   import {makeFeed} from "@app/feeds"
   import {pushModal} from "@app/modal"
@@ -44,6 +46,32 @@
     return sortBy(e => -max([...(scores.get(e.id) || []), e.created_at]), goals)
   })
 
+  const boards = $derived.by(() => {
+    const byRoom = new Map<string, TrustedEvent[]>()
+
+    for (const event of items) {
+      const h = getTagValue("h", event.tags) || ""
+      const roomEvents = byRoom.get(h) || []
+
+      roomEvents.push(event)
+      byRoom.set(h, roomEvents)
+    }
+
+    const roomOrder = new Map(($roomsByUrl.get(url) || []).map((room, index) => [room.h, index]))
+
+    return Array.from(byRoom.entries()).sort(([a], [b]) => {
+      if (!a) return 1
+      if (!b) return -1
+
+      const aOrder = roomOrder.get(a) ?? Number.MAX_SAFE_INTEGER
+      const bOrder = roomOrder.get(b) ?? Number.MAX_SAFE_INTEGER
+
+      if (aOrder !== bOrder) return aOrder - bOrder
+
+      return a.localeCompare(b)
+    })
+  })
+
   onMount(() => {
     const feed = makeFeed({
       url,
@@ -77,11 +105,22 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element class="flex flex-col gap-2 p-2">
+<PageContent bind:element class="flex flex-col gap-4 p-2">
-  {#each items as event (event.id)}
+  {#each boards as [h, threads] (h || "general")}
-    <div in:fly>
+    <section class="flex flex-col gap-2">
-      <ThreadItem {url} event={$state.snapshot(event)} />
+      <h2 class="text-sm font-bold uppercase tracking-wide opacity-60">
-    </div>
+        {#if h}
+          #<RoomName {url} {h} />
+        {:else}
+          General
+        {/if}
+      </h2>
+      {#each threads as event (event.id)}
+        <div in:fly>
+          <ThreadItem {url} event={$state.snapshot(event)} />
+        </div>
+      {/each}
+    </section>
   {/each}
   <p class="flex h-10 items-center justify-center py-20">
     <Spinner {loading}>

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

@@ -1,26 +1,30 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {page} from "$app/stores"
+  import {goto} from "$app/navigation"
   import {sleep} from "@welshman/lib"
   import type {MakeNonOptional} from "@welshman/lib"
+  import type {TrustedEvent} from "@welshman/util"
   import {COMMENT, getTagValue} from "@welshman/util"
   import {repository} from "@welshman/app"
   import {request} from "@welshman/net"
   import {deriveEventsById, deriveEventsAsc} from "@welshman/store"
-  import SortVertical from "@assets/icons/sort-vertical.svg?dataurl"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import PageContent from "@lib/components/PageContent.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import Button from "@lib/components/Button.svelte"
+  import Link from "@lib/components/Link.svelte"
   import SpaceBar from "@app/components/SpaceBar.svelte"
-  import NoteContent from "@app/components/NoteContent.svelte"
+  import ThreadPost from "@app/components/ThreadPost.svelte"
-  import NoteCard from "@app/components/NoteCard.svelte"
+  import ThreadPagination from "@app/components/ThreadPagination.svelte"
-  import ThreadActions from "@app/components/ThreadActions.svelte"
-  import CommentActions from "@app/components/CommentActions.svelte"
   import EventReply from "@app/components/EventReply.svelte"
+  import RoomName from "@app/components/RoomName.svelte"
   import {deriveEvent} from "@app/repository"
   import {decodeRelay} from "@app/relays"
+  import {makeSpacePath} from "@app/routes"
+
+  const POSTS_PER_PAGE = 20
 
   const {relay, id} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)
@@ -30,26 +34,91 @@
 
   const back = () => history.back()
 
-  const openReply = () => {
+  const posts = $derived.by(() => {
+    if (!$event) return []
+
+    return [$event, ...$replies]
+  })
+
+  const replyCount = $derived(Math.max(0, posts.length - 1))
+  const h = $derived(getTagValue("h", $event?.tags || []))
+
+  const pageCount = $derived(Math.max(1, Math.ceil(posts.length / POSTS_PER_PAGE)))
+
+  const currentPage = $derived.by(() => {
+    const raw = parseInt($page.url.searchParams.get("page") || "1")
+
+    if (Number.isNaN(raw) || raw < 1) return 1
+    if (raw > pageCount) return pageCount
+
+    return raw
+  })
+
+  const pagePosts = $derived(
+    posts.slice((currentPage - 1) * POSTS_PER_PAGE, currentPage * POSTS_PER_PAGE),
+  )
+
+  const setPage = (nextPage: number) => {
+    const params = new URLSearchParams($page.url.searchParams)
+
+    if (nextPage <= 1) {
+      params.delete("page")
+    } else {
+      params.set("page", String(nextPage))
+    }
+
+    const search = params.toString()
+
+    goto(`${$page.url.pathname}${search ? `?${search}` : ""}`, {
+      replaceState: true,
+      keepFocus: true,
+      noScroll: true,
+    })
+  }
+
+  const openReply = (post: TrustedEvent) => {
+    replyTo = post
     showReply = true
   }
 
   const closeReply = () => {
     showReply = false
+    replyTo = undefined
   }
 
-  const expand = () => {
+  const openThreadReply = () => {
-    showAll = true
+    if ($event) {
+      openReply($event)
+    }
+  }
+
+  const scrollToPost = (hash: string) => {
+    const element = document.getElementById(hash)
+
+    if (element) {
+      element.scrollIntoView({behavior: "smooth", block: "start"})
+    }
   }
 
-  let showAll = $state(false)
   let showReply = $state(false)
+  let replyTo: TrustedEvent | undefined = $state()
 
   onMount(() => {
     const controller = new AbortController()
 
     request({relays: [url], filters, signal: controller.signal})
 
+    const hash = window.location.hash.replace(/^#/, "")
+
+    if (hash.startsWith("post-")) {
+      const postNumber = parseInt(hash.replace("post-", ""))
+
+      if (!Number.isNaN(postNumber) && postNumber > 0) {
+        setPage(Math.ceil(postNumber / POSTS_PER_PAGE))
+        setTimeout(() => scrollToPost(hash), 100)
+      }
+    }
+
     return () => {
       controller.abort()
     }
@@ -58,41 +127,41 @@
 
 <SpaceBar {back}>
   {#snippet title()}
-    <h1 class="text-xl">{getTagValue("title", $event?.tags || []) || ""}</h1>
+    <div class="flex min-w-0 flex-col gap-0.5">
+      <h1 class="ellipsize text-xl">{getTagValue("title", $event?.tags || []) || ""}</h1>
+      <p class="text-xs opacity-75">
+        {replyCount}
+        {replyCount === 1 ? "reply" : "replies"}
+        {#if h}
+          · <Link href={makeSpacePath(url, h)} class="link">#<RoomName {url} {h} /></Link>
+        {/if}
+      </p>
+    </div>
   {/snippet}
 </SpaceBar>
 
-<PageContent class="flex flex-col gap-2 p-2">
+<PageContent class="flex flex-col">
   {#if $event}
-    <div class="flex flex-col gap-3">
+    <div class="bg-base-100">
-      <NoteCard event={$event} {url} class="card2 bg-alt z-feature w-full">
+      {#each pagePosts as post, i (post.id)}
-        <div class="col-3 ml-12">
+        {@const number = (currentPage - 1) * POSTS_PER_PAGE + i + 1}
-          <NoteContent showEntire event={$event} {url} />
+        <ThreadPost
-          <ThreadActions showRoom event={$event} {url} />
+          {url}
-        </div>
+          event={post}
-      </NoteCard>
+          {number}
-      {#if !showAll && $replies.length > 4}
+          threadPubkey={$event.pubkey}
-        <div class="flex justify-center">
+          showRoom={number === 1}
-          <Button class="btn btn-link" onclick={expand}>
+          onReply={() => openReply(post)} />
-            <Icon icon={SortVertical} />
-            Show all {$replies.length} replies
-          </Button>
-        </div>
-      {/if}
-      {#each $replies.slice(0, showAll ? undefined : 4) as reply (reply.id)}
-        <NoteCard event={reply} {url} class="card2 bg-alt z-feature w-full">
-          <div class="col-3 ml-12">
-            <NoteContent showEntire event={reply} {url} />
-            <CommentActions segment="threads" event={reply} {url} />
-          </div>
-        </NoteCard>
       {/each}
     </div>
-    {#if showReply}
+    {#if pageCount > 1}
-      <EventReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
+      <ThreadPagination page={currentPage} {pageCount} onPage={setPage} />
+    {/if}
+    {#if showReply && replyTo}
+      <EventReply {url} event={replyTo} onClose={closeReply} onSubmit={closeReply} />
     {:else}
-      <div class="flex justify-end">
+      <div class="flex justify-end p-4">
-        <Button class="btn btn-primary" onclick={openReply}>
+        <Button class="btn btn-primary" onclick={openThreadReply}>
           <Icon icon={Reply} />
           Reply to thread
         </Button>