From 25845dc837bea6fa3dddd58ef51cbb1aee3cf832 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Wed, 4 Sep 2024 17:29:31 -0700 Subject: [PATCH] Get rid of loadOne since it only works for id-based filters, not addresses --- packages/app/src/collection.ts | 4 ++-- packages/app/src/core.ts | 14 -------------- packages/app/src/follows.ts | 4 ++-- packages/app/src/mutes.ts | 4 ++-- packages/app/src/profiles.ts | 4 ++-- packages/app/src/relaySelections.ts | 6 +++--- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/packages/app/src/collection.ts b/packages/app/src/collection.ts index 72cf538..a54f156 100644 --- a/packages/app/src/collection.ts +++ b/packages/app/src/collection.ts @@ -4,7 +4,7 @@ import {indexBy, type Maybe, now} from '@welshman/lib' import {getIdFilters} from '@welshman/util' import type {TrustedEvent} from '@welshman/util' import {withGetter, deriveEvents} from '@welshman/store' -import {repository, loadOne} from './core' +import {repository, load} from './core' import {getFreshness, setFreshness} from './freshness' export const collection = ({ @@ -71,7 +71,7 @@ export const deriveEvent = (idOrAddress: string, request: Partial { if (!attempted && events.length === 0) { - loadOne({...request, filters}) + load({...request, filters}) attempted = true } diff --git a/packages/app/src/core.ts b/packages/app/src/core.ts index 820abd3..2e97f55 100644 --- a/packages/app/src/core.ts +++ b/packages/app/src/core.ts @@ -79,17 +79,3 @@ export const load = (request: PartialSubscribeRequest) => sub.emitter.on("event", (url: string, e: TrustedEvent) => events.push(e)) sub.emitter.on("complete", () => resolve(events)) }) - -export const loadOne = (request: PartialSubscribeRequest) => - new Promise(resolve => { - const sub = subscribe({closeOnEose: true, timeout: AppContext.requestTimeout, ...request}) - - sub.emitter.on("event", (url: string, event: TrustedEvent) => { - resolve(event) - sub.close() - }) - - sub.emitter.on("complete", () => { - resolve(null) - }) - }) diff --git a/packages/app/src/follows.ts b/packages/app/src/follows.ts index 1664cac..15028f8 100644 --- a/packages/app/src/follows.ts +++ b/packages/app/src/follows.ts @@ -2,7 +2,7 @@ import {FOLLOWS, asDecryptedEvent, readList} from '@welshman/util' import {type TrustedEvent, type PublishedList} from '@welshman/util' import {type SubscribeRequest} from "@welshman/net" import {deriveEventsMapped, withGetter} from '@welshman/store' -import {repository, loadOne} from './core' +import {repository, load} from './core' import {collection} from './collection' import {ensurePlaintext} from './plaintext' @@ -28,5 +28,5 @@ export const { store: follows, getKey: follows => follows.event.pubkey, load: (pubkey: string, request: Partial = {}) => - loadOne({...request, filters: [{kinds: [FOLLOWS], authors: [pubkey]}]}), + load({...request, filters: [{kinds: [FOLLOWS], authors: [pubkey]}]}), }) diff --git a/packages/app/src/mutes.ts b/packages/app/src/mutes.ts index 61b3767..61e353b 100644 --- a/packages/app/src/mutes.ts +++ b/packages/app/src/mutes.ts @@ -2,7 +2,7 @@ import {MUTES, asDecryptedEvent, readList} from '@welshman/util' import {type TrustedEvent, type PublishedList} from '@welshman/util' import {type SubscribeRequest} from "@welshman/net" import {deriveEventsMapped, withGetter} from '@welshman/store' -import {repository, loadOne} from './core' +import {repository, load} from './core' import {collection} from './collection' import {ensurePlaintext} from './plaintext' @@ -28,5 +28,5 @@ export const { store: mutes, getKey: mute => mute.event.pubkey, load: (pubkey: string, request: Partial = {}) => - loadOne({...request, filters: [{kinds: [MUTES], authors: [pubkey]}]}), + load({...request, filters: [{kinds: [MUTES], authors: [pubkey]}]}), }) diff --git a/packages/app/src/profiles.ts b/packages/app/src/profiles.ts index 263b992..26ed448 100644 --- a/packages/app/src/profiles.ts +++ b/packages/app/src/profiles.ts @@ -3,7 +3,7 @@ import {readProfile, displayProfile, displayPubkey, PROFILE} from '@welshman/uti import {type SubscribeRequest} from "@welshman/net" import {type PublishedProfile} from "@welshman/util" import {deriveEventsMapped, withGetter} from '@welshman/store' -import {repository, loadOne} from './core' +import {repository, load} from './core' import {createSearch} from './util' import {collection} from './collection' @@ -24,7 +24,7 @@ export const { store: profiles, getKey: profile => profile.event.pubkey, load: (pubkey: string, request: Partial = {}) => - loadOne({...request, filters: [{kinds: [PROFILE], authors: [pubkey]}]}), + load({...request, filters: [{kinds: [PROFILE], authors: [pubkey]}]}), }) export const profileSearch = derived(profiles, $profiles => diff --git a/packages/app/src/relaySelections.ts b/packages/app/src/relaySelections.ts index 9ebc412..f49e451 100644 --- a/packages/app/src/relaySelections.ts +++ b/packages/app/src/relaySelections.ts @@ -1,7 +1,7 @@ import {INBOX_RELAYS, RELAYS, getRelayTags, normalizeRelayUrl, type TrustedEvent} from '@welshman/util' import {type SubscribeRequest} from "@welshman/net" import {deriveEvents, withGetter} from '@welshman/store' -import {loadOne, repository} from './core' +import {load, repository} from './core' import {collection} from './collection' export const getRelayUrls = (event?: TrustedEvent): string[] => @@ -29,7 +29,7 @@ export const { store: relaySelections, getKey: relaySelections => relaySelections.pubkey, load: (pubkey: string, request: Partial = {}) => - loadOne({...request, filters: [{kinds: [RELAYS], authors: [pubkey]}]}), + load({...request, filters: [{kinds: [RELAYS], authors: [pubkey]}]}), }) export const inboxRelaySelections = withGetter(deriveEvents(repository, {filters: [{kinds: [RELAYS]}]})) @@ -43,5 +43,5 @@ export const { store: inboxRelaySelections, getKey: inboxRelaySelections => inboxRelaySelections.pubkey, load: (pubkey: string, request: Partial = {}) => - loadOne({...request, filters: [{kinds: [INBOX_RELAYS], authors: [pubkey]}]}), + load({...request, filters: [{kinds: [INBOX_RELAYS], authors: [pubkey]}]}), })