From 84d54008722caefe811b664bc6da472a82b1c2cd Mon Sep 17 00:00:00 2001
From: en <enes@nostrdev.com>
Date: Fri, 14 Feb 2025 19:16:24 +0100
Subject: [PATCH] fix(feed): event links

---
 src/components/comment/Comment.tsx       | 62 ++++++++++++------------
 src/components/comment/CommentsPopup.tsx |  7 ++-
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/components/comment/Comment.tsx b/src/components/comment/Comment.tsx
index 25cf56d..44fcdd7 100644
--- a/src/components/comment/Comment.tsx
+++ b/src/components/comment/Comment.tsx
@@ -3,7 +3,12 @@ import { formatDate } from 'date-fns'
 import { useDidMount, useNDKContext } from 'hooks'
 import { useState } from 'react'
 import { useParams, useLocation, Link } from 'react-router-dom'
-import { getModPageRoute, getBlogPageRoute, getProfilePageRoute } from 'routes'
+import {
+  getModPageRoute,
+  getBlogPageRoute,
+  getProfilePageRoute,
+  appRoutes
+} from 'routes'
 import { CommentEvent, UserProfile } from 'types'
 import { hexToNpub } from 'utils'
 import { Reactions } from './Reactions'
@@ -20,12 +25,15 @@ export const Comment = ({ comment }: CommentProps) => {
   const { ndk } = useNDKContext()
   const isMod = location.pathname.includes('/mod/')
   const isBlog = location.pathname.includes('/blog/')
+  const isNote = location.pathname.includes('/feed')
   const baseUrl = naddr
     ? isMod
       ? getModPageRoute(naddr)
       : isBlog
       ? getBlogPageRoute(naddr)
       : undefined
+    : isNote
+    ? `${appRoutes.feed}/`
     : undefined
   const [commentEvents, setCommentEvents] = useState<CommentEvent[]>([])
   const [profile, setProfile] = useState<UserProfile>()
@@ -121,35 +129,29 @@ export const Comment = ({ comment }: CommentProps) => {
           {typeof profile?.lud16 !== 'undefined' && profile.lud16 !== '' && (
             <Zap {...comment.event.rawEvent()} />
           )}
-          {comment.event.kind === NDKKind.GenericReply && (
-            <>
-              <Link
-                className='IBMSMSMBSSCL_CAElement IBMSMSMBSSCL_CAEReplies'
-                to={baseUrl + comment.event.encode()}
-              >
-                <svg
-                  xmlns='http://www.w3.org/2000/svg'
-                  viewBox='0 0 512 512'
-                  width='1em'
-                  height='1em'
-                  fill='currentColor'
-                  className='IBMSMSMBSSCL_CAElementIcon'
-                >
-                  <path d='M256 32C114.6 32 .0272 125.1 .0272 240c0 49.63 21.35 94.98 56.97 130.7c-12.5 50.37-54.27 95.27-54.77 95.77c-2.25 2.25-2.875 5.734-1.5 8.734C1.979 478.2 4.75 480 8 480c66.25 0 115.1-31.76 140.6-51.39C181.2 440.9 217.6 448 256 448c141.4 0 255.1-93.13 255.1-208S397.4 32 256 32z'></path>
-                </svg>
-                <p className='IBMSMSMBSSCL_CAElementText'>
-                  {commentEvents.length}
-                </p>
-                <p className='IBMSMSMBSSCL_CAElementText'>Replies</p>
-              </Link>
-              <Link
-                className='IBMSMSMBSSCL_CAElement IBMSMSMBSSCL_CAEReply'
-                to={baseUrl + comment.event.encode()}
-              >
-                <p className='IBMSMSMBSSCL_CAElementText'>Reply</p>
-              </Link>
-            </>
-          )}
+          <Link
+            className='IBMSMSMBSSCL_CAElement IBMSMSMBSSCL_CAEReplies'
+            to={baseUrl + comment.event.encode()}
+          >
+            <svg
+              xmlns='http://www.w3.org/2000/svg'
+              viewBox='0 0 512 512'
+              width='1em'
+              height='1em'
+              fill='currentColor'
+              className='IBMSMSMBSSCL_CAElementIcon'
+            >
+              <path d='M256 32C114.6 32 .0272 125.1 .0272 240c0 49.63 21.35 94.98 56.97 130.7c-12.5 50.37-54.27 95.27-54.77 95.77c-2.25 2.25-2.875 5.734-1.5 8.734C1.979 478.2 4.75 480 8 480c66.25 0 115.1-31.76 140.6-51.39C181.2 440.9 217.6 448 256 448c141.4 0 255.1-93.13 255.1-208S397.4 32 256 32z'></path>
+            </svg>
+            <p className='IBMSMSMBSSCL_CAElementText'>{commentEvents.length}</p>
+            <p className='IBMSMSMBSSCL_CAElementText'>Replies</p>
+          </Link>
+          <Link
+            className='IBMSMSMBSSCL_CAElement IBMSMSMBSSCL_CAEReply'
+            to={baseUrl + comment.event.encode()}
+          >
+            <p className='IBMSMSMBSSCL_CAElementText'>Reply</p>
+          </Link>
         </div>
       </div>
     </div>
diff --git a/src/components/comment/CommentsPopup.tsx b/src/components/comment/CommentsPopup.tsx
index 662923b..9a89119 100644
--- a/src/components/comment/CommentsPopup.tsx
+++ b/src/components/comment/CommentsPopup.tsx
@@ -33,17 +33,16 @@ export const CommentsPopup = () => {
   useBodyScrollDisable(true)
   const isMod = location.pathname.includes('/mod/')
   const isBlog = location.pathname.includes('/blog/')
-  const isNote = location.pathname.includes('/feed/')
+  const isNote = location.pathname.includes('/feed')
   const baseUrl = naddr
     ? isMod
       ? getModPageRoute(naddr)
       : isBlog
       ? getBlogPageRoute(naddr)
-      : isNote
-      ? appRoutes.feed
       : undefined
+    : isNote
+    ? `${appRoutes.feed}/`
     : undefined
-
   const { event } = useLoaderData() as CommentsLoaderResult
   const {
     size,