Merge branch 'master' into feature/cleaned-my-notes

src/routes/publication/[type]/[identifier]/+layout.server.ts

@@ -1,23 +1,40 @@
 import { error } from "@sveltejs/kit";
 import type { LayoutServerLoad } from "./$types";
+import { fetchEventByDTag, fetchEventById, fetchEventByNaddr, fetchEventByNevent } from "../../../../lib/utils/websocket_utils.ts";
+import type { NostrEvent } from "../../../../lib/utils/websocket_utils.ts";
 
 export const load: LayoutServerLoad = async ({ params, url }) => {
   const { type, identifier } = params;
 
-  // Validate the identifier type for SSR
-  const validTypes = ['id', 'd', 'naddr', 'nevent'];
-  if (!validTypes.includes(type)) {
+  let indexEvent: NostrEvent;
+
+  // Handle different identifier types
+  switch (type) {
+    case 'id':
+      indexEvent = await fetchEventById(identifier);
+      break;
+    case 'd':
+      indexEvent = await fetchEventByDTag(identifier);
+      break;
+    case 'naddr':
+      indexEvent = await fetchEventByNaddr(identifier);
+      break;
+    case 'nevent':
+      indexEvent = await fetchEventByNevent(identifier);
+      break;
+    default:
       error(400, `Unsupported identifier type: ${type}`);
   }
 
-  // Provide basic metadata for SSR - actual fetching will happen on client
-  const title = "Alexandria Publication";
-  const summary = "Alexandria is a digital library, utilizing Nostr events for curated publications and wiki pages.";
-  const image = "/screenshots/old_books.jpg";
+  // Extract metadata for meta tags
+  const title = indexEvent.tags.find((tag) => tag[0] === "title")?.[1] || "Alexandria Publication";
+  const summary = indexEvent.tags.find((tag) => tag[0] === "summary")?.[1] || 
+    "Alexandria is a digital library, utilizing Nostr events for curated publications and wiki pages.";
+  const image = indexEvent.tags.find((tag) => tag[0] === "image")?.[1] || "/screenshots/old_books.jpg";
   const currentUrl = `${url.origin}${url.pathname}`;
 
   return {
-    indexEvent: null, // Will be fetched on client side
+    indexEvent,
     metadata: {
       title,
       summary,

src/routes/publication/[type]/[identifier]/+layout.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { browser } from "$app/environment";
   import type { LayoutProps } from "./$types";
 
   let { data, children }: LayoutProps = $props();
@@ -26,4 +27,6 @@
   <meta name="twitter:image" content={metadata.image} />
 </svelte:head>
 
+{#if browser}
   {@render children()}
+{/if}

src/routes/publication/[type]/[identifier]/+layout.ts

@@ -1,67 +1 @@
-import { error } from "@sveltejs/kit";
-import type { LayoutLoad } from "./$types";
-import { fetchEventByDTag, fetchEventById, fetchEventByNaddr, fetchEventByNevent } from "../../../../lib/utils/websocket_utils.ts";
-import type { NostrEvent } from "../../../../lib/utils/websocket_utils.ts";
-import { browser } from "$app/environment";
-
 export const ssr = true;
-
-export const load: LayoutLoad = async ({ params, url }) => {
-  const { type, identifier } = params;
-
-  // Only fetch on the client side where WebSocket is available
-  if (!browser) {
-    // Return basic metadata for SSR
-    return {
-      indexEvent: null,
-      metadata: {
-        title: "Alexandria Publication",
-        summary: "Alexandria is a digital library, utilizing Nostr events for curated publications and wiki pages.",
-        image: "/screenshots/old_books.jpg",
-        currentUrl: `${url.origin}${url.pathname}`,
-      },
-    };
-  }
-
-  let indexEvent: NostrEvent;
-
-  try {
-    // Handle different identifier types
-    switch (type) {
-      case 'id':
-        indexEvent = await fetchEventById(identifier);
-        break;
-      case 'd':
-        indexEvent = await fetchEventByDTag(identifier);
-        break;
-      case 'naddr':
-        indexEvent = await fetchEventByNaddr(identifier);
-        break;
-      case 'nevent':
-        indexEvent = await fetchEventByNevent(identifier);
-        break;
-      default:
-        error(400, `Unsupported identifier type: ${type}`);
-    }
-
-    // Extract metadata for meta tags
-    const title = indexEvent.tags.find((tag) => tag[0] === "title")?.[1] || "Alexandria Publication";
-    const summary = indexEvent.tags.find((tag) => tag[0] === "summary")?.[1] || 
-      "Alexandria is a digital library, utilizing Nostr events for curated publications and wiki pages.";
-    const image = indexEvent.tags.find((tag) => tag[0] === "image")?.[1] || "/screenshots/old_books.jpg";
-    const currentUrl = `${url.origin}${url.pathname}`;
-
-    return {
-      indexEvent,
-      metadata: {
-        title,
-        summary,
-        image,
-        currentUrl,
-      },
-    };
-  } catch (err) {
-    console.error('Failed to fetch publication:', err);
-    error(404, `Failed to load publication: ${err}`);
-  }
-};

src/routes/publication/[type]/[identifier]/+page.server.ts

@@ -1,18 +0,0 @@
-import { error } from "@sveltejs/kit";
-import type { PageServerLoad } from "./$types";
-
-export const load: PageServerLoad = async ({ params }) => {
-  const { type, identifier } = params;
-
-  // Validate the identifier type for SSR
-  const validTypes = ['id', 'd', 'naddr', 'nevent'];
-  if (!validTypes.includes(type)) {
-    error(400, `Unsupported identifier type: ${type}`);
-  }
-
-  // Provide basic data for SSR - actual fetching will happen on client
-  return {
-    publicationType: "", // Will be determined on client side
-    indexEvent: null, // Will be fetched on client side
-  };
-}; 

src/routes/publication/[type]/[identifier]/+page.ts

@@ -2,23 +2,12 @@ import { error } from "@sveltejs/kit";
 import type { PageLoad } from "./$types";
 import { fetchEventByDTag, fetchEventById, fetchEventByNaddr, fetchEventByNevent } from "../../../../lib/utils/websocket_utils.ts";
 import type { NostrEvent } from "../../../../lib/utils/websocket_utils.ts";
-import { browser } from "$app/environment";
 
 export const load: PageLoad = async ({ params }) => {
   const { type, identifier } = params;
 
-  // Only fetch on the client side where WebSocket is available
-  if (!browser) {
-    // Return basic data for SSR
-    return {
-      publicationType: "",
-      indexEvent: null,
-    };
-  }
+  let indexEvent: NostrEvent | null;
 
-  let indexEvent: NostrEvent;
-
-  try {
   // Handle different identifier types
   switch (type) {
     case 'id':
@@ -47,8 +36,4 @@ export const load: PageLoad = async ({ params }) => {
     publicationType,
     indexEvent,
   };
-  } catch (err) {
-    console.error('Failed to fetch publication:', err);
-    error(404, `Failed to load publication: ${err}`);
-  }
 };