- Notes intended for you will {$policy.read ? "" : "not"} be delivered to this relay.
+ Notes intended for you will {$readRelayUrls.includes(url) ? "" : "not"} be delivered to this
+ relay.
- Notes you publish will {$policy.write ? "" : "not"} be sent to this relay.
+ Notes you publish will {$writeRelayUrls.includes(url) ? "" : "not"} be sent to this relay.
- Encrypted messages will {$policy.inbox ? "" : "not"} be delivered to this relay.
+ Encrypted messages will {$inboxRelayUrls.includes(url) ? "" : "not"} be delivered to this
+ relay.
{/if}
diff --git a/src/app/shared/RelayCardActions.svelte b/src/app/shared/RelayCardActions.svelte
index 5b03cd478..134edcc8b 100644
--- a/src/app/shared/RelayCardActions.svelte
+++ b/src/app/shared/RelayCardActions.svelte
@@ -1,24 +1,34 @@
-{#if !$joined}
+{#if !userRelayUrls.includes(url)}
-{:else if $userRelayPolicies.length > 1}
+{:else if userRelayUrls.length > 1}
diff --git a/src/app/shared/RelayStatus.svelte b/src/app/shared/RelayStatus.svelte
index af10802bf..c708a2d77 100644
--- a/src/app/shared/RelayStatus.svelte
+++ b/src/app/shared/RelayStatus.svelte
@@ -1,7 +1,7 @@
-
-
diff --git a/src/app/state.ts b/src/app/state.ts
index a9a1fa2cf..d281bb42c 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -1,21 +1,35 @@
import Bugsnag from "@bugsnag/js"
import {writable} from "svelte/store"
-import {router} from "src/app/util/router"
+import {uniq} from "@welshman/lib"
+import {COMMUNITIES, FEEDS, APP_DATA} from "@welshman/util"
import {
- env,
pubkey,
session,
+ loadZapper,
+ loadHandle,
+ loadRelaySelections,
+ getRelayUrls,
+ loadProfile,
+ loadFollows,
+ loadMutes,
+} from "@welshman/app"
+import {appDataKeys} from "src/util/nostr"
+import {router} from "src/app/util/router"
+import {
+ env,
+ load,
+ loadPubkeys,
loadSeen,
loadGroups,
loadDeletes,
loadHandlers,
loadGiftWraps,
- loadPubkeyUserData,
loadLegacyMessages,
loadGroupMessages,
loadNotifications,
loadFeedsAndLists,
listenForNotifications,
+ getFollows,
getSetting,
} from "src/engine"
@@ -74,14 +88,41 @@ export const slowConnections = writable([])
export const loadAppData = () => {
// If we have a group, load that
- if (env.get().FORCE_GROUP) {
- loadGroups([env.get().FORCE_GROUP])
+ if (env.FORCE_GROUP) {
+ loadGroups([env.FORCE_GROUP])
}
}
-export const loadUserData = async () => {
- // Refresh our user's data
- await loadPubkeyUserData([pubkey.get()])
+export const loadUserData = async (hints: string[] = []) => {
+ // Load relays, then load everything else so we have a better chance of finding it
+ const $pubkey = pubkey.get()
+ const relaySelections = await loadRelaySelections($pubkey, {relays: hints})
+ const relays = uniq([...hints, ...getRelayUrls(relaySelections)])
+
+ // Load crucial user data
+ await Promise.all([
+ loadProfile($pubkey, {relays}),
+ loadFollows($pubkey, {relays}),
+ loadMutes($pubkey, {relays}),
+ ])
+
+ // Load less important user data
+ loadZapper($pubkey)
+ loadHandle($pubkey)
+ load({
+ relays,
+ filters: [
+ {authors: [$pubkey], kinds: [COMMUNITIES, FEEDS]},
+ {
+ authors: [$pubkey],
+ kinds: [APP_DATA],
+ "#d": Object.values(appDataKeys),
+ },
+ ],
+ })
+
+ // Load enough to figure out web of trust
+ loadPubkeys(getFollows($pubkey))
// Load anything they might need to be notified about
loadSeen()
diff --git a/src/app/util/feeds.ts b/src/app/util/feeds.ts
index dfaf46477..6b56f0f6a 100644
--- a/src/app/util/feeds.ts
+++ b/src/app/util/feeds.ts
@@ -1,7 +1,7 @@
import {partition, prop, uniqBy} from "ramda"
import {batch, tryFunc, seconds} from "hurdak"
import {get, writable, derived} from "svelte/store"
-import {inc, assoc, pushToMapKey, now} from "@welshman/lib"
+import {ctx, inc, assoc, pushToMapKey, now} from "@welshman/lib"
import type {TrustedEvent} from "@welshman/util"
import {
Tags,
@@ -17,6 +17,7 @@ import {
import {Tracker} from "@welshman/net"
import type {Feed, RequestItem} from "@welshman/feeds"
import {walkFeed, FeedLoader as CoreFeedLoader} from "@welshman/feeds"
+import {repository, tracker, getFilterSelections} from "@welshman/app"
import {noteKinds, isLike, reactionKinds, repostKinds} from "src/util/nostr"
import {isAddressFeed} from "src/domain"
import type {DisplayEvent} from "src/engine"
@@ -25,12 +26,8 @@ import {
sortEventsDesc,
unwrapRepost,
isEventMuted,
- repository,
- hints,
addRepostFilters,
- getFilterSelections,
subscribe,
- tracker,
load,
} from "src/engine"
@@ -66,11 +63,7 @@ function* getRequestItems({relays, filters}: RequestItem, opts: FeedOpts) {
if (relays?.length > 0) {
yield {filters, relays}
} else if (!opts.skipNetwork) {
- const selections = getFilterSelections(filters)
-
- for (const {relay, filters} of selections) {
- yield {filters, relays: [relay]}
- }
+ yield* getFilterSelections(filters)
}
}
@@ -82,10 +75,18 @@ const createFeedLoader = (opts: FeedOpts, signal) =>
const tracker = new Tracker()
const forceRelays = relays?.length > 0
const forcePlatform = opts.forcePlatform && !forceRelays
+ const requestItems = Array.from(getRequestItems({relays, filters}, opts))
await Promise.all(
- Array.from(getRequestItems({relays, filters}, opts)).map(opts =>
- load({...opts, onEvent, tracker, signal, skipCache: true, forcePlatform}),
+ requestItems.map(opts =>
+ load({
+ ...opts,
+ onEvent,
+ tracker,
+ signal,
+ skipCache: true,
+ forcePlatform,
+ }),
),
)
@@ -302,7 +303,9 @@ export const createFeed = (opts: FeedOpts) => {
return true
})
- const selections = hints.merge(notesWithParent.map(hints.EventParents)).getSelections()
+ const selections = ctx.app.router
+ .merge(notesWithParent.map(ctx.app.router.EventParents))
+ .getSelections()
for (const {relay, values} of selections) {
load({
@@ -375,4 +378,4 @@ export const createFeed = (opts: FeedOpts) => {
subscribe: f => store.subscribe(f),
loadMore: (limit: number) => loader?.(limit),
}
-}
\ No newline at end of file
+}
diff --git a/src/app/util/router.ts b/src/app/util/router.ts
index 2218c1df2..d0ad5774d 100644
--- a/src/app/util/router.ts
+++ b/src/app/util/router.ts
@@ -1,10 +1,11 @@
import {last, identity} from "ramda"
import {Address, fromNostrURI} from "@welshman/util"
+import {ctx} from "@welshman/lib"
import {nip19} from "nostr-tools"
import {Router} from "src/util/router"
import {parseJson} from "src/util/misc"
import {parseAnythingSync} from "src/util/nostr"
-import {decodeEvent, getChannelId, hints} from "src/engine"
+import {decodeEvent, getChannelId} from "src/engine"
// Decoders
@@ -56,7 +57,7 @@ export const asPerson = {
return {
pubkey,
- relays: hints.FromPubkeys([pubkey]).getUrls(),
+ relays: ctx.app.router.FromPubkeys([pubkey]).getUrls(),
}
}
@@ -65,7 +66,9 @@ export const asPerson = {
return {
pubkey,
- relays: hints.merge([hints.fromRelays(relays), hints.FromPubkeys([pubkey])]).getUrls(),
+ relays: ctx.app.router
+ .merge([ctx.app.router.fromRelays(relays), ctx.app.router.FromPubkeys([pubkey])])
+ .getUrls(),
}
}
@@ -127,7 +130,7 @@ router.extend("notes", (id, {relays = []} = {}) => {
router.extend("people", (pubkey, {relays = []} = {}) => {
if (relays.length < 3) {
relays = relays.concat(
- hints
+ ctx.app.router
.FromPubkeys([pubkey])
.limit(3 - relays.length)
.getUrls(),
diff --git a/src/app/views/About.svelte b/src/app/views/About.svelte
index edefeddbb..3867f2ca3 100644
--- a/src/app/views/About.svelte
+++ b/src/app/views/About.svelte
@@ -11,9 +11,9 @@
const nprofile =
"nprofile1qqsf03c2gsmx5ef4c9zmxvlew04gdh7u94afnknp33qvv3c94kvwxgspz4mhxue69uhhyetvv9ujuerpd46hxtnfduhsz9rhwden5te0wfjkcctev93xcefwdaexwtcpzdmhxue69uhhqatjwpkx2urpvuhx2ue0vamm57"
const hodlbodPubkey = "97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322"
- const splits = [makeZapSplit($env.PLATFORM_PUBKEY)]
+ const splits = [makeZapSplit(env.PLATFORM_PUBKEY)]
- loadPubkeys([$env.PLATFORM_PUBKEY])
+ loadPubkeys([env.PLATFORM_PUBKEY])
document.title = "About"
diff --git a/src/app/views/Bech32Entity.svelte b/src/app/views/Bech32Entity.svelte
index 4f07383b7..ae96ce505 100644
--- a/src/app/views/Bech32Entity.svelte
+++ b/src/app/views/Bech32Entity.svelte
@@ -11,9 +11,9 @@
{#if type === "nevent"}
-
+
{:else if type === "note"}
-
+
{:else if type === "naddr"}
{@const address = new Address(data.kind, data.pubkey, data.identifier).toString()}
{#if [35834, 34550].includes(data.kind)}
@@ -21,7 +21,7 @@
{:else if data.kind === 31923}
{:else}
-
+
{/if}
{:else if type === "nrelay"}
diff --git a/src/app/views/Calendar.svelte b/src/app/views/Calendar.svelte
index 134ca2d52..4776d2ebe 100644
--- a/src/app/views/Calendar.svelte
+++ b/src/app/views/Calendar.svelte
@@ -1,14 +1,15 @@
diff --git a/src/app/views/ChannelCreate.svelte b/src/app/views/ChannelCreate.svelte
index c90442428..d297f9c6d 100644
--- a/src/app/views/ChannelCreate.svelte
+++ b/src/app/views/ChannelCreate.svelte
@@ -1,19 +1,23 @@
diff --git a/src/app/views/ChannelsDetail.svelte b/src/app/views/ChannelsDetail.svelte
index 001b2e94b..839c07990 100644
--- a/src/app/views/ChannelsDetail.svelte
+++ b/src/app/views/ChannelsDetail.svelte
@@ -1,28 +1,21 @@
diff --git a/src/app/views/DataExport.svelte b/src/app/views/DataExport.svelte
index 95b295536..e416c44b5 100644
--- a/src/app/views/DataExport.svelte
+++ b/src/app/views/DataExport.svelte
@@ -1,10 +1,10 @@
{#if loading}
diff --git a/src/app/views/FeedEdit.svelte b/src/app/views/FeedEdit.svelte
index 8631b445c..af1478b47 100644
--- a/src/app/views/FeedEdit.svelte
+++ b/src/app/views/FeedEdit.svelte
@@ -1,10 +1,10 @@
-{#if $env.FORCE_GROUP}
-
+{#if env.FORCE_GROUP}
+
{:else}
{/if}
diff --git a/src/app/views/InviteAccept.svelte b/src/app/views/InviteAccept.svelte
index 9e5ad5ae8..ec0d9c856 100644
--- a/src/app/views/InviteAccept.svelte
+++ b/src/app/views/InviteAccept.svelte
@@ -1,6 +1,7 @@
{#if loading}
diff --git a/src/app/views/Login.svelte b/src/app/views/Login.svelte
index 79a3585f7..191a052dd 100644
--- a/src/app/views/Login.svelte
+++ b/src/app/views/Login.svelte
@@ -4,6 +4,7 @@
import {last, prop, objOf} from "ramda"
import {HANDLER_INFORMATION, NOSTR_CONNECT} from "@welshman/util"
import {getNip07, Nip07Signer} from "@welshman/signer"
+ import {loadHandle} from "@welshman/app"
import {parseJson} from "src/util/misc"
import {showWarning} from "src/partials/Toast.svelte"
import Anchor from "src/partials/Anchor.svelte"
@@ -12,7 +13,7 @@
import SearchSelect from "src/partials/SearchSelect.svelte"
import FlexColumn from "src/partials/FlexColumn.svelte"
import Heading from "src/partials/Heading.svelte"
- import {load, hints, loadHandle, loginWithExtension, loginWithNostrConnect} from "src/engine"
+ import {load, loginWithExtension, loginWithNostrConnect} from "src/engine"
import {router} from "src/app/util/router"
import {boot} from "src/app/state"
@@ -92,7 +93,6 @@
onMount(() => {
load({
- relays: hints.ReadRelays().getUrls(),
filters: [
{
kinds: [HANDLER_INFORMATION],
@@ -107,15 +107,15 @@
}
const domain = last(content.nip05.split("@"))
- const {pubkey, ...handle} = (await loadHandle(`_@${domain}`)) || {}
- const relays = handle.nip46 || handle.relays || []
+ const handle = await loadHandle(`_@${domain}`)
+ const relays = handle?.nip46 || handle?.relays || []
if (handlers.some(h => h.domain === domain)) {
return
}
- if (pubkey === e.pubkey) {
- handlers = handlers.concat({pubkey, domain, relays})
+ if (handle?.pubkey === e.pubkey) {
+ handlers = handlers.concat({pubkey: e.pubkey, domain, relays})
}
},
})
diff --git a/src/app/views/LoginConnect.svelte b/src/app/views/LoginConnect.svelte
index ba6eb1977..ac23b875c 100644
--- a/src/app/views/LoginConnect.svelte
+++ b/src/app/views/LoginConnect.svelte
@@ -9,6 +9,7 @@
isShareableRelayUrl,
} from "@welshman/util"
import {deriveEvents} from "@welshman/store"
+ import {session, repository} from "@welshman/app"
import {showWarning} from "src/partials/Toast.svelte"
import Modal from "src/partials/Modal.svelte"
import Field from "src/partials/Field.svelte"
@@ -18,8 +19,8 @@
import Subheading from "src/partials/Subheading.svelte"
import Anchor from "src/partials/Anchor.svelte"
import {router} from "src/app/util/router"
+ import {env} from "src/engine"
import {loadUserData} from "src/app/state"
- import {env, loadPubkeyUserData, repository, session} from "src/engine"
const t = Date.now()
@@ -32,9 +33,9 @@
const searchRelays = async relays => {
failed = false
- loadPubkeyUserData([$session.pubkey], {relays})
+ loadUserData(relays)
- await sleep(3000)
+ await sleep(5000)
if (!found) {
failed = true
@@ -55,7 +56,7 @@
const tryDefaultRelays = () => {
// Pull out all the stops to try to find the user's profile
- searchRelays([LOCAL_RELAY_URL, ...env.get().DEFAULT_RELAYS, ...env.get().PLATFORM_RELAYS])
+ searchRelays([LOCAL_RELAY_URL, ...env.DEFAULT_RELAYS, ...env.PLATFORM_RELAYS])
}
const openModal = m => {
diff --git a/src/app/views/Logout.svelte b/src/app/views/Logout.svelte
index 170b53099..1dce7092f 100644
--- a/src/app/views/Logout.svelte
+++ b/src/app/views/Logout.svelte
@@ -1,10 +1,11 @@
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 4a4399e68..18ecfd005 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -5,8 +5,9 @@
import {join, whereEq, identity} from "ramda"
import {throttle, commaFormat, toTitle, switcherFn} from "hurdak"
import {writable} from "svelte/store"
- import {now} from "@welshman/lib"
+ import {ctx, now} from "@welshman/lib"
import {createEvent} from "@welshman/util"
+ import {session} from "@welshman/app"
import {currencyOptions} from "src/util/i18n"
import {dateToSeconds} from "src/util/misc"
import {showWarning, showPublishInfo} from "src/partials/Toast.svelte"
@@ -30,14 +31,7 @@
import NoteImages from "src/app/shared/NoteImages.svelte"
import {publish, mention} from "src/engine"
import {router} from "src/app/util/router"
- import {
- env,
- hints,
- session,
- getClientTags,
- tagsFromContent,
- publishToZeroOrMoreGroups,
- } from "src/engine"
+ import {env, getClientTags, tagsFromContent, publishToZeroOrMoreGroups} from "src/engine"
export let type = "note"
export let quote = null
@@ -45,7 +39,7 @@
export let group = null
export let initialValues = {}
- const defaultGroups = $env.FORCE_GROUP ? [$env.FORCE_GROUP] : [group].filter(identity)
+ const defaultGroups = env.FORCE_GROUP ? [env.FORCE_GROUP] : [group].filter(identity)
let images, compose
let charCount = 0
@@ -127,7 +121,7 @@
// Re-broadcast the note we're quoting
if (!opts.groups.length) {
- publish({event: quote, relays: hints.WriteRelays().getUrls()})
+ publish({event: quote, relays: ctx.app.router.WriteRelays().getUrls()})
}
}
@@ -191,7 +185,7 @@
if (quote) {
const nevent = nip19.neventEncode({
id: quote.id,
- relays: hints.Event(quote).getUrls(),
+ relays: ctx.app.router.Event(quote).getUrls(),
})
compose.nevent("nostr:" + nevent)
@@ -280,9 +274,9 @@
{commaFormat(wordCount)} words
•
-
+
+
- Show how many likes and reactions a note received. Disabling this can reduce how much data {appName}
- uses.
+ Controls which icons appear at the bottom of any given note. Disabling these can reduce how
+ much data {appName} uses.
-
+
@@ -93,7 +88,7 @@
Notes containing these words will be hidden by default.