diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte index 2e0ad52c..3755c296 100644 --- a/src/app/MenuDesktop.svelte +++ b/src/app/MenuDesktop.svelte @@ -55,7 +55,9 @@ external href="https://info.coracle.social"> App Logo -

{appName}

+

+ {appName} +

Feed {#if !$env.FORCE_GROUP && $env.PLATFORM_RELAYS.length === 0} @@ -101,8 +103,10 @@
Terms / - Privacy + Privacy
{#if subMenu === "settings"} @@ -155,7 +159,9 @@ {#if s.pubkey !== $pubkey} pubkey.set(s.pubkey)}>
- + {displayPubkey(s.pubkey)}
diff --git a/src/app/shared/Calendar.svelte b/src/app/shared/Calendar.svelte index 161418cb..85a5e561 100644 --- a/src/app/shared/Calendar.svelte +++ b/src/app/shared/Calendar.svelte @@ -11,9 +11,19 @@ import {themeColors} from "src/partials/state" import Anchor from "src/partials/Anchor.svelte" import {router} from "src/app/router" - import {canSign, writable, getReplyFilters, load, isDeleted, subscribe, pubkey} from "src/engine" + import { + hints, + canSign, + getRelaysFromFilters, + writable, + getReplyFilters, + forcePlatformRelays, + load, + isDeleted, + subscribe, + pubkey, + } from "src/engine" - export let relays export let filters export let group = null @@ -41,7 +51,7 @@ onMount(() => { const sub = subscribe({ filters, - relays: relays.concat(LOCAL_RELAY_URL), + relays: forcePlatformRelays(getRelaysFromFilters(filters)).concat(LOCAL_RELAY_URL), onEvent: batch(300, chunk => { events.update($events => { for (const e of chunk) { @@ -56,7 +66,10 @@ }) // Load deletes for these events - load({relays, filters: getReplyFilters(chunk, {kinds: [5]})}) + load({ + relays: hints.merge(chunk.map(e => hints.EventChildren(e))).getUrls(), + filters: getReplyFilters(chunk, {kinds: [5]}), + }) }), }) @@ -100,7 +113,7 @@ eventContent: getEventContent, eventStartEditable: false, eventDragMinDistance: 10000, - eventTextColor: $themeColors['neutral-900'], + eventTextColor: $themeColors["neutral-900"], longPressDelay: 10000, buttonText: { today: "Today", diff --git a/src/app/shared/Feed.svelte b/src/app/shared/Feed.svelte index 051fca93..f4401312 100644 --- a/src/app/shared/Feed.svelte +++ b/src/app/shared/Feed.svelte @@ -24,6 +24,7 @@ export let relays = [] export let filter: DynamicFilter = {} export let anchor = null + export let skipCache = false export let shouldDisplay = null export let shouldListen = false export let hideControls = false @@ -46,7 +47,13 @@ ? $searchableRelays : getRelaysFromFilters(compileFilters([filter])) - return forcePlatformRelays(hints.scenario([selection]).getUrls()).concat(LOCAL_RELAY_URL) + const result = forcePlatformRelays(hints.scenario([selection]).getUrls()) + + if (!skipCache) { + result.push(LOCAL_RELAY_URL) + } + + return result } const loadMore = () => feed.load(5) diff --git a/src/app/shared/GroupMarket.svelte b/src/app/shared/GroupMarket.svelte index b27d5885..e2580609 100644 --- a/src/app/shared/GroupMarket.svelte +++ b/src/app/shared/GroupMarket.svelte @@ -5,8 +5,8 @@ import {router} from "src/app/router" export let group - export let relays + const filter = group ? {kinds: [30402], "#a": [group]} : {kinds: [30402]} const createListing = () => router.at("notes/create").qp({type: "listing", group}).open() @@ -15,4 +15,4 @@ Create a listing - + diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte index 14a40e9a..5b3decf1 100644 --- a/src/app/shared/NoteActions.svelte +++ b/src/app/shared/NoteActions.svelte @@ -138,7 +138,7 @@ const broadcast = () => { Publisher.publish({ event: note, - relays: hints.Outbox().getUrls(), + relays: hints.WriteRelays().getUrls(), }) toast.show("info", "Note has been re-published!") diff --git a/src/app/shared/NoteContentKind30402.svelte b/src/app/shared/NoteContentKind30402.svelte index 0a50035f..2cafce15 100644 --- a/src/app/shared/NoteContentKind30402.svelte +++ b/src/app/shared/NoteContentKind30402.svelte @@ -1,6 +1,6 @@ - + diff --git a/src/app/views/Feeds.svelte b/src/app/views/Feeds.svelte index 6dd18303..e116d76f 100644 --- a/src/app/views/Feeds.svelte +++ b/src/app/views/Feeds.svelte @@ -56,7 +56,7 @@ {/if} {#key key} - +
{#if $canSign} {#if $userLists.length > 0} diff --git a/src/app/views/GroupDetail.svelte b/src/app/views/GroupDetail.svelte index 43d3cfc3..c128b200 100644 --- a/src/app/views/GroupDetail.svelte +++ b/src/app/views/GroupDetail.svelte @@ -1,7 +1,7 @@
-
+
{#each tabs as tab}