From 750cc5ab66467d3874e0465d255b31a07173cbaa Mon Sep 17 00:00:00 2001
From: buttercat1791 <mjjurkoic@gmail.com>
Date: Sun, 15 Dec 2024 08:59:26 -0600
Subject: [PATCH] Use static routes for article viewer

---
 src/lib/components/ArticleHeader.svelte |  4 +--
 src/routes/article/+page.svelte         | 26 ---------------
 src/routes/d/[tag]/+page.svelte         | 20 ------------
 src/routes/d/[tag]/+page.ts             | 11 -------
 src/routes/publication/+page.svelte     | 42 +++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 59 deletions(-)
 delete mode 100644 src/routes/article/+page.svelte
 delete mode 100644 src/routes/d/[tag]/+page.svelte
 delete mode 100644 src/routes/d/[tag]/+page.ts
 create mode 100644 src/routes/publication/+page.svelte

diff --git a/src/lib/components/ArticleHeader.svelte b/src/lib/components/ArticleHeader.svelte
index 0e758cd..a5d054e 100644
--- a/src/lib/components/ArticleHeader.svelte
+++ b/src/lib/components/ArticleHeader.svelte
@@ -20,9 +20,9 @@
 
     const d = event.getMatchingTags('d')[0][1];
     if (d != null) {
-      href = `d/${d}`;
+      href = `publication?d=${d}`;
     } else {
-      href = neventEncode(event, relays);
+      href = `publication?id=${neventEncode(event, relays)}`;
     }
   } catch (e) {
     console.warn(e);
diff --git a/src/routes/article/+page.svelte b/src/routes/article/+page.svelte
deleted file mode 100644
index b49baf7..0000000
--- a/src/routes/article/+page.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts">
-  import { page } from '$app/stores';
-  import Article from '$lib/components/Article.svelte';
-  import { ndk } from '$lib/ndk';
-  import type { NDKEvent } from '@nostr-dev-kit/ndk';
-
-  const id = $page.url.searchParams.get('id');
-  let event: NDKEvent | null | undefined;
-
-  if (!id) {
-    // TODO: Redirect to 400 page.
-  }
-
-  $ndk.fetchEvent(id!)
-    .then(ev => {
-      event = ev;
-    })
-    .catch(err => {
-      console.error(err);
-      // TODO: Redirect to 404 page.
-    });
-</script>
-
-<main>
-	<Article index={event} />
-</main>
diff --git a/src/routes/d/[tag]/+page.svelte b/src/routes/d/[tag]/+page.svelte
deleted file mode 100644
index 5534c5c..0000000
--- a/src/routes/d/[tag]/+page.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-	import Article from '$lib/components/Article.svelte';
-  import { ndk } from '$lib/ndk';
-  import { TextPlaceholder } from 'flowbite-svelte';
-  import type { PageData } from './$types';
-
-  export let data: PageData;
-
-  const getIndexEvent = (d: string) => {
-    return $ndk.fetchEvent({ '#d': [d] });
-  };
-</script>
-
-<main>
-  {#await getIndexEvent(data.event.d)}
-    <TextPlaceholder size='xxl' />
-  {:then index}
-    <Article {index} />
-  {/await}
-</main>
diff --git a/src/routes/d/[tag]/+page.ts b/src/routes/d/[tag]/+page.ts
deleted file mode 100644
index 79712f2..0000000
--- a/src/routes/d/[tag]/+page.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { PageLoad } from './$types';
-
-export const load: PageLoad = async ({ params }) => {
-  const { tag } = params;
-
-  return {
-    event: {
-      d: tag,
-    }
-  };
-};
diff --git a/src/routes/publication/+page.svelte b/src/routes/publication/+page.svelte
new file mode 100644
index 0000000..0f288e6
--- /dev/null
+++ b/src/routes/publication/+page.svelte
@@ -0,0 +1,42 @@
+<script lang="ts">
+  import { page } from '$app/stores';
+  import Article from '$lib/components/Article.svelte';
+  import { ndk } from '$lib/ndk';
+  import type { NDKEvent } from '@nostr-dev-kit/ndk';
+  import { TextPlaceholder } from 'flowbite-svelte';
+
+  const id = $page.url.searchParams.get('id');
+  const dTag = $page.url.searchParams.get('d');
+
+  let event: NDKEvent | null | undefined;
+
+  if (id) {
+    $ndk.fetchEvent(id)
+      .then(ev => {
+        event = ev;
+      })
+      .catch(err => {
+        console.error(err);
+        // TODO: Redirect to 404 page.
+      });
+  } else if (dTag) {
+    $ndk.fetchEvent({ '#d': [dTag] })
+      .then(ev => {
+        event = ev;
+      })
+      .catch(err => {
+        console.error(err);
+        // TODO: Redirect to 404 page.
+      });
+  } else {
+    // TODO: Redirect to 400 page.
+  }
+</script>
+
+<main>
+  {#await event}
+    <TextPlaceholder size='xxl' />
+  {:then ev}
+    <Article index={ev} />
+  {/await}
+</main>