From ee6ad507e306aa22f4c414c4a7dcaa366dc603ad Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 20 Sep 2024 16:30:26 +0100 Subject: [PATCH] chore: fix breaking changes from dependancies from nostr-tools and ndk --- src/lib/components/events/content/utils.ts | 4 ++-- src/lib/stores/users.ts | 8 ++++++-- src/lib/wrappers/EventPreview.svelte | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/components/events/content/utils.ts b/src/lib/components/events/content/utils.ts index ac3650c..9fd667f 100644 --- a/src/lib/components/events/content/utils.ts +++ b/src/lib/components/events/content/utils.ts @@ -1,7 +1,7 @@ import type { NDKTag } from '@nostr-dev-kit/ndk' import { nip19 } from 'nostr-tools' -import type { AddressPointer, EventPointer } from 'nostr-tools/lib/types/nip19' -import { last } from 'ramda' +import type { AddressPointer, EventPointer } from 'nostr-tools/nip19' +import last from 'ramda/src/last' export const TOPIC = 'topic' export const LINKCOLLECTION = 'link[]' diff --git a/src/lib/stores/users.ts b/src/lib/stores/users.ts index 4f53fd9..608ffed 100644 --- a/src/lib/stores/users.ts +++ b/src/lib/stores/users.ts @@ -2,7 +2,11 @@ import { defaults as user_defaults, type UserObject, } from '$lib/components/users/type' -import { NDKNip07Signer, NDKRelayList } from '@nostr-dev-kit/ndk' +import { + getRelayListForUser, + NDKNip07Signer, + NDKRelayList, +} from '@nostr-dev-kit/ndk' import { get, writable, type Unsubscriber, type Writable } from 'svelte/store' import { ndk } from './ndk' @@ -168,7 +172,7 @@ export const getUserRelays = async (hexpubkey: string): Promise => { loading: true, ndk_relays: undefined, }) - const relay_list = await NDKRelayList.forUser(hexpubkey, ndk) + const relay_list = await getRelayListForUser(hexpubkey, ndk) const querying_user_relays = { loading: false, ndk_relays: relay_list, diff --git a/src/lib/wrappers/EventPreview.svelte b/src/lib/wrappers/EventPreview.svelte index aee4a97..f6c6d9a 100644 --- a/src/lib/wrappers/EventPreview.svelte +++ b/src/lib/wrappers/EventPreview.svelte @@ -4,10 +4,7 @@ import { get, writable, type Writable } from 'svelte/store' import { base_relays, ndk } from '$lib/stores/ndk' import EventCard from './EventCard.svelte' - import type { - AddressPointer, - EventPointer, - } from 'nostr-tools/lib/types/nip19' + import type { AddressPointer, EventPointer } from 'nostr-tools/nip19' import { repo_kind } from '$lib/kinds' import { ensureRepo } from '$lib/stores/repos' import EventWrapperLite from '$lib/components/events/EventWrapperLite.svelte'