Fix quote relays, add backwards compat for reading legacy messages/threads

This commit is contained in:
Jon Staab
2024-12-10 10:49:21 -08:00
parent 523c54a1f1
commit a65f6f6323
10 changed files with 55 additions and 17 deletions
+10 -1
View File
@@ -10,7 +10,7 @@
import {throttled} from "@welshman/store"
import {createEvent, DELETE} from "@welshman/util"
import {PublishStatus} from "@welshman/net"
import {formatTimestampAsDate, publishThunk, deriveRelay} from "@welshman/app"
import {formatTimestampAsDate, load, publishThunk, deriveRelay} from "@welshman/app"
import {slide} from "@lib/transition"
import {createScroller, type Scroller} from "@lib/html"
import Icon from "@lib/components/Icon.svelte"
@@ -31,6 +31,7 @@
GENERAL,
tagRoom,
MESSAGE,
LEGACY_MESSAGE,
getMembershipRoomsByUrl,
} from "@app/state"
import {setChecked} from "@app/notifications"
@@ -124,6 +125,14 @@
// Sveltekiiit
await sleep(100)
if (!nip29.isSupported($relay)) {
load({
delay: 0,
relays: [url],
filters: [{kinds: [LEGACY_MESSAGE], "#~": [room]}],
})
}
pullConservatively({
relays: [url],
filters: [{kinds: [MESSAGE, DELETE], "#h": [room]}],
@@ -16,13 +16,15 @@
import MenuSpaceButton from "@app/components/MenuSpaceButton.svelte"
import ThreadItem from "@app/components/ThreadItem.svelte"
import ThreadCreate from "@app/components/ThreadCreate.svelte"
import {THREAD, COMMENT, decodeRelay, deriveEventsForUrl} from "@app/state"
import {THREAD, LEGACY_THREAD, COMMENT, decodeRelay, deriveEventsForUrl} from "@app/state"
import {THREAD_FILTERS, setChecked} from "@app/notifications"
import {pushModal} from "@app/modal"
const url = decodeRelay($page.params.relay)
const threads = deriveEventsForUrl(url, [{kinds: [THREAD]}])
const comments = deriveEventsForUrl(url, [{kinds: [COMMENT], "#K": [String(THREAD)]}])
const threads = deriveEventsForUrl(url, [{kinds: [THREAD, LEGACY_THREAD]}])
const comments = deriveEventsForUrl(url, [
{kinds: [COMMENT], "#K": [String(THREAD), String(LEGACY_THREAD)]},
])
const mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
const events = throttled(
@@ -81,7 +81,7 @@
{/if}
<NoteCard event={$event} class="card2 bg-alt z-feature w-full">
<div class="col-3 ml-12">
<Content showEntire event={$event} />
<Content showEntire event={$event} quoteProps={{relays: [url]}} />
<ThreadActions event={$event} {url} />
</div>
</NoteCard>