Subscribe to thread updates

This commit is contained in:
Jon Staab 2024-11-01 15:08:27 -07:00
parent f741bce32c
commit 98afc356a8
3 changed files with 59 additions and 53 deletions

View file

@ -40,7 +40,6 @@
</Button> </Button>
</div> </div>
</PageBar> </PageBar>
{#if pubkey}
<div class="col-2 p-2"> <div class="col-2 p-2">
<div class="card2 bg-alt col-4 text-left"> <div class="card2 bg-alt col-4 text-left">
<div class="relative flex gap-4"> <div class="relative flex gap-4">
@ -88,8 +87,9 @@
</div> </div>
{/if} {/if}
</div> </div>
{#if pubkey}
<Divider>Recent posts from the relay admin</Divider> <Divider>Recent posts from the relay admin</Divider>
<ProfileFeed {url} {pubkey} /> <ProfileFeed {url} {pubkey} />
</div>
{/if} {/if}
</div>
</div> </div>

View file

@ -11,7 +11,7 @@
import {onMount} from "svelte" import {onMount} from "svelte"
import {page} from "$app/stores" import {page} from "$app/stores"
import {writable} from "svelte/store" import {writable} from "svelte/store"
import {sortBy, now, assoc, append} from "@welshman/lib" import {sortBy, ago, assoc, append} from "@welshman/lib"
import type {TrustedEvent, EventContent} from "@welshman/util" import type {TrustedEvent, EventContent} from "@welshman/util"
import {createEvent} from "@welshman/util" import {createEvent} from "@welshman/util"
import {formatTimestampAsDate, publishThunk} from "@welshman/app" import {formatTimestampAsDate, publishThunk} from "@welshman/app"
@ -94,7 +94,12 @@
} }
onMount(() => { onMount(() => {
return subscribePersistent({filters: [{"#~": [room], since: now()}], relays: [url]}) const unsub = subscribePersistent({
filters: [{"#~": [room], since: ago(30)}],
relays: [url],
})
return () => unsub()
}) })
setTimeout(() => { setTimeout(() => {

View file

@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import {onMount} from "svelte" import {onMount} from "svelte"
import {page} from "$app/stores" import {page} from "$app/stores"
import {now, assoc} from "@welshman/lib" import {ago, assoc} from "@welshman/lib"
import {getListTags, getPubkeyTagValues} from "@welshman/util" import {getListTags, getPubkeyTagValues} from "@welshman/util"
import type {Filter} from "@welshman/util" import type {Filter} from "@welshman/util"
import {feedsFromFilters, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds" import {feedsFromFilters, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds"
@ -22,7 +22,7 @@
const url = decodeRelay($page.params.relay) const url = decodeRelay($page.params.relay)
const events = deriveEventsForUrl(url, [{kinds: [THREAD]}]) const events = deriveEventsForUrl(url, [{kinds: [THREAD]}])
const mutedPubkeys = getPubkeyTagValues(getListTags($userMutes)) const mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
const filters: Filter[] = [{kinds: [THREAD]}, {kinds: [COMMENT], "#k": [String(THREAD)]}] const filters: Filter[] = [{kinds: [THREAD]}, {kinds: [COMMENT], "#K": [String(THREAD)]}]
const feed = makeIntersectionFeed(makeRelayFeed(url), feedsFromFilters(filters)) const feed = makeIntersectionFeed(makeRelayFeed(url), feedsFromFilters(filters))
const loader = feedLoader.getLoader(feed, { const loader = feedLoader.getLoader(feed, {
onExhausted: () => { onExhausted: () => {
@ -40,7 +40,7 @@
onMount(() => { onMount(() => {
const unsub = subscribePersistent({ const unsub = subscribePersistent({
filters: filters.map(assoc('since', now())), filters: filters.map(assoc('since', ago(30))),
relays: [url], relays: [url],
}) })
@ -52,6 +52,7 @@
const $loader = await loader const $loader = await loader
await $loader(5) await $loader(5)
limit += 5 limit += 5
}, },
}) })
@ -63,7 +64,7 @@
}) })
</script> </script>
<div class="relative flex h-screen flex-col"> <div class="relative flex h-screen flex-col" bind:this={element}>
<PageBar> <PageBar>
<div slot="icon" class="center"> <div slot="icon" class="center">
<Icon icon="notes-minimalistic" /> <Icon icon="notes-minimalistic" />
@ -79,7 +80,7 @@
</Button> </Button>
</div> </div>
</PageBar> </PageBar>
<div class="flex flex-grow flex-col gap-2 overflow-auto p-2" bind:this={element}> <div class="flex flex-grow flex-col gap-2 overflow-auto p-2">
{#each $events.slice(0, limit) as event (event.id)} {#each $events.slice(0, limit) as event (event.id)}
{#if !event.tags.some(nthEq(0, "e")) && !mutedPubkeys.includes(event.pubkey)} {#if !event.tags.some(nthEq(0, "e")) && !mutedPubkeys.includes(event.pubkey)}
<ThreadItem {url} {event} /> <ThreadItem {url} {event} />