From 606de1fe4a7093a65bd8da2f4aecbe50ea322c96 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 3 Sep 2024 09:28:39 -0700 Subject: [PATCH] Rename env to AppContext --- packages/app/src/core.ts | 2 +- packages/app/src/handles.ts | 4 ++-- packages/app/src/relaySelections.ts | 6 +++--- packages/app/src/relays.ts | 4 ++-- packages/app/src/zappers.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/app/src/core.ts b/packages/app/src/core.ts index 24344f3..ac6fa13 100644 --- a/packages/app/src/core.ts +++ b/packages/app/src/core.ts @@ -4,7 +4,7 @@ import {Tracker, subscribe as baseSubscribe} from "@welshman/net" import type {SubscribeRequest} from "@welshman/net" import {createEventStore} from "@welshman/store" -export const env: { +export const AppContext: { BOOTSTRAP_RELAYS: string[] DUFFLEPUD_URL?: string [key: string]: any diff --git a/packages/app/src/handles.ts b/packages/app/src/handles.ts index fbe51d0..cc6ec35 100644 --- a/packages/app/src/handles.ts +++ b/packages/app/src/handles.ts @@ -2,7 +2,7 @@ import {writable, derived} from 'svelte/store' import {withGetter} from '@welshman/store' import {type SubscribeRequest} from "@welshman/net" import {uniq, uniqBy, batcher, postJson, last} from '@welshman/lib' -import {env} from './core' +import {AppContext} from './core' import {collection} from './collection' import {deriveProfile} from './profiles' @@ -16,7 +16,7 @@ export type Handle = { export const handles = withGetter(writable([])) export const fetchHandles = (handles: string[]) => { - const base = env.DUFFLEPUD_URL! + const base = AppContext.DUFFLEPUD_URL! if (!base) { throw new Error("DUFFLEPUD_URL is required to fetch nip05 info") diff --git a/packages/app/src/relaySelections.ts b/packages/app/src/relaySelections.ts index 1f01eb1..39c8aad 100644 --- a/packages/app/src/relaySelections.ts +++ b/packages/app/src/relaySelections.ts @@ -2,7 +2,7 @@ import {uniq} from '@welshman/lib' import {INBOX_RELAYS, RELAYS, getRelayTags, normalizeRelayUrl, type TrustedEvent} from '@welshman/util' import {type SubscribeRequest} from "@welshman/net" import {deriveEvents, withGetter} from '@welshman/store' -import {env, load, repository} from './core' +import {AppContext, load, repository} from './core' import {collection} from './collection' export const getRelayUrls = (event?: TrustedEvent): string[] => @@ -33,12 +33,12 @@ export const { load({ ...request, filters: [{kinds: [RELAYS], authors: [pubkey]}], - relays: [...env.BOOTSTRAP_RELAYS, ...request.relays || []], + relays: [...AppContext.BOOTSTRAP_RELAYS, ...request.relays || []], }), }) export const getHintsForPubkey = async (pubkey: string, relays: string[] = []) => - uniq([...relays, ...env.BOOTSTRAP_RELAYS, ...getWriteRelayUrls(await loadRelaySelections(pubkey, {relays}))]) + uniq([...relays, ...AppContext.BOOTSTRAP_RELAYS, ...getWriteRelayUrls(await loadRelaySelections(pubkey, {relays}))]) export const inboxRelaySelections = withGetter(deriveEvents(repository, {filters: [{kinds: [RELAYS]}]})) diff --git a/packages/app/src/relays.ts b/packages/app/src/relays.ts index 9dcd86a..ed35366 100644 --- a/packages/app/src/relays.ts +++ b/packages/app/src/relays.ts @@ -3,7 +3,7 @@ import {withGetter} from '@welshman/store' import {groupBy, indexBy, batch, now, uniq, uniqBy, batcher, postJson} from '@welshman/lib' import {type RelayProfile} from "@welshman/util" import {AuthStatus, asMessage, type Connection, type SocketMessage} from '@welshman/net' -import {env} from './core' +import {AppContext} from './core' import {createSearch} from './util' import {collection} from './collection' @@ -45,7 +45,7 @@ export const relaysByPubkey = derived(relays, $relays => ) export const fetchRelayProfiles = (urls: string[]) => { - const base = env.DUFFLEPUD_URL! + const base = AppContext.DUFFLEPUD_URL! if (!base) { throw new Error("DUFFLEPUD_URL is required to fetch relay metadata") diff --git a/packages/app/src/zappers.ts b/packages/app/src/zappers.ts index 523d095..8710d77 100644 --- a/packages/app/src/zappers.ts +++ b/packages/app/src/zappers.ts @@ -3,14 +3,14 @@ import {withGetter} from '@welshman/store' import {type Zapper} from '@welshman/util' import {type SubscribeRequest} from "@welshman/net" import {uniq, identity, bech32ToHex, tryCatch, uniqBy, batcher, postJson} from '@welshman/lib' -import {env} from './core' +import {AppContext} from './core' import {collection} from './collection' import {deriveProfile} from './profiles' export const zappers = withGetter(writable([])) export const fetchZappers = (lnurls: string[]) => { - const base = env.DUFFLEPUD_URL! + const base = AppContext.DUFFLEPUD_URL! if (!base) { throw new Error("DUFFLEPUD_URL is required to fetch zapper info")