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

publication, wiki, and universal event viewer implemented. still buggy

master
Silberengel 10 months ago
parent
512ea92c3a
commit
7dd411c43f
4 changed files with 119 additions and 58 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. 10
      src/lib/components/util/InlineProfile.svelte
  2. 11
      src/lib/wiki.ts
  3. 124
      src/routes/events/+page.svelte
  4. 32
      src/routes/wiki/+page.svelte

10
src/lib/components/util/InlineProfile.svelte
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
import { type NDKUserProfile } from "@nostr-dev-kit/ndk";
import { ndkInstance } from '$lib/ndk';
let { pubkey, title = null } = $props();
let { pubkey, name = null } = $props();
const externalProfileDestination = './events?id='
let loading = $state(true);
@ -43,11 +43,11 @@ @@ -43,11 +43,11 @@
</script>
{#if loading}
{title ?? '…'}
{name ?? '…'}
{:else if anon }
<a class='underline' href={'/events?id=' + npub} title={title ?? npub}>{shortenNpub(npub)}</a>
<a class='underline' href={'/events?id=' + npub} title={name ?? npub}>{shortenNpub(npub)}</a>
{:else if npub }
<a href={'/events?id=' + npub} title={title ?? username}>
<a href={'/events?id=' + npub} title={name ?? username}>
<Avatar rounded
class='h-6 w-6 mx-1 cursor-pointer inline'
src={pfp}
@ -55,5 +55,5 @@ @@ -55,5 +55,5 @@
<span class='underline'>{username ?? shortenNpub(npub)}</span>
</a>
{:else}
{title ?? pubkey}
{name ?? pubkey}
{/if}

11
src/lib/wiki.ts
Unescape View File

@ -132,18 +132,21 @@ export async function getWikiPageById(id: string, ndk: NDK) { @@ -132,18 +132,21 @@ export async function getWikiPageById(id: string, ndk: NDK) {
let html = '';
try {
const pharos = new Pharos(ndk);
console.log('Pharos instance:', pharos);
pharos.parse(asciidoc);
const pharosHtml = pharos.getHtml();
html = await parseBasicmarkup(pharosHtml);
if (!html) {
console.error('getWikiPageById: Parsed HTML is empty for id:', id, 'event:', event);
console.log('AsciiDoc:', asciidoc);
console.log('Pharos HTML:', pharosHtml);
html = await parseBasicmarkup(pharosHtml ?? '');
if (!html || html.trim() === '') {
console.error('getWikiPageById: Parsed HTML is empty for id:', id, 'event:', event, 'asciidoc:', asciidoc, 'pharosHtml:', pharosHtml);
}
} catch (err) {
console.error('getWikiPageById: Error parsing content:', err, 'event:', event);
return null;
}
return { title, pubhex, eventId: event.id, summary, hashtags, html };
return { title, pubhex, eventId: event.id, summary, hashtags, html, content: event.content };
}
/**

124
src/routes/events/+page.svelte
Unescape View File

@ -78,6 +78,9 @@ @@ -78,6 +78,9 @@
error = 'Event not found';
} else {
console.log('[Events] Event found:', event);
if (typeof event.getMatchingTags !== 'function') {
event = new NDKEvent(event.ndk || $ndkInstance, event);
}
}
} catch (err) {
console.error('[Events] Error fetching event:', err, 'Query:', searchQuery);
@ -190,8 +193,7 @@ @@ -190,8 +193,7 @@
}
});
$: if (event && event.kind !== 0) {
// Only parse for non-profile events
$: if (event && event.kind !== 0 && event.content) {
parseBasicmarkup(event.content).then(html => {
parsedContent = html;
contentPreview = html.slice(0, 250);
@ -201,6 +203,10 @@ @@ -201,6 +203,10 @@
$: profile = event && event.kind === 0
? (() => { try { return JSON.parse(event.content); } catch { return null; } })()
: null;
$: profileTitle = event && event.kind === 0 && profile && profile.name
? profile.name
: null;
</script>
<div class="w-full flex justify-center">
@ -242,7 +248,7 @@ @@ -242,7 +248,7 @@
</div>
{/if}
{#if event}
{#if event && typeof event.getMatchingTags === 'function'}
<div class="flex flex-col space-y-6">
<!-- Event Identifier (plain text, not a link) -->
<div class="text-sm font-mono text-gray-600 dark:text-gray-400 break-all">
@ -251,7 +257,11 @@ @@ -251,7 +257,11 @@
<!-- Event Details -->
<div class="flex flex-col space-y-4">
<h2 class="text-2xl font-bold text-gray-900 dark:text-gray-100">{getEventTitle(event)}</h2>
{#if event.kind !== 0 && getEventTitle(event)}
<h2 class="text-2xl font-bold text-gray-900 dark:text-gray-100">{getEventTitle(event)}</h2>
{:else if event.kind === 0 && profile && profile.name}
<h2 class="text-2xl font-bold text-gray-900 dark:text-gray-100">{profile.name}</h2>
{/if}
<div class="flex items-center space-x-2">
<span class="text-gray-600 dark:text-gray-400">Author:</span>
<InlineProfile pubkey={event.pubkey} />
@ -283,45 +293,63 @@ @@ -283,45 +293,63 @@
<span class="text-gray-600 dark:text-gray-400">Content:</span>
{#if event.kind === 0}
{#if profile}
<div class="flex flex-col gap-2 mt-2">
{#if profile.name}
<div><span class="font-semibold">Name:</span> {profile.name}</div>
{/if}
{#if profile.display_name}
<div><span class="font-semibold">Display Name:</span> {profile.display_name}</div>
{/if}
{#if profile.about}
<div><span class="font-semibold">About:</span> {profile.about}</div>
{/if}
{#if profile.picture}
<div class="flex items-center gap-2">
<span class="font-semibold">Picture:</span>
<img src={profile.picture} alt="Profile" class="w-16 h-16 rounded-full border" />
</div>
{/if}
{#if profile.banner}
<div class="flex items-center gap-2">
<span class="font-semibold">Banner:</span>
<img src={profile.banner} alt="Banner" class="w-full max-w-xs rounded border" />
</div>
{/if}
{#if profile.website}
<div>
<span class="font-semibold">Website:</span>
<a href={profile.website} target="_blank" class="underline text-primary-700">{profile.website}</a>
</div>
{/if}
{#if profile.lud16}
<div>
<span class="font-semibold">Lightning Address:</span> {profile.lud16}
</div>
{/if}
{#if profile.nip05}
<div>
<span class="font-semibold">NIP-05:</span> {profile.nip05}
</div>
{/if}
<!-- Add more fields as needed -->
<div class="bg-primary-50 dark:bg-primary-900 rounded-lg p-6 mt-2 shadow flex flex-col gap-4">
<dl class="grid grid-cols-1 gap-y-2">
{#if profile.name}
<div class="flex gap-2">
<dt class="font-semibold min-w-[120px]">Name:</dt>
<dd>{profile.name}</dd>
</div>
{/if}
{#if profile.display_name}
<div class="flex gap-2">
<dt class="font-semibold min-w-[120px]">Display Name:</dt>
<dd>{profile.display_name}</dd>
</div>
{/if}
{#if profile.about}
<div class="flex gap-2">
<dt class="font-semibold min-w-[120px]">About:</dt>
<dd class="whitespace-pre-line">{profile.about}</dd>
</div>
{/if}
{#if profile.picture}
<div class="flex gap-2 items-center">
<dt class="font-semibold min-w-[120px]">Picture:</dt>
<dd>
<img src={profile.picture} alt="Profile" class="w-16 h-16 rounded-full border" />
</dd>
</div>
{/if}
{#if profile.banner}
<div class="flex gap-2 items-center">
<dt class="font-semibold min-w-[120px]">Banner:</dt>
<dd>
<img src={profile.banner} alt="Banner" class="w-full max-w-xs rounded border" />
</dd>
</div>
{/if}
{#if profile.website}
<div class="flex gap-2">
<dt class="font-semibold min-w-[120px]">Website:</dt>
<dd>
<a href={profile.website} target="_blank" class="underline text-primary-700">{profile.website}</a>
</dd>
</div>
{/if}
{#if profile.lud16}
<div class="flex gap-2">
<dt class="font-semibold min-w-[120px]">Lightning Address:</dt>
<dd>{profile.lud16}</dd>
</div>
{/if}
{#if profile.nip05}
<div class="flex gap-2">
<dt class="font-semibold min-w-[120px]">NIP-05:</dt>
<dd>{profile.nip05}</dd>
</div>
{/if}
</dl>
</div>
{:else}
<pre class="overflow-x-auto text-xs bg-highlight dark:bg-primary-900 rounded p-2 mt-2">{event.content}</pre>
@ -362,6 +390,16 @@ @@ -362,6 +390,16 @@
</details>
</div>
</div>
{#if !getEventTitle(event) && !event.content}
<div class="p-4 text-gray-500">
No title or content available for this event.
<pre class="text-xs mt-2 bg-gray-100 dark:bg-gray-800 p-2 rounded">
{JSON.stringify(event.rawEvent(), null, 2)}
</pre>
</div>
{/if}
{:else if event}
<div class="text-red-600">Fetched event is not a valid NDKEvent. See console for details.</div>
{/if}
</main>
</div>

32
src/routes/wiki/+page.svelte
Unescape View File

@ -10,7 +10,8 @@ @@ -10,7 +10,8 @@
import { neventEncode } from '$lib/utils';
import { processNostrIdentifiers } from '$lib/utils/nostrUtils';
import { standardRelays, wikiKind } from '$lib/consts';
import Pharos from '$lib/parser';
import { parseBasicmarkup } from '$lib/utils/markup/basicMarkupParser';
// @ts-ignore Svelte linter false positive: hashtags is used in the template
let { } = $props<{
title: string;
@ -28,6 +29,7 @@ @@ -28,6 +29,7 @@
summary: string;
hashtags: string[];
html: string;
content: string;
};
let searchInput = $state('');
@ -124,6 +126,7 @@ @@ -124,6 +126,7 @@
summary: pageData.summary,
hashtags: pageData.hashtags,
html: processedHtml,
content: pageData.content,
};
wikiContent = {
title: pageData.title,
@ -205,6 +208,22 @@ @@ -205,6 +208,22 @@
wikiPage = null;
}
});
(async () => {
let html = '';
try {
const pharos = new Pharos($ndkInstance);
pharos.parse('= Test\n\nHello world');
const pharosHtml = pharos.getHtml();
if (!pharosHtml || pharosHtml.trim() === '') {
console.error('Pharos failed to parse AsciiDoc:', '= Test\n\nHello world');
}
html = await parseBasicmarkup(pharosHtml ?? '');
console.log('Test parse result:', html);
} catch (err) {
console.error('Pharos parse error:', err);
}
})();
</script>
<div class="flex flex-col items-center min-h-[60vh] pt-8">
@ -258,14 +277,15 @@ @@ -258,14 +277,15 @@
{/if}
<div class="w-full prose prose-lg dark:prose-invert max-w-none">
{#if wikiPage.html && wikiPage.html.trim().length > 0}
{#if event && typeof event.getMatchingTags === 'function'}
{@html wikiPage.html}
{:else if event}
<div class="text-red-600">Fetched event is not a valid NDKEvent. See console for details.</div>
{/if}
{@html wikiPage.html}
{:else}
<div class="text-red-600">
No content found for this wiki page.
{#if wikiPage.content}
<pre class="text-xs mt-2 bg-gray-100 dark:bg-gray-800 p-2 rounded">
{wikiPage.content}
</pre>
{/if}
<pre class="text-xs mt-2 bg-gray-100 dark:bg-gray-800 p-2 rounded">
{JSON.stringify(wikiPage, null, 2)}
</pre>

Write Preview
Loading…
Cancel
Save