From c32479de202200056b7be1e2efe2a94ee07f6908 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Mon, 5 Feb 2024 16:27:02 +0000 Subject: [PATCH] fix: repo event tag rendering - get event pubkey in using correct parameter name - get r tag value for unique_commit - extract t tags a typeguard is require like in ngit to ensure the r tag is formatted as unique_commit --- src/lib/stores/repo.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/stores/repo.ts b/src/lib/stores/repo.ts index f7d2359..1def1dc 100644 --- a/src/lib/stores/repo.ts +++ b/src/lib/stores/repo.ts @@ -1,4 +1,4 @@ -import { NDKRelaySet, NDKSubscription } from '@nostr-dev-kit/ndk' +import { NDKEvent, NDKRelaySet, NDKSubscription } from '@nostr-dev-kit/ndk' import { writable, type Unsubscriber, type Writable } from 'svelte/store' import { base_relays, ndk } from './ndk' import type { Repo } from '$lib/components/repo/type' @@ -42,12 +42,12 @@ export const ensureSelectedRepo = async (repo_id: string): Promise => { ) return new Promise((r) => { - sub.on('event', (event) => { + sub.on('event', (event: NDKEvent) => { try { if (event.kind == repo_kind && event.tagValue('d') == repo_id) { const maintainers = [ { - hexpubkey: event.pub_key, + hexpubkey: event.pubkey, loading: true, npub: '', } as User, @@ -66,11 +66,11 @@ export const ensureSelectedRepo = async (repo_id: string): Promise => { selected_repo.set({ loading: false, repo_id: event.replaceableDTag(), - unique_commit: event.getMatchingTags('r'), + unique_commit: event.tagValue('r') || undefined, name: event.tagValue('name') || '', description: event.tagValue('description') || '', clone: event.tagValue('clone') || '', - tags: event.getMatchingTags('t') || [], + tags: event.getMatchingTags('t').map((t) => t[1]) || [], maintainers, relays: event.getMatchingTags('relay').map((t: string[]) => t[1]), })