silberengel
/
gc-alexandria
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

display e-tag event lists in 30040

master
silberengel 7 months ago
parent
1ca057f6e1
commit
188c58143c
2 changed files with 108 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 102
      src/lib/data_structures/publication_tree.ts
  2. 14
      src/routes/publication/[type]/[identifier]/+page.svelte

102
src/lib/data_structures/publication_tree.ts
Unescape View File

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
import type NDK from "@nostr-dev-kit/ndk";
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import { Lazy } from "./lazy.ts";
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import type NDK from "@nostr-dev-kit/ndk";
import { fetchEventById } from "../utils/websocket_utils.ts";
enum PublicationTreeNodeType {
Branch,
@ -583,6 +584,52 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -583,6 +584,52 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
.filter((tag) => tag[0] === "a")
.map((tag) => tag[1]);
console.debug(`[PublicationTree] Current event ${currentEvent.id} has ${currentEvent.tags.length} tags:`, currentEvent.tags);
console.debug(`[PublicationTree] Found ${currentChildAddresses.length} a-tags in current event:`, currentChildAddresses);
// If no a-tags found, try e-tags as fallback
if (currentChildAddresses.length === 0) {
const eTags = currentEvent.tags
.filter((tag) => tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1]));
console.debug(`[PublicationTree] Found ${eTags.length} e-tags for current event ${currentEvent.id}:`, eTags.map(tag => tag[1]));
// For e-tags with hex IDs, fetch the referenced events to get their addresses
const eTagPromises = eTags.map(async (tag) => {
try {
console.debug(`[PublicationTree] Fetching event for e-tag ${tag[1]} in depthFirstRetrieve`);
const referencedEvent = await fetchEventById(tag[1]);
if (referencedEvent) {
// Construct the proper address format from the referenced event
const dTag = referencedEvent.tags.find(tag => tag[0] === "d")?.[1];
if (dTag) {
const address = `${referencedEvent.kind}:${referencedEvent.pubkey}:${dTag}`;
console.debug(`[PublicationTree] Constructed address from e-tag in depthFirstRetrieve: ${address}`);
return address;
} else {
console.debug(`[PublicationTree] Referenced event ${tag[1]} has no d-tag in depthFirstRetrieve`);
}
} else {
console.debug(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]} in depthFirstRetrieve - event not found`);
}
return null;
} catch (error) {
console.warn(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]} in depthFirstRetrieve:`, error);
return null;
}
});
const resolvedAddresses = await Promise.all(eTagPromises);
const validAddresses = resolvedAddresses.filter(addr => addr !== null) as string[];
console.debug(`[PublicationTree] Resolved ${validAddresses.length} valid addresses from e-tags in depthFirstRetrieve:`, validAddresses);
if (validAddresses.length > 0) {
currentChildAddresses.push(...validAddresses);
}
}
// If the current event has no children, it is a leaf.
if (currentChildAddresses.length === 0) {
// Return the first leaf if no address was provided.
@ -671,6 +718,52 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -671,6 +718,52 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
.filter((tag) => tag[0] === "a")
.map((tag) => tag[1]);
console.debug(`[PublicationTree] Event ${event.id} has ${event.tags.length} tags:`, event.tags);
console.debug(`[PublicationTree] Found ${childAddresses.length} a-tags:`, childAddresses);
// If no a-tags found, try e-tags as fallback
if (childAddresses.length === 0) {
const eTags = event.tags
.filter((tag) => tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1]));
console.debug(`[PublicationTree] Found ${eTags.length} e-tags for event ${event.id}:`, eTags.map(tag => tag[1]));
// For e-tags with hex IDs, fetch the referenced events to get their addresses
const eTagPromises = eTags.map(async (tag) => {
try {
console.debug(`[PublicationTree] Fetching event for e-tag ${tag[1]}`);
const referencedEvent = await fetchEventById(tag[1]);
if (referencedEvent) {
// Construct the proper address format from the referenced event
const dTag = referencedEvent.tags.find(tag => tag[0] === "d")?.[1];
if (dTag) {
const address = `${referencedEvent.kind}:${referencedEvent.pubkey}:${dTag}`;
console.debug(`[PublicationTree] Constructed address from e-tag: ${address}`);
return address;
} else {
console.debug(`[PublicationTree] Referenced event ${tag[1]} has no d-tag`);
}
} else {
console.debug(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]}`);
}
return null;
} catch (error) {
console.warn(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]}:`, error);
return null;
}
});
const resolvedAddresses = await Promise.all(eTagPromises);
const validAddresses = resolvedAddresses.filter(addr => addr !== null) as string[];
console.debug(`[PublicationTree] Resolved ${validAddresses.length} valid addresses from e-tags:`, validAddresses);
if (validAddresses.length > 0) {
childAddresses.push(...validAddresses);
}
}
const node: PublicationTreeNode = {
type: this.#getNodeType(event),
status: PublicationTreeNodeStatus.Resolved,
@ -690,7 +783,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -690,7 +783,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
}
#getNodeType(event: NDKEvent): PublicationTreeNodeType {
if (event.kind === 30040 && event.tags.some((tag) => tag[0] === "a")) {
if (event.kind === 30040 && (
event.tags.some((tag) => tag[0] === "a") ||
event.tags.some((tag) => tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1]))
)) {
return PublicationTreeNodeType.Branch;
}

14
src/routes/publication/[type]/[identifier]/+page.svelte
Unescape View File

@ -9,21 +9,21 @@ @@ -9,21 +9,21 @@
import { page } from "$app/state";
import { goto } from "$app/navigation";
import { createNDKEvent } from "$lib/utils/nostrUtils";
import { createTagAddress } from "$lib/utils";
import { get } from "svelte/store";
import { activeInboxRelays } from "$lib/ndk";
let { data }: PageProps = $props();
// data.indexEvent can be null from server-side rendering
// We need to handle this case properly
// AI-NOTE: Always create NDK event since we now ensure NDK is available
console.debug('[Publication] data.indexEvent:', data.indexEvent);
console.debug('[Publication] data.ndk:', data.ndk);
const indexEvent = data.indexEvent && data.ndk
? createNDKEvent(data.ndk, data.indexEvent)
: null; // No event if no NDK or no event data
console.debug('[Publication] indexEvent created:', indexEvent);
// Only create publication tree if we have a valid index event
const publicationTree = indexEvent ? new SveltePublicationTree(indexEvent, data.ndk) : null;
const toc = indexEvent ? new TableOfContents(
@ -100,6 +100,8 @@ @@ -100,6 +100,8 @@
</script>
{#if indexEvent && data.indexEvent}
{@const debugInfo = `indexEvent: ${!!indexEvent}, data.indexEvent: ${!!data.indexEvent}`}
{@const debugElement = console.debug('[Publication] Rendering publication with:', debugInfo)}
<ArticleNav
publicationType={data.publicationType}
rootId={data.indexEvent.id}
@ -114,6 +116,8 @@ @@ -114,6 +116,8 @@
/>
</main>
{:else}
{@const debugInfo = `indexEvent: ${!!indexEvent}, data.indexEvent: ${!!data.indexEvent}`}
{@const debugElement = console.debug('[Publication] NOT rendering publication with:', debugInfo)}
<main class="publication">
<div class="flex items-center justify-center min-h-screen">
<p class="text-gray-600 dark:text-gray-400">Loading publication...</p>

Write Preview
Loading…
Cancel
Save