Reposted naddr

web/src/lib/Api.ts

@@ -1,7 +1,7 @@
 import { nip19, type Event, type SimplePool, Kind, type Filter } from 'nostr-tools';
 import { get } from 'svelte/store';
 import type { Event as NostrEvent, UserEvent } from '../routes/types';
-import { cachedEvents, events as timelineEvents } from '../stores/Events';
+import { cachedEvents, cachedReplaceableEvents, events as timelineEvents } from '../stores/Events';
 import { saveMetadataEvent, userEvents } from '../stores/UserEvents';
 import { isMuteEvent } from '../stores/Author';
 
@@ -131,6 +131,36 @@ export class Api {
 		return nostrEvent;
 	}
 
+	async fetchEventByAddress(
+		kind: Kind,
+		pubkey: string,
+		identifier: string
+	): Promise<Event | undefined> {
+		const address = [kind, pubkey, identifier].join(':');
+
+		// Load cache
+		const $cachedEvents = get(cachedReplaceableEvents);
+		const cachedEvent = $cachedEvents.get(address);
+		if (cachedEvent !== undefined) {
+			return cachedEvent;
+		}
+
+		const event = await this.fetchEvent([
+			{
+				kinds: [kind],
+				authors: [pubkey],
+				'#d': [identifier]
+			}
+		]);
+
+		// Save cache
+		if (event !== undefined) {
+			$cachedEvents.set(address, event);
+		}
+
+		return event;
+	}
+
 	async fetchContactListEvent(pubkey: string): Promise<Event | undefined> {
 		const events = await this.pool.list(this.relays, [
 			{

web/src/routes/[naddr=naddr]/+page.svelte

@@ -33,13 +33,7 @@
 			$pool,
 			relays !== undefined && relays.length > 0 ? relays : $defaultRelays
 		);
-		event = await api.fetchEvent([
-			{
-				kinds: [kind],
-				authors: [pubkey],
-				'#d': [identifier]
-			}
-		]);
+		event = await api.fetchEventByAddress(kind, pubkey, identifier);
 		console.log('[event]', event);
 
 		if (event === undefined) {

web/src/routes/content/Naddr.svelte

@@ -31,13 +31,7 @@
 			$pool,
 			relays !== undefined && relays.length > 0 ? relays : $defaultRelays
 		);
-		event = await api.fetchEvent([
-			{
-				kinds: [kind],
-				authors: [pubkey],
-				'#d': [identifier]
-			}
-		]);
+		event = await api.fetchEventByAddress(kind, pubkey, identifier);
 		console.log('[event]', event);
 	});
 </script>

web/src/routes/timeline/NaddrLink.svelte

@@ -0,0 +1,16 @@
+<script lang="ts">
+	import { Kind, nip19 } from 'nostr-tools';
+
+	export let kind: Kind;
+	export let pubkey: string;
+	export let identifier: string;
+	export let relays: string[] | undefined = undefined;
+
+	const naddr = nip19.naddrEncode({ kind, pubkey, identifier, relays });
+</script>
+
+<article class="timeline-item">
+	<a href="/{naddr}">
+		{naddr.substring(0, 'naddr1'.length + 7)}
+	</a>
+</article>

web/src/routes/timeline/RepostedNote.svelte

@@ -9,6 +9,7 @@
 	import { Api } from '$lib/Api';
 	import NoteLink from './NoteLink.svelte';
 	import EventComponent from './EventComponent.svelte';
+	import NaddrLink from './NaddrLink.svelte';
 
 	export let event: NostrEvent;
 	export let readonly: boolean;
@@ -27,19 +28,66 @@
 		originalTag = event.tags.findLast(([t]) => t === 'e');
 	}
 
+	let originalAddressTag: string[] | undefined;
+	let kindString: string | undefined;
+	let pubkey: string | undefined;
+	let identifier: string | undefined;
+
+	if (originalTag === undefined) {
+		originalAddressTag = event.tags.find(
+			([tagName, tagContent, , marker]) =>
+				tagName === 'a' &&
+				tagContent !== undefined &&
+				(marker === 'mention' || marker === undefined)
+		);
+	}
+
 	onMount(async () => {
 		const api = new Api($pool, $readRelays);
 		api.fetchUserEvent(event.pubkey).then((userEvent) => {
 			user = userEvent?.user;
 		});
 
-		if (originalTag === undefined) {
-			console.warn('[repost not found]', event);
-			return;
+		if (originalTag !== undefined) {
+			const eventId = originalTag[1];
+			originalEvent = await api.fetchEventById(eventId);
+		} else if (originalAddressTag !== undefined) {
+			const relay = originalAddressTag.at(2);
+			const addressApi = new Api(
+				$pool,
+				relay === undefined ? $readRelays : [...$readRelays, relay]
+			);
+			[kindString, pubkey, identifier] = originalAddressTag[1].split(':');
+			const original = await addressApi.fetchEventByAddress(
+				Number(kindString),
+				pubkey,
+				identifier
+			);
+			if (original !== undefined) {
+				const userEvent = await api.fetchUserEvent(original.pubkey);
+				if (userEvent === undefined) {
+					originalEvent = original as NostrEvent;
+				} else {
+					let u: User;
+					try {
+						u = JSON.parse(userEvent.content);
+						originalEvent = {
+							...original,
+							user: u
+						};
+					} catch (error) {
+						console.warn('[invalid metadata]', error, userEvent.content);
+						originalEvent = original as NostrEvent;
+					}
+				}
+			}
+		} else {
+			console.warn('[original tag not found]', event);
 		}
 
-		const eventId = originalTag[1];
-		originalEvent = await api.fetchEventById(eventId);
+		if (originalEvent === undefined) {
+			console.warn('[original event not found]', event);
+		}
 	});
 
 	const toggleJsonDisplay = () => {
@@ -78,6 +126,8 @@
 	<EventComponent event={originalEvent} {readonly} {createdAtFormat} />
 {:else if originalTag !== undefined}
 	<NoteLink eventId={originalTag[1]} />
+{:else if originalAddressTag !== undefined && kindString !== undefined && pubkey !== undefined && identifier !== undefined}
+	<NaddrLink kind={Number(kindString)} {pubkey} {identifier} />
 {/if}
 
 <style>

web/src/stores/Events.ts

@@ -1,6 +1,8 @@
 import { writable, type Writable } from 'svelte/store';
 import type { Event } from '../routes/types';
+import type { Event as NostrEvent } from 'nostr-tools';
 
 export const events: Writable<Event[]> = writable([]);
 export const searchEvents: Writable<Event[]> = writable([]);
 export const cachedEvents: Writable<Map<string, Event>> = writable(new Map());
+export const cachedReplaceableEvents: Writable<Map<string, NostrEvent>> = writable(new Map());