Fix threads

This commit is contained in:
Jon Staab
2024-10-10 10:00:01 -07:00
parent 89c4a2014a
commit 65a1012e53
5 changed files with 31 additions and 63 deletions
+3 -1
View File
@@ -50,6 +50,8 @@
return false
}
const isStartAndEnd = (i: number) => Boolean(isBoundary(i - 1) && isBoundary(i + 1))
const isStartOrEnd = (i: number) => Boolean(isBoundary(i - 1) || isBoundary(i + 1))
const isBlock = (i: number) => {
@@ -81,7 +83,7 @@
{:else if isTopic(parsed)}
<ContentTopic value={parsed.value} />
{:else if isCode(parsed)}
<ContentCode value={parsed.value} />
<ContentCode value={parsed.value} isBlock={isStartAndEnd(i)} />
{:else if isCashu(parsed) || isInvoice(parsed)}
<ContentToken value={parsed.value} />
{:else if isLink(parsed)}
+4 -5
View File
@@ -1,9 +1,8 @@
<script lang="ts">
export let value
export let isBlock
</script>
<pre>
<code class="link-content block w-full">
{value}
</code>
</pre>
<code class="link-content w-full" class:block={isBlock}>
{value}
</code>
+10 -7
View File
@@ -1,29 +1,32 @@
<script lang="ts">
import {nip19} from "nostr-tools"
import {ctx} from "@welshman/lib"
import {repository} from "@welshman/app"
import {getReplyFilters} from "@welshman/util"
import {deriveEvents} from "@welshman/store"
import Icon from "@lib/components/Icon.svelte"
import Link from "@lib/components/Link.svelte"
import Content from "@app/components/Content.svelte"
import NoteCard from "@app/components/NoteCard.svelte"
import {entityLink} from "@app/state"
export let root
export let replies
export let event
const relays = ctx.app.router.Event(root).getUrls()
const nevent = nip19.neventEncode({...root, relays})
const replies = deriveEvents(repository, {filters: getReplyFilters([event])})
const relays = ctx.app.router.Event(event).getUrls()
const nevent = nip19.neventEncode({...event, relays})
</script>
<div class="flex flex-col items-end">
<NoteCard event={root} class="card2 bg-alt w-full">
<NoteCard {event} class="card2 bg-alt w-full">
<div class="ml-12">
<Content event={root} />
<Content {event} />
</div>
</NoteCard>
<Link
href={entityLink(nevent)}
class="btn btn-neutral z-feature -mt-6 mr-4 flex items-center gap-2 rounded-full">
<Icon icon="chat-round" />
<span>{replies.length}</span>
<span>{$replies.length}</span>
</Link>
</div>