From ff0a6465026c6bd36ed391d6add0ef0d91aa3a6d Mon Sep 17 00:00:00 2001
From: buttercat1791 <mjjurkoic@gmail.com>
Date: Fri, 23 Aug 2024 08:35:02 -0500
Subject: Allow d tag-based routing from main feed

---
 src/lib/ArticleHeader.svelte | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lib/ArticleHeader.svelte b/src/lib/ArticleHeader.svelte
index af64e6e..9ab919c 100644
--- a/src/lib/ArticleHeader.svelte
+++ b/src/lib/ArticleHeader.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import { page } from "$app/stores";
   import { neventEncode } from "$lib/utils";
   import type { NDKEvent } from "@nostr-dev-kit/ndk";
   import { standardRelays } from "./consts";
-  import { idList } from "$lib/stores";
   import { Card, Button, Modal, Tooltip } from "flowbite-svelte";
   import { ClipboardCheckOutline, ClipboardCleanOutline, CodeOutline, ShareNodesOutline } from "flowbite-svelte-icons";
   import { ndk } from "./ndk";
@@ -10,25 +10,24 @@
   export let event: NDKEvent;
 
   let title: string;
+  let author: string;
   let href: string;
 
-  try {
+  $: try {
     const relays = $ndk.activeUser?.relayUrls ?? standardRelays;
     title = event.getMatchingTags('title')[0][1];
-    href = neventEncode(event, relays);
+    author = event.getMatchingTags('author')[0][1];
+
+    const d = event.getMatchingTags('d')[0][1];
+    if (d != null) {
+      href = `d/${d}`;
+    } else {
+      href = neventEncode(event, relays);
+    }
   } catch (e) {
     console.warn(e);
   }
 
-  const handleSendEvents = () => {
-    $idList = [];
-    for (const id of event.tags
-      .filter((tag) => tag[0] === "e")
-      .map((tag) => tag[1])) {
-      $idList = [...$idList, id];
-    }
-  };
-
   let eventIdCopied: boolean = false;
   function copyEventId() {
     console.debug("copyEventID");
@@ -63,8 +62,9 @@
 {#if title != null && href != null}
   <Card class='ArticleBox card-leather w-lg'>
     <div class='flex flex-col space-y-4'>
-      <a href="/{href}" on:click={handleSendEvents}>
-        <h2>{title}</h2>
+      <a href="/{href}" class='flex flex-col space-y-2'>
+        <h2 class='text-lg font-bold'>{title}</h2>
+        <h3 class='text-base font-normal'>by {author}</h3>
       </a>
       <div class='w-full flex space-x-2 justify-end'>
         <Button class='btn-leather' size='xs' on:click={shareNjump}><ShareNodesOutline /></Button>
-- 
cgit