feat: add enhanced support for kind:1111 comments

src/lib/draft-event.ts

@@ -177,11 +177,12 @@ export async function createCommentDraftEvent(
   const {
     quoteEventIds,
     rootEventId,
-    rootEventKind,
-    rootEventPubkey,
+    rootKind,
+    rootPubkey,
+    rootUrl,
     parentEventId,
-    parentEventKind,
-    parentEventPubkey
+    parentKind,
+    parentPubkey
   } = await extractCommentMentions(content, parentEvent)
   const hashtags = extractHashtags(content)
 
@@ -194,17 +195,29 @@ export async function createCommentDraftEvent(
     tags.push(...generateImetaTags(images))
   }
 
-  tags.push(
-    ...mentions.filter((pubkey) => pubkey !== parentEventPubkey).map((pubkey) => ['p', pubkey])
-  )
+  tags.push(...mentions.filter((pubkey) => pubkey !== parentPubkey).map((pubkey) => ['p', pubkey]))
+
+  if (rootEventId) {
+    tags.push(
+      rootPubkey
+        ? ['E', rootEventId, client.getEventHint(rootEventId), rootPubkey]
+        : ['E', rootEventId, client.getEventHint(rootEventId)]
+    )
+  }
+  if (rootPubkey) {
+    tags.push(['P', rootPubkey])
+  }
+  if (rootKind) {
+    tags.push(['K', rootKind.toString()])
+  }
+  if (rootUrl) {
+    tags.push(['I', rootUrl])
+  }
   tags.push(
     ...[
-      ['E', rootEventId, client.getEventHint(rootEventId), rootEventPubkey],
-      ['K', rootEventKind.toString()],
-      ['P', rootEventPubkey],
-      ['e', parentEventId, client.getEventHint(parentEventId), parentEventPubkey],
-      ['k', parentEventKind.toString()],
-      ['p', parentEventPubkey]
+      ['e', parentEventId, client.getEventHint(parentEventId), parentPubkey],
+      ['k', parentKind.toString()],
+      ['p', parentPubkey]
     ]
   )
 

src/lib/event.ts

@@ -26,6 +26,7 @@ export function isNsfwEvent(event: Event) {
 }
 
 export function isReplyNoteEvent(event: Event) {
+  if (event.kind === ExtendedKind.COMMENT) return true
   if (event.kind !== kinds.ShortTextNote) return false
 
   const cache = EVENT_IS_REPLY_NOTE_CACHE.get(event.id)
@@ -64,7 +65,12 @@ export function isSupportedKind(kind: number) {
 }
 
 export function getParentEventTag(event?: Event) {
-  if (!event) return undefined
+  if (!event || ![kinds.ShortTextNote, ExtendedKind.COMMENT].includes(event.kind)) return undefined
+
+  if (event.kind === ExtendedKind.COMMENT) {
+    return event.tags.find(tagNameEquals('e')) ?? event.tags.find(tagNameEquals('E'))
+  }
+
   let tag = event.tags.find(isReplyETag)
   if (!tag) {
     const embeddedEventIds = extractEmbeddedEventIds(event)
@@ -88,7 +94,12 @@ export function getParentEventId(event?: Event) {
 }
 
 export function getRootEventTag(event?: Event) {
-  if (!event) return undefined
+  if (!event || ![kinds.ShortTextNote, ExtendedKind.COMMENT].includes(event.kind)) return undefined
+
+  if (event.kind === ExtendedKind.COMMENT) {
+    return event.tags.find(tagNameEquals('E'))
+  }
+
   let tag = event.tags.find(isRootETag)
   if (!tag) {
     const embeddedEventIds = extractEmbeddedEventIds(event)
@@ -338,12 +349,32 @@ export async function extractRelatedEventIds(content: string, parentEvent?: Even
 
 export async function extractCommentMentions(content: string, parentEvent: Event) {
   const quoteEventIds: string[] = []
-  const rootEventId = parentEvent.tags.find(tagNameEquals('E'))?.[1] ?? parentEvent.id
-  const rootEventKind = parentEvent.tags.find(tagNameEquals('K'))?.[1] ?? parentEvent.kind
-  const rootEventPubkey = parentEvent.tags.find(tagNameEquals('P'))?.[1] ?? parentEvent.pubkey
+  let rootEventId =
+    parentEvent.kind === ExtendedKind.COMMENT
+      ? parentEvent.tags.find(tagNameEquals('E'))?.[1]
+      : parentEvent.id
+  let rootKind =
+    parentEvent.kind === ExtendedKind.COMMENT
+      ? parentEvent.tags.find(tagNameEquals('K'))?.[1]
+      : parentEvent.kind
+  let rootPubkey =
+    parentEvent.kind === ExtendedKind.COMMENT
+      ? parentEvent.tags.find(tagNameEquals('P'))?.[1]
+      : parentEvent.pubkey
+  const rootUrl =
+    parentEvent.kind === ExtendedKind.COMMENT
+      ? parentEvent.tags.find(tagNameEquals('I'))?.[1]
+      : undefined
+
+  if (parentEvent.kind === ExtendedKind.COMMENT && !rootEventId) {
+    rootEventId = parentEvent.id
+    rootKind = parentEvent.kind
+    rootPubkey = parentEvent.pubkey
+  }
+
   const parentEventId = parentEvent.id
-  const parentEventKind = parentEvent.kind
-  const parentEventPubkey = parentEvent.pubkey
+  const parentKind = parentEvent.kind
+  const parentPubkey = parentEvent.pubkey
 
   const addToSet = (arr: string[], item: string) => {
     if (!arr.includes(item)) arr.push(item)
@@ -367,11 +398,12 @@ export async function extractCommentMentions(content: string, parentEvent: Event
   return {
     quoteEventIds,
     rootEventId,
-    rootEventKind,
-    rootEventPubkey,
+    rootKind,
+    rootPubkey,
+    rootUrl,
     parentEventId,
-    parentEventKind,
-    parentEventPubkey
+    parentKind,
+    parentPubkey
   }
 }