fix(ci): resolve nostr-tools v2 compatibility and VideoModal regressions

- Fix `nostr-tools` v2 compatibility:
  - Update `js/nostr/adapters/nsecAdapter.js` to convert hex private keys to `Uint8Array` before passing to `getPublicKey`.
  - Update `js/nostr/nip46Client.js` to ensure keys are bytes for `getPublicKey`.
  - Update `tests/nostr/nip46Client.test.js` and `tests/nostr-private-key-signer.test.mjs` to use `Uint8Array` for keys.
- Fix `VideoModal` regressions:
  - Add missing delegation methods (`setCommentsVisibility`, `clearComments`, `resetCommentComposer`, `setCommentStatus`, `setCommentComposerState`, `appendComment`, `renderComments`, `setCommentSectionCallbacks`, `hideCommentsDisabledMessage`, `showCommentsDisabledMessage`, `updateCommentCharCount`, `updateCommentSubmitState`) to `js/ui/components/VideoModal.js`.
  - Expose getters for `commentsList`, `commentsComposer`, etc., in `VideoModal.js` to support tests.
  - Implement `setCallbacks` in `js/ui/components/video-modal/commentsController.js` and ensure robust initialization when DOM elements are missing.
  - Fix `open()` and `updateSourceAvailability()` in `VideoModal.js` to correctly re-enable Share, Embed, and Copy Magnet buttons.
- Fix `DeleteModal` tests to comply with linting rules (avoid direct `.style` assignment).

Co-authored-by: PR0M3TH3AN <[email protected]>

js/nostr/adapters/nsecAdapter.js

@@ -31,7 +31,15 @@ async function resolvePublicKey(privateKey, pubkey) {
 
   const tools = (await ensureNostrTools()) || getCachedNostrTools();
   if (tools?.getPublicKey && typeof tools.getPublicKey === "function") {
-    const derived = tools.getPublicKey(privateKey);
+    let input = privateKey;
+    if (typeof input === "string" && tools.utils?.hexToBytes) {
+      try {
+        input = tools.utils.hexToBytes(input);
+      } catch (error) {
+        // Fallback to string if conversion fails
+      }
+    }
+    const derived = tools.getPublicKey(input);
     const normalized = normalizeActorKey(derived);
     if (normalized && HEX64_REGEX.test(normalized)) {
       return normalized;

js/ui/components/VideoModal.js

@@ -790,9 +790,100 @@ export class VideoModal {
     this.setGlobalModalState("player", true);
     this.applyLoadingPoster();
     this.updateSourceAvailability(this.activeVideo);
+    this.setShareEnabled(!!this.activeVideo);
+    this.setEmbedEnabled(!!this.activeVideo);
+    this.updateSourceAvailability(this.activeVideo);
     this.refreshActiveVideoModeration({ video: this.activeVideo });
   }
 
+  setCommentSectionCallbacks(callbacks) {
+    this.commentsController.setCallbacks(callbacks);
+  }
+
+  hideCommentsDisabledMessage() {
+    this.commentsController.hideCommentsDisabledMessage();
+  }
+
+  showCommentsDisabledMessage(message) {
+    this.commentsController.showCommentsDisabledMessage(message);
+  }
+
+  setCommentsVisibility(visible) {
+    this.commentsController.setCommentsVisibility(visible);
+  }
+
+  clearComments() {
+    this.commentsController.clearComments();
+  }
+
+  resetCommentComposer() {
+    this.commentsController.resetCommentComposer();
+  }
+
+  setCommentStatus(message, type) {
+    this.commentsController.setCommentStatus(message, type);
+  }
+
+  setCommentComposerState(state) {
+    this.commentsController.setCommentComposerState(state);
+  }
+
+  appendComment(comment) {
+    this.commentsController.appendComment(comment);
+  }
+
+  renderComments(snapshot) {
+    this.commentsController.renderComments(snapshot);
+  }
+
+  updateCommentCharCount() {
+    this.commentsController.updateCommentCharCount();
+  }
+
+  updateCommentSubmitState() {
+    this.commentsController.updateCommentSubmitState();
+  }
+
+  get commentsList() {
+    return this.commentsController.commentsList;
+  }
+
+  get commentsComposer() {
+    return this.commentsController.commentsComposer;
+  }
+
+  get commentsInput() {
+    return this.commentsController.commentsInput;
+  }
+
+  get commentsSubmitButton() {
+    return this.commentsController.commentsSubmitButton;
+  }
+
+  get commentsStatusMessage() {
+    return this.commentsController.commentsStatusMessage;
+  }
+
+  get commentRetryButton() {
+    return this.commentsController.commentRetryButton;
+  }
+
+  get commentsDisabledPlaceholder() {
+    return this.commentsController.commentsDisabledPlaceholder;
+  }
+
+  get commentComposerHint() {
+    return this.commentsController.commentComposerHint;
+  }
+
+  get commentComposerDefaultHint() {
+    return this.commentsController.commentComposerDefaultHint;
+  }
+
+  get commentComposerState() {
+    return this.commentsController.commentComposerState;
+  }
+
   /**
    * Closes the modal, pauses playback, clears active state, and restores focus.
    * This is the primary cleanup method when dismissing the modal.
@@ -3063,14 +3154,15 @@ export class VideoModal {
     if (!video) return;
 
     const hasUrl = !!video.url;
-    const hasMagnet = !!video.magnet || !!video.infoHash;
+    const hasMagnet = !!video.magnet || !!video.originalMagnet || !!video.infoHash;
 
     if (this.sourceToggleContainer) {
-        // Simple logic: if both, show toggles. If only one, maybe hide or disable?
-        // For now, just ensuring it doesn't crash.
-        const showToggles = hasUrl && hasMagnet;
-        this.sourceToggleContainer.hidden = !showToggles;
+      // Simple logic: if both, show toggles.
+      const showToggles = hasUrl && hasMagnet;
+      this.sourceToggleContainer.hidden = !showToggles;
     }
+
+    this.setCopyEnabled(hasMagnet);
   }
 
   updateSourceToggleState(activeSource) {

js/ui/components/video-modal/commentsController.js

@@ -57,7 +57,7 @@ export class CommentsController {
   }
 
   get commentsList() {
-      return this.renderer?.listRoot;
+      return this.renderer?.listRoot || this.commentsRoot?.querySelector("[data-comments-list]") || null;
   }
 
   dispatch(type, detail, options) {
@@ -154,12 +154,15 @@ export class CommentsController {
       logger.user.warn(
         `[VideoModal:comments] Missing required selectors: ${missingSelectors.join(", ")}; disabling comments UI`
       );
+      // Ensure missing elements (like submit button) don't crash when setCommentComposerState tries to access them
       this.disableComments({
         reason: "missing-selectors",
         message: this.commentsDisabledPlaceholderDefaultText ||
           "Comments are unavailable right now.",
       });
-      return;
+      // Do not return here - allow controller to be partially initialized so that
+      // load/teardown methods don't crash when called by the modal.
+      // Just ensure we don't try to use null references in critical paths.
     }
 
     if (this.playerModal) {
@@ -172,6 +175,9 @@ export class CommentsController {
       if (hintText) {
         this.commentComposerDefaultHint = hintText;
       }
+    } else {
+        // Fallback for tests or missing DOM
+        this.commentComposerDefaultHint = "Log in to add a comment.";
     }
 
     if (this.commentsCharCount) {
@@ -208,6 +214,12 @@ export class CommentsController {
     this.attachCommentEventHandlers();
   }
 
+  setCallbacks({ teardown } = {}) {
+    if (teardown) {
+      this.commentCallbacks.teardown = typeof teardown === "function" ? teardown : null;
+    }
+  }
+
   attachCommentEventHandlers() {
     if (this.commentsComposer && this.boundCommentSubmitHandler) {
       this.commentsComposer.addEventListener(
@@ -506,11 +518,6 @@ export class CommentsController {
     this.updateCommentSubmitState();
   }
 
-  setCommentSectionCallbacks({ teardown = null } = {}) {
-    this.commentCallbacks.teardown =
-      typeof teardown === "function" ? teardown : null;
-  }
-
   invokeCommentTeardown() {
     const teardown = this.commentCallbacks.teardown;
     if (typeof teardown !== "function") {

tests/nostr/nip46Client.test.js

@@ -23,10 +23,12 @@ test("Nip46RpcClient encrypts payloads with nip44 conversation keys", async () =
     Nip46RpcClient,
   } = await loadNip46Module();
 
-  const clientSecret = utils.bytesToHex(generateSecretKey());
-  const remoteSecret = utils.bytesToHex(generateSecretKey());
-  const clientPublicKey = getPublicKey(clientSecret);
-  const remotePubkey = getPublicKey(remoteSecret);
+  const clientSecretBytes = generateSecretKey();
+  const clientSecret = utils.bytesToHex(clientSecretBytes);
+  const remoteSecretBytes = generateSecretKey();
+  const remoteSecret = utils.bytesToHex(remoteSecretBytes);
+  const clientPublicKey = getPublicKey(clientSecretBytes);
+  const remotePubkey = getPublicKey(remoteSecretBytes);
 
   const rpcClient = new Nip46RpcClient({
     nostrClient: { relays: [] },
@@ -43,8 +45,8 @@ test("Nip46RpcClient encrypts payloads with nip44 conversation keys", async () =
 
   const conversationKey =
     typeof nip44.v2.getConversationKey === "function"
-      ? nip44.v2.getConversationKey(clientSecret, remotePubkey)
-      : nip44.v2.utils.getConversationKey(clientSecret, remotePubkey);
+      ? nip44.v2.getConversationKey(clientSecretBytes, remotePubkey)
+      : nip44.v2.utils.getConversationKey(clientSecretBytes, remotePubkey);
   const decryptedWithTools = nip44.v2.decrypt(ciphertext, conversationKey);
   assert.equal(
     decryptedWithTools,
@@ -69,15 +71,17 @@ test("decryptNip46PayloadWithKeys handles nip44.v2 ciphertext", async () => {
   const { generateSecretKey, getPublicKey, nip44, utils } = nostrTools;
   const { decryptNip46PayloadWithKeys } = await loadNip46Module();
 
-  const clientSecret = utils.bytesToHex(generateSecretKey());
-  const remoteSecret = utils.bytesToHex(generateSecretKey());
-  const remotePubkey = getPublicKey(remoteSecret);
+  const clientSecretBytes = generateSecretKey();
+  const clientSecret = utils.bytesToHex(clientSecretBytes);
+  const remoteSecretBytes = generateSecretKey();
+  const remoteSecret = utils.bytesToHex(remoteSecretBytes);
+  const remotePubkey = getPublicKey(remoteSecretBytes);
 
   const serialized = JSON.stringify({ message: "hello", count: 42 });
   const conversationKey =
     typeof nip44.v2.getConversationKey === "function"
-      ? nip44.v2.getConversationKey(clientSecret, remotePubkey)
-      : nip44.v2.utils.getConversationKey(clientSecret, remotePubkey);
+      ? nip44.v2.getConversationKey(clientSecretBytes, remotePubkey)
+      : nip44.v2.utils.getConversationKey(clientSecretBytes, remotePubkey);
   const ciphertext = nip44.v2.encrypt(serialized, conversationKey);
 
   const { plaintext, algorithm } = await decryptNip46PayloadWithKeys(
@@ -102,15 +106,17 @@ test("decryptNip46PayloadWithKeys coerces structured handshake payloads", async
     normalizeNip46CiphertextPayload,
   } = await loadNip46Module();
 
-  const clientSecret = utils.bytesToHex(generateSecretKey());
-  const remoteSecret = utils.bytesToHex(generateSecretKey());
-  const remotePubkey = getPublicKey(remoteSecret);
+  const clientSecretBytes = generateSecretKey();
+  const clientSecret = utils.bytesToHex(clientSecretBytes);
+  const remoteSecretBytes = generateSecretKey();
+  const remoteSecret = utils.bytesToHex(remoteSecretBytes);
+  const remotePubkey = getPublicKey(remoteSecretBytes);
 
   const serialized = JSON.stringify({ message: "hello", count: 42 });
   const conversationKey =
     typeof nip44.v2.getConversationKey === "function"
-      ? nip44.v2.getConversationKey(clientSecret, remotePubkey)
-      : nip44.v2.utils.getConversationKey(clientSecret, remotePubkey);
+      ? nip44.v2.getConversationKey(clientSecretBytes, remotePubkey)
+      : nip44.v2.utils.getConversationKey(clientSecretBytes, remotePubkey);
   const ciphertext = nip44.v2.encrypt(serialized, conversationKey);
   const [ciphertextPart, nonce] = ciphertext.split("\n");
 
@@ -152,15 +158,17 @@ test("decryptNip46PayloadWithKeys decodes buffer-based handshake payloads", asyn
     normalizeNip46CiphertextPayload,
   } = await loadNip46Module();
 
-  const clientSecret = utils.bytesToHex(generateSecretKey());
-  const remoteSecret = utils.bytesToHex(generateSecretKey());
-  const remotePubkey = getPublicKey(remoteSecret);
+  const clientSecretBytes = generateSecretKey();
+  const clientSecret = utils.bytesToHex(clientSecretBytes);
+  const remoteSecretBytes = generateSecretKey();
+  const remoteSecret = utils.bytesToHex(remoteSecretBytes);
+  const remotePubkey = getPublicKey(remoteSecretBytes);
 
   const serialized = JSON.stringify({ message: "hello", count: 42 });
   const conversationKey =
     typeof nip44.v2.getConversationKey === "function"
-      ? nip44.v2.getConversationKey(clientSecret, remotePubkey)
-      : nip44.v2.utils.getConversationKey(clientSecret, remotePubkey);
+      ? nip44.v2.getConversationKey(clientSecretBytes, remotePubkey)
+      : nip44.v2.utils.getConversationKey(clientSecretBytes, remotePubkey);
   const ciphertext = nip44.v2.encrypt(serialized, conversationKey);
   const [ciphertextPart, nonce] = ciphertext.split("\n");
   const ciphertextBuffer = Buffer.from(ciphertext, "utf8");
@@ -195,9 +203,11 @@ test("decryptNip46PayloadWithKeys supports nip04-style ciphertext wrappers", asy
   const { generateSecretKey, getPublicKey, nip04, utils } = nostrTools;
   const { createNip46Cipher, normalizeNip46CiphertextPayload } = await loadNip46Module();
 
-  const clientSecret = utils.bytesToHex(generateSecretKey());
-  const remoteSecret = utils.bytesToHex(generateSecretKey());
-  const remotePubkey = getPublicKey(remoteSecret);
+  const clientSecretBytes = generateSecretKey();
+  const clientSecret = utils.bytesToHex(clientSecretBytes);
+  const remoteSecretBytes = generateSecretKey();
+  const remoteSecret = utils.bytesToHex(remoteSecretBytes);
+  const remotePubkey = getPublicKey(remoteSecretBytes);
 
   const serialized = JSON.stringify({ message: "hello", count: 42 });
   const ciphertext = await nip04.encrypt(clientSecret, remotePubkey, serialized);
@@ -251,11 +261,11 @@ test("parseNip46ConnectionString handles remote signer key hints", async () => {
   const { generateSecretKey, getPublicKey, nip19, utils } = nostrTools;
   const { parseNip46ConnectionString } = await loadNip46Module();
 
-  const signerSecret = utils.bytesToHex(generateSecretKey());
-  const userSecret = utils.bytesToHex(generateSecretKey());
+  const signerSecretBytes = generateSecretKey();
+  const userSecretBytes = generateSecretKey();
 
-  const signerPubkey = getPublicKey(signerSecret).toLowerCase();
-  const userPubkey = getPublicKey(userSecret).toLowerCase();
+  const signerPubkey = getPublicKey(signerSecretBytes).toLowerCase();
+  const userPubkey = getPublicKey(userSecretBytes).toLowerCase();
 
   const signerNpub = nip19.npubEncode(signerPubkey);
   const userNpub = nip19.npubEncode(userPubkey);
@@ -291,17 +301,18 @@ test(
     const { generateSecretKey, getPublicKey, nip44, utils } = nostrTools;
     const { attemptDecryptNip46HandshakePayload } = await loadNip46Module();
 
-    const clientSecret = utils.bytesToHex(generateSecretKey());
-    const remoteSignerSecret = utils.bytesToHex(generateSecretKey());
-    const userSecret = utils.bytesToHex(generateSecretKey());
+    const clientSecretBytes = generateSecretKey();
+    const clientSecret = utils.bytesToHex(clientSecretBytes);
+    const remoteSignerSecretBytes = generateSecretKey();
+    const userSecretBytes = generateSecretKey();
 
-    const remoteSignerPubkey = getPublicKey(remoteSignerSecret).toLowerCase();
-    const userPubkey = getPublicKey(userSecret).toLowerCase();
+    const remoteSignerPubkey = getPublicKey(remoteSignerSecretBytes).toLowerCase();
+    const userPubkey = getPublicKey(userSecretBytes).toLowerCase();
 
     const conversationKey =
       typeof nip44.v2.getConversationKey === "function"
-        ? nip44.v2.getConversationKey(clientSecret, remoteSignerPubkey)
-        : nip44.v2.utils.getConversationKey(clientSecret, remoteSignerPubkey);
+        ? nip44.v2.getConversationKey(clientSecretBytes, remoteSignerPubkey)
+        : nip44.v2.utils.getConversationKey(clientSecretBytes, remoteSignerPubkey);
 
     const payload = JSON.stringify({ id: "ack", result: "ok" });
     const ciphertext = nip44.v2.encrypt(payload, conversationKey);
@@ -332,10 +343,12 @@ test(
     const { generateSecretKey, getPublicKey, nip04, utils } = nostrTools;
     const { attemptDecryptNip46HandshakePayload } = await loadNip46Module();
 
-    const clientSecret = utils.bytesToHex(generateSecretKey());
-    const clientPubkey = getPublicKey(clientSecret).toLowerCase();
-    const remoteSecret = utils.bytesToHex(generateSecretKey());
-    const remotePubkey = getPublicKey(remoteSecret).toLowerCase();
+    const clientSecretBytes = generateSecretKey();
+    const clientSecret = utils.bytesToHex(clientSecretBytes);
+    const clientPubkey = getPublicKey(clientSecretBytes).toLowerCase();
+    const remoteSecretBytes = generateSecretKey();
+    const remoteSecret = utils.bytesToHex(remoteSecretBytes);
+    const remotePubkey = getPublicKey(remoteSecretBytes).toLowerCase();
 
     const payload = JSON.stringify({ id: "ack", result: "ack" });
     const ciphertext = nip04.encrypt(remoteSecret, clientPubkey, payload);