From dd7c0f3b07c2581dce2e7bf613f3753d2aa71fb0 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Thu, 24 Oct 2024 11:52:02 -0700 Subject: [PATCH] Handle deleted threads --- .gitignore | 5 +- src/app.html | 12 ++-- src/app/components/Chat.svelte | 2 +- src/app/components/MenuSettings.svelte | 8 +-- src/app/components/MenuSpaces.svelte | 4 +- src/app/components/ThreadActions.svelte | 9 ++- src/lib/components/EmojiButton.svelte | 8 ++- src/lib/components/Link.svelte | 3 +- src/routes/spaces/[relay]/+layout.svelte | 14 +++-- src/routes/spaces/[relay]/+page.svelte | 38 +++++------ src/routes/spaces/[relay]/[room]/+page.svelte | 2 +- .../spaces/[relay]/calendar/+page.svelte | 2 +- .../spaces/[relay]/threads/[id]/+page.svelte | 63 ++++++++++++------- 13 files changed, 102 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 64fbd88..781d657 100644 --- a/.gitignore +++ b/.gitignore @@ -18,10 +18,9 @@ vite.config.js.timestamp-* vite.config.ts.timestamp-* # Generated assets -static/favicons -static/apple-touch-icon-180x180.png static/favicon.ico -static/maskable-icon-512x512.png static/pwa-64x64.png static/pwa-192x192.png static/pwa-512x512.png +static/apple-touch-icon-180x180.png +static/maskable-icon-512x512.png diff --git a/src/app.html b/src/app.html index 89c1887..5cb86ee 100644 --- a/src/app.html +++ b/src/app.html @@ -15,12 +15,12 @@ - - - - - - + + + + + + %sveltekit.head% diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte index 2e89e6b..9dd2424 100644 --- a/src/app/components/Chat.svelte +++ b/src/app/components/Chat.svelte @@ -100,7 +100,7 @@ setTimeout(() => { loading = false - }, 3000) + }, 5000)
diff --git a/src/app/components/MenuSettings.svelte b/src/app/components/MenuSettings.svelte index 43275fd..25244b3 100644 --- a/src/app/components/MenuSettings.svelte +++ b/src/app/components/MenuSettings.svelte @@ -11,28 +11,28 @@
- +
Profile
Customize your user profile
 - +
Relays
Control how {PLATFORM_NAME} talks to the network
 - +
Settings
Get into the details about how {PLATFORM_NAME} works
 - +
About
diff --git a/src/app/components/MenuSpaces.svelte b/src/app/components/MenuSpaces.svelte index 31544f7..01b6238 100644 --- a/src/app/components/MenuSpaces.svelte +++ b/src/app/components/MenuSpaces.svelte @@ -17,7 +17,7 @@
{#if PLATFORM_RELAY} - +
@@ -27,7 +27,7 @@ {:else if getMembershipUrls($userMembership).length > 0} {#each getMembershipUrls($userMembership) as url (url)} - +
diff --git a/src/app/components/ThreadActions.svelte b/src/app/components/ThreadActions.svelte index 93d1a64..5c52689 100644 --- a/src/app/components/ThreadActions.svelte +++ b/src/app/components/ThreadActions.svelte @@ -2,7 +2,7 @@ import {type Instance} from "tippy.js" import type {NativeEmoji} from "emoji-picker-element/shared" import {max} from "@welshman/lib" - import {deriveEvents} from "@welshman/store" + import {deriveEvents, deriveIsDeleted} from "@welshman/store" import type {TrustedEvent} from "@welshman/util" import {pubkey, repository, formatTimestampRelative} from "@welshman/app" import Icon from "@lib/components/Icon.svelte" @@ -18,6 +18,8 @@ export let event export let showActivity = false + const deleted = deriveIsDeleted(repository, event) + const replies = deriveEvents(repository, {filters: [{kinds: [REPLY], "#E": [event.id]}]}) const showPopover = () => popover.show() @@ -47,6 +49,11 @@
+ {#if $deleted} +
+ Deleted +
+ {/if} {#if showActivity}
diff --git a/src/lib/components/EmojiButton.svelte b/src/lib/components/EmojiButton.svelte index abdf3d7..1a5171b 100644 --- a/src/lib/components/EmojiButton.svelte +++ b/src/lib/components/EmojiButton.svelte @@ -18,10 +18,12 @@ } const onMouseMove = throttle(300, ({clientX, clientY}: any) => { - const {x, y, width, height} = popover.popper.getBoundingClientRect() + if (popover) { + const {x, y, width, height} = popover.popper.getBoundingClientRect() - if (!between([x, x + width], clientX) || !between([y - 30, y + height + 30], clientY)) { - popover.hide() + if (!between([x, x + width], clientX) || !between([y - 30, y + height + 30], clientY)) { + popover.hide() + } } }) diff --git a/src/lib/components/Link.svelte b/src/lib/components/Link.svelte index 7919163..11fa7d7 100644 --- a/src/lib/components/Link.svelte +++ b/src/lib/components/Link.svelte @@ -3,12 +3,13 @@ export let href export let external = false + export let replaceState = false const go = (e: Event) => { if (!external) { e.preventDefault() - goto(href) + goto(href, {replaceState}) } } diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte index 7691385..61cb51f 100644 --- a/src/routes/spaces/[relay]/+layout.svelte +++ b/src/routes/spaces/[relay]/+layout.svelte @@ -1,20 +1,26 @@ diff --git a/src/routes/spaces/[relay]/+page.svelte b/src/routes/spaces/[relay]/+page.svelte index 9115cc0..bc22b39 100644 --- a/src/routes/spaces/[relay]/+page.svelte +++ b/src/routes/spaces/[relay]/+page.svelte @@ -13,15 +13,18 @@ import MenuSpace from "@app/components/MenuSpace.svelte" import ThreadItem from "@app/components/ThreadItem.svelte" import ThreadCreate from "@app/components/ThreadCreate.svelte" - import {deriveEventsForUrl, decodeRelay} from "@app/state" + import {REPLY, deriveEventsForUrl, decodeRelay} from "@app/state" import {pushModal, pushDrawer} from "@app/modal" const url = decodeRelay($page.params.relay) - const kinds = [NOTE] - const feed = makeIntersectionFeed(makeRelayFeed(url), feedFromFilter({kinds})) - const events = deriveEventsForUrl(url, kinds) - const loader = feedLoader.getLoader(feed, {}) + const events = deriveEventsForUrl(url, [NOTE]) const mutedPubkeys = getPubkeyTagValues(getListTags($userMutes)) + const feed = makeIntersectionFeed(makeRelayFeed(url), feedFromFilter({kinds: [NOTE, REPLY]})) + const loader = feedLoader.getLoader(feed, { + onExhausted: () => { + loading = false + }, + }) const openMenu = () => pushDrawer(MenuSpace, {url}) @@ -32,22 +35,21 @@ let element: Element onMount(() => { - const scroller = createScroller({ - element, - onScroll: async () => { - const $loader = await loader + // Why is element not defined sometimes? SVELTEKIT + if (element) { + const scroller = createScroller({ + element, + onScroll: async () => { + const $loader = await loader - await $loader(5) - limit += 5 - }, - }) + await $loader(5) + limit += 5 + }, + }) - return () => scroller.stop() + return () => scroller.stop() + } }) - - setTimeout(() => { - loading = false - }, 3000)
diff --git a/src/routes/spaces/[relay]/[room]/+page.svelte b/src/routes/spaces/[relay]/[room]/+page.svelte index c7c0b79..adf6cdc 100644 --- a/src/routes/spaces/[relay]/[room]/+page.svelte +++ b/src/routes/spaces/[relay]/[room]/+page.svelte @@ -97,7 +97,7 @@ setTimeout(() => { loading = false - }, 3000) + }, 5000)
diff --git a/src/routes/spaces/[relay]/calendar/+page.svelte b/src/routes/spaces/[relay]/calendar/+page.svelte index aca87fb..eda8952 100644 --- a/src/routes/spaces/[relay]/calendar/+page.svelte +++ b/src/routes/spaces/[relay]/calendar/+page.svelte @@ -63,7 +63,7 @@ setTimeout(() => { loading = false - }, 3000) + }, 5000)
diff --git a/src/routes/spaces/[relay]/threads/[id]/+page.svelte b/src/routes/spaces/[relay]/threads/[id]/+page.svelte index 2acbba2..e51ed89 100644 --- a/src/routes/spaces/[relay]/threads/[id]/+page.svelte +++ b/src/routes/spaces/[relay]/threads/[id]/+page.svelte @@ -1,10 +1,12 @@
- {#if !showReply} -
- -
- {/if} - {#each sortBy(e => -e.created_at, $replies) as reply (reply.id)} - -
- + {#if $event} + {#if !showReply} +
+
- + {/if} + {#each sortBy(e => -e.created_at, $replies) as reply (reply.id)} + +
+ +
+ + + {/each} + +
+ +
+ - {/each} - -
- -
- - + {:else} + {#await sleep(5000)} + Loading thread... + {:then} +

Failed to load thread.

+ {/await} + {/if}