Use address for page param for replaceable events

src/app/util/notifications.ts

@@ -232,13 +232,13 @@ export const notifications = derived(
         }
       }
 
-      const commentsByClassifiedId = groupBy(
-        e => getTagValue("E", e.tags),
+      const commentsByClassifiedAddress = groupBy(
+        e => getTagValue("A", e.tags),
         classifiedComments.filter(spec({kind: COMMENT})),
       )
 
-      for (const [classifiedId, [comment]] of commentsByClassifiedId.entries()) {
-        const classifiedItemPath = makeClassifiedPath(url, classifiedId)
+      for (const [address, [comment]] of commentsByClassifiedAddress.entries()) {
+        const classifiedItemPath = makeClassifiedPath(url, address)
 
         if (hasNotification(classifiedPath, comment)) {
           paths.add(spacePathMobile)
@@ -250,13 +250,13 @@ export const notifications = derived(
         }
       }
 
-      const commentsByEventId = groupBy(
-        e => getTagValue("E", e.tags),
+      const commentsByEventAddress = groupBy(
+        e => getTagValue("A", e.tags),
         calendarComments.filter(spec({kind: COMMENT})),
       )
 
-      for (const [eventId, [comment]] of commentsByEventId.entries()) {
-        const calendarItemPath = makeCalendarPath(url, eventId)
+      for (const [address, [comment]] of commentsByEventAddress.entries()) {
+        const calendarItemPath = makeCalendarPath(url, address)
 
         if (hasNotification(calendarPath, comment)) {
           paths.add(spacePathMobile)

src/app/util/routes.ts

@@ -62,16 +62,13 @@ export const makeRoomPath = (url: string, h: string) => `/spaces/${encodeRelay(u
 
 export const makeSpaceChatPath = (url: string) => makeRoomPath(url, "chat")
 
-export const makeGoalPath = (url: string, eventId?: string) => makeSpacePath(url, "goals", eventId)
+export const makeGoalPath = (url: string, id?: string) => makeSpacePath(url, "goals", id)
 
-export const makeThreadPath = (url: string, eventId?: string) =>
-  makeSpacePath(url, "threads", eventId)
+export const makeThreadPath = (url: string, id?: string) => makeSpacePath(url, "threads", id)
 
-export const makeClassifiedPath = (url: string, eventId?: string) =>
-  makeSpacePath(url, "classifieds", eventId)
+export const makeClassifiedPath = (url: string, address?: string) => makeSpacePath(url, "classifieds", address)
 
-export const makeCalendarPath = (url: string, eventId?: string) =>
-  makeSpacePath(url, "calendar", eventId)
+export const makeCalendarPath = (url: string, address?: string) => makeSpacePath(url, "calendar", address)
 
 export const getPrimaryNavItem = ($page: Page) => $page.route?.id?.split("/")[1]
 
@@ -126,17 +123,18 @@ export const getEventPath = async (event: TrustedEvent, urls: string[]) => {
     }
 
     if (event.kind === CLASSIFIED) {
-      return makeClassifiedPath(url, event.id)
+      return makeClassifiedPath(url, getAddress(event))
     }
 
     if (event.kind === EVENT_TIME) {
-      return makeCalendarPath(url, event.id)
+      return makeCalendarPath(url, getAddress(event))
     }
 
     if (event.kind === MESSAGE) {
       return h ? makeRoomPath(url, h) : makeSpacePath(url, "chat")
     }
 
+    const address = event.tags.find(nthEq(0, "A"))?.[1]
     const kind = event.tags.find(nthEq(0, "K"))?.[1]
     const id = event.tags.find(nthEq(0, "E"))?.[1]
 
@@ -149,18 +147,21 @@ export const getEventPath = async (event: TrustedEvent, urls: string[]) => {
         return makeThreadPath(url, id)
       }
 
-      if (parseInt(kind) === CLASSIFIED) {
-        return makeClassifiedPath(url, id)
-      }
-
-      if (parseInt(kind) === EVENT_TIME) {
-        return makeCalendarPath(url, id)
-      }
-
       if (parseInt(kind) === MESSAGE) {
         return h ? makeRoomPath(url, h) : makeSpacePath(url, "chat")
       }
     }
+
+    if (address && kind) {
+      if (parseInt(kind) === CLASSIFIED) {
+        return makeClassifiedPath(url, address)
+      }
+
+      if (parseInt(kind) === EVENT_TIME) {
+        return makeCalendarPath(url, address)
+      }
+
+    }
   }
 
   return entityLink(nip19.neventEncode({id: event.id, relays: urls}))
@@ -171,10 +172,10 @@ export const getRoomItemPath = (url: string, event: TrustedEvent) => {
     case THREAD:
       return makeThreadPath(url, event.id)
     case CLASSIFIED:
-      return makeClassifiedPath(url, event.id)
+      return makeClassifiedPath(url, getAddress(event))
     case ZAP_GOAL:
       return makeGoalPath(url, event.id)
     case EVENT_TIME:
-      return makeCalendarPath(url, event.id)
+      return makeCalendarPath(url, getAddress(event))
   }
 }