Add root identifier plumbing to modal comments

js/services/commentThreadService.js

@@ -24,6 +24,13 @@ function normalizeString(value) {
   return typeof value === "string" ? value.trim() : "";
 }
 
+function normalizeRelay(value) {
+  if (typeof value === "string") {
+    return value.trim();
+  }
+  return "";
+}
+
 function normalizePubkey(pubkey) {
   const normalized = normalizeString(pubkey);
   return normalized ? normalized.toLowerCase() : "";
@@ -132,6 +139,8 @@ export default class CommentThreadService {
     this.videoKind = "";
     this.videoAuthorPubkeyRaw = "";
     this.videoAuthorPubkey = "";
+    this.videoRootIdentifier = "";
+    this.videoRootRelay = "";
     this.parentCommentId = "";
     this.parentCommentKind = "";
     this.parentCommentPubkey = "";
@@ -182,6 +191,10 @@ export default class CommentThreadService {
     this.videoKind = normalizeKind(video?.kind);
     this.videoAuthorPubkeyRaw = rawVideoAuthorPubkey;
     this.videoAuthorPubkey = normalizePubkey(rawVideoAuthorPubkey);
+    this.videoRootIdentifier = normalizeString(video?.videoRootId);
+    this.videoRootRelay = normalizeRelay(
+      video?.videoRootRelay || video?.rootIdentifierRelay,
+    );
     this.parentCommentId = normalizeString(parentCommentId);
     this.parentCommentKind = this.parentCommentId ? String(COMMENT_EVENT_KIND) : "";
     this.parentCommentPubkey = "";
@@ -213,6 +226,12 @@ export default class CommentThreadService {
     if (this.videoKind) {
       target.videoKind = this.videoKind;
     }
+    if (this.videoRootIdentifier) {
+      target.rootIdentifier = this.videoRootIdentifier;
+    }
+    if (this.videoRootRelay) {
+      target.rootIdentifierRelay = this.videoRootRelay;
+    }
     const targetVideoAuthorPubkey = this.getVideoAuthorPubkeyForOutput();
     if (targetVideoAuthorPubkey) {
       target.videoAuthorPubkey = targetVideoAuthorPubkey;
@@ -563,6 +582,14 @@ export default class CommentThreadService {
     const parentKey = toParentKey(parentId);
     const createdAt = Number.isFinite(event.created_at) ? event.created_at : 0;
     const pubkey = normalizePubkey(event.pubkey);
+    const { identifier: rootIdentifier, relay: rootRelay } =
+      this.extractRootIdentifier(event);
+    if (rootIdentifier) {
+      this.videoRootIdentifier = rootIdentifier;
+      if (rootRelay) {
+        this.videoRootRelay = rootRelay;
+      }
+    }
     if (this.parentCommentId && eventId === this.parentCommentId) {
       const kindValue = normalizeKind(event.kind);
       if (kindValue) {
@@ -627,6 +654,29 @@ export default class CommentThreadService {
     return "";
   }
 
+  extractRootIdentifier(event) {
+    const tags = Array.isArray(event?.tags) ? event.tags : [];
+    for (let index = tags.length - 1; index >= 0; index -= 1) {
+      const tag = tags[index];
+      if (!Array.isArray(tag) || tag.length < 2) {
+        continue;
+      }
+      const name = typeof tag[0] === "string" ? tag[0].trim() : "";
+      if (name !== "I") {
+        continue;
+      }
+      const value = normalizeString(tag[1]);
+      if (!value) {
+        continue;
+      }
+      return {
+        identifier: value,
+        relay: normalizeRelay(tag[2]),
+      };
+    }
+    return { identifier: "", relay: "" };
+  }
+
   insertIntoParentList(parentKey, eventId, createdAt) {
     const list = this.getParentList(parentKey);
     if (list.includes(eventId)) {
@@ -782,6 +832,8 @@ export default class CommentThreadService {
       videoDefinitionAddress: this.videoAddressPointer || null,
       videoKind: this.videoKind || null,
       videoAuthorPubkey: this.getVideoAuthorPubkeyForOutput() || null,
+      rootIdentifier: this.videoRootIdentifier || null,
+      rootIdentifierRelay: this.videoRootRelay || null,
       parentCommentKind: this.parentCommentKind || null,
       parentCommentPubkey: this.parentCommentPubkey || null,
       topLevelIds: this.getCommentIdsForParent(null),
@@ -800,6 +852,8 @@ export default class CommentThreadService {
       videoDefinitionAddress: this.videoAddressPointer || null,
       videoKind: this.videoKind || null,
       videoAuthorPubkey: this.getVideoAuthorPubkeyForOutput() || null,
+      rootIdentifier: this.videoRootIdentifier || null,
+      rootIdentifierRelay: this.videoRootRelay || null,
       parentCommentKind: this.parentCommentKind || null,
       parentCommentPubkey: this.parentCommentPubkey || null,
       commentIds: [eventId],
@@ -825,6 +879,8 @@ export default class CommentThreadService {
       videoDefinitionAddress: this.videoAddressPointer || null,
       videoKind: this.videoKind || null,
       videoAuthorPubkey: this.getVideoAuthorPubkeyForOutput() || null,
+      rootIdentifier: this.videoRootIdentifier || null,
+      rootIdentifierRelay: this.videoRootRelay || null,
       parentCommentKind: this.parentCommentKind || null,
       parentCommentPubkey: this.parentCommentPubkey || null,
       commentsById: this.cloneCommentsMap(),

js/ui/videoModalCommentController.js

@@ -8,6 +8,13 @@ function normalizeString(value) {
   return typeof value === "string" ? value.trim() : "";
 }
 
+function normalizeRelay(value) {
+  if (typeof value === "string") {
+    return value.trim();
+  }
+  return "";
+}
+
 function normalizeKind(value) {
   if (Number.isFinite(value)) {
     return String(Math.floor(value));
@@ -86,6 +93,8 @@ export default class VideoModalCommentController {
       videoDefinitionAddress: null,
       videoKind: null,
       videoAuthorPubkey: null,
+      videoRootId: null,
+      videoRootRelay: null,
       parentCommentId: null,
       parentCommentKind: null,
       parentCommentPubkey: null,
@@ -152,6 +161,10 @@ export default class VideoModalCommentController {
     }
     const videoKind = normalizeKind(video.kind);
     const videoAuthorPubkey = normalizeString(video.pubkey);
+    const videoRootId = normalizeString(video.videoRootId);
+    const videoRootRelay = normalizeRelay(
+      video.videoRootRelay || video.rootIdentifierRelay,
+    );
 
     if (!videoEventId) {
       this.resetModalCommentState({ hide: false });
@@ -166,6 +179,8 @@ export default class VideoModalCommentController {
       videoDefinitionAddress: videoDefinitionAddress || null,
       videoKind: videoKind || null,
       videoAuthorPubkey: videoAuthorPubkey || null,
+      videoRootId: videoRootId || null,
+      videoRootRelay: videoRootRelay || null,
       parentCommentId: null,
       parentCommentKind: null,
       parentCommentPubkey: null,
@@ -248,6 +263,8 @@ export default class VideoModalCommentController {
       videoDefinitionAddress: null,
       videoKind: null,
       videoAuthorPubkey: null,
+      videoRootId: null,
+      videoRootRelay: null,
       parentCommentId: null,
       parentCommentKind: null,
       parentCommentPubkey: null,
@@ -354,6 +371,14 @@ export default class VideoModalCommentController {
     if (snapshotVideoAuthor) {
       this.modalCommentState.videoAuthorPubkey = snapshotVideoAuthor;
     }
+    const snapshotRootIdentifier = normalizeString(snapshot.rootIdentifier);
+    if (snapshotRootIdentifier) {
+      this.modalCommentState.videoRootId = snapshotRootIdentifier;
+    }
+    const snapshotRootRelay = normalizeRelay(snapshot.rootIdentifierRelay);
+    if (snapshotRootRelay) {
+      this.modalCommentState.videoRootRelay = snapshotRootRelay;
+    }
     const snapshotParentKind = normalizeKind(snapshot.parentCommentKind);
     if (snapshotParentKind) {
       this.modalCommentState.parentCommentKind = snapshotParentKind;
@@ -384,6 +409,15 @@ export default class VideoModalCommentController {
       this.modalCommentProfiles.set(pubkey, profile);
     });
 
+    const payloadRootIdentifier = normalizeString(payload.rootIdentifier);
+    if (payloadRootIdentifier) {
+      this.modalCommentState.videoRootId = payloadRootIdentifier;
+    }
+    const payloadRootRelay = normalizeRelay(payload.rootIdentifierRelay);
+    if (payloadRootRelay) {
+      this.modalCommentState.videoRootRelay = payloadRootRelay;
+    }
+
     const commentIds = Array.isArray(payload.commentIds)
       ? payload.commentIds
       : [];
@@ -520,6 +554,8 @@ export default class VideoModalCommentController {
     return {
       videoEventId: snapshot.videoEventId,
       parentCommentId: snapshot.parentCommentId || null,
+      rootIdentifier: snapshot.rootIdentifier || null,
+      rootIdentifierRelay: snapshot.rootIdentifierRelay || null,
       commentsById: sanitizedComments,
       childrenByParent: sanitizedChildren,
       profiles: this.modalCommentProfiles,
@@ -575,6 +611,11 @@ export default class VideoModalCommentController {
       this.modalCommentState.videoKind || normalizeKind(video.kind);
     const videoAuthorPubkey =
       this.modalCommentState.videoAuthorPubkey || normalizeString(video.pubkey);
+    const videoRootId =
+      this.modalCommentState.videoRootId || normalizeString(video.videoRootId);
+    const videoRootRelay =
+      this.modalCommentState.videoRootRelay ||
+      normalizeRelay(video.videoRootRelay || video.rootIdentifierRelay);
 
     if (!videoEventId) {
       this.callbacks.showError("Comments are unavailable for this video.");
@@ -632,6 +673,12 @@ export default class VideoModalCommentController {
       publishPayload.videoAuthorPubkey = videoAuthorPubkey;
       publishPayload.rootAuthorPubkey = videoAuthorPubkey;
     }
+    if (videoRootId) {
+      publishPayload.rootIdentifier = videoRootId;
+    }
+    if (videoRootRelay) {
+      publishPayload.rootIdentifierRelay = videoRootRelay;
+    }
     if (parentCommentKind) {
       publishPayload.parentCommentKind = parentCommentKind;
     }