From 8b8d1e625545bfe93691dec893f528f9a8d6ba0b Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Sat, 25 Mar 2023 23:13:14 +0000
Subject: [PATCH] fix NostrLink element note links

---
 packages/app/src/Element/NostrLink.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/Element/NostrLink.tsx b/packages/app/src/Element/NostrLink.tsx
index 69d0499..cdb8151 100644
--- a/packages/app/src/Element/NostrLink.tsx
+++ b/packages/app/src/Element/NostrLink.tsx
@@ -1,8 +1,8 @@
-import { encodeTLV, NostrPrefix } from "@snort/nostr";
+import { NostrPrefix } from "@snort/nostr";
 import { Link } from "react-router-dom";
 
 import Mention from "Element/Mention";
-import { parseNostrLink } from "Util";
+import { eventLink, parseNostrLink } from "Util";
 
 export default function NostrLink({ link }: { link: string }) {
   const nav = parseNostrLink(link);
@@ -10,11 +10,10 @@ export default function NostrLink({ link }: { link: string }) {
   if (nav?.type === NostrPrefix.PublicKey || nav?.type === NostrPrefix.Profile) {
     return <Mention pubkey={nav.id} relays={nav.relays} />;
   } else if (nav?.type === NostrPrefix.Note || nav?.type === NostrPrefix.Event) {
-    // translate all "event" links to nevent
-    const evLink = encodeTLV(nav.id, NostrPrefix.Event, nav.relays);
+    const evLink = eventLink(nav.id, nav.relays);
     return (
-      <Link to={`/e/${evLink}`} onClick={e => e.stopPropagation()} state={{ from: location.pathname }}>
-        #{evLink.substring(0, 12)}
+      <Link to={evLink} onClick={e => e.stopPropagation()} state={{ from: location.pathname }}>
+        #{evLink.split("/").at(-1)?.substring(0, 12)}
       </Link>
     );
   } else {