Merge pull request #69 from yakisova41/doesnt-work-web_20230815_01_RC01

Doesnt work web 20230815 01 rc01
yakisova41 · Aug 22, 2023 · fcf20db · fcf20db
2 parents 25d5c63 + 867f0f7
commit fcf20db
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/src/handlers/handleYtReloadContinuationItemsCommand.ts b/src/handlers/handleYtReloadContinuationItemsCommand.ts
@@ -13,7 +13,6 @@ export function handleYtReloadContinuationItemsCommand(
 ): void {
   const reloadDetail: YtAction<YtReloadContinuationItemsCommandArg0, Element> =
     detail;
-
   const { slot } = reloadDetail.args[0].reloadContinuationItemsCommand;
 
   if (slot === "RELOAD_CONTINUATION_SLOT_BODY") {

diff --git a/src/rewrites/comment.ts b/src/rewrites/comment.ts
@@ -24,7 +24,6 @@ export function rewriteCommentNameFromContinuationItems(
 
     if (commentThreadRenderer !== undefined) {
       const { trackingParams } = commentThreadRenderer;
-
       void getCommentElem(trackingParams).then((commentElem) => {
         reWriteCommentElem(commentElem, commentThreadRenderer);
       });
@@ -49,7 +48,11 @@ function reWriteCommentElem(
   commentElem: ShadyElement,
   commentThreadRenderer: ConfinuationItem
 ): void {
-  const commentRenderer = commentElem.__shady_native_children[0];
+  const commentRenderer = Array.from(
+    commentElem.__shady_native_children
+  ).filter((elem) => {
+    return elem.id === "comment";
+  })[0];
 
   if (commentRenderer !== null && commentRenderer !== undefined) {
     let isContainer =

diff --git a/src/rewrites/rewriteOfCommentRenderer/mentionRewriteOfCommentRenderer.ts b/src/rewrites/rewriteOfCommentRenderer/mentionRewriteOfCommentRenderer.ts
@@ -1,6 +1,5 @@
 import { type ShadyElement } from "../../utils/findElementByTrackingParams";
 import { getUserName } from "../../utils/getUserName";
-import { escapeString } from "../../utils/escapeString";
 import { debugErr } from "src/utils/debugLog";
 
 /**
@@ -10,8 +9,18 @@ import { debugErr } from "src/utils/debugLog";
 export function mentionRewriteOfCommentRenderer(
   commentRenderer: ShadyElement
 ): void {
-  const commentRendererBody = commentRenderer.__shady_native_children[2];
-  const main = commentRendererBody.__shady_native_children[1];
+  const commentRendererBody = Array.from(
+    commentRenderer.__shady_native_children
+  ).filter((elem) => {
+    return elem.id === "body";
+  })[0];
+
+  const main = Array.from(commentRendererBody.__shady_native_children).filter(
+    (elem) => {
+      return elem.id === "main";
+    }
+  )[0];
+
   const aTags = main.querySelectorAll(
     "#comment-content > ytd-expander > #content > #content-text > a"
   );
@@ -23,7 +32,7 @@ export function mentionRewriteOfCommentRenderer(
       if (href !== null) {
         void getUserName(href.split("/")[2])
           .then((name) => {
-            aTag.textContent = `@${escapeString(name)} `;
+            aTag.textContent = `@${name} `;
           })
           .catch((e) => {
             debugErr(e);

diff --git a/src/rewrites/rewriteOfCommentRenderer/nameRewriteOfCommentRenderer.ts b/src/rewrites/rewriteOfCommentRenderer/nameRewriteOfCommentRenderer.ts
@@ -14,7 +14,11 @@ export function nameRewriteOfCommentRenderer(
   isNameContainerRender: boolean,
   userId: string
 ): void {
-  const commentRendererBody = commentRenderer.__shady_native_children[2];
+  const commentRendererBody = Array.from(
+    commentRenderer.__shady_native_children
+  ).filter((elem) => {
+    return elem.id === "body";
+  })[0];
 
   let nameElem = commentRendererBody.querySelector<ShadyElement>(
     "#main > #header > #header-author > h3 > a > span"
@@ -24,8 +28,11 @@ export function nameRewriteOfCommentRenderer(
    * チャンネル所有者のコメントは別の要素に名前がかかれる
    */
   if (isNameContainerRender) {
-    nameElem =
-      commentRendererBody.__shady_native_children[1].querySelector<ShadyElement>(
+    nameElem = Array.from(commentRendererBody.__shady_native_children)
+      .filter((elem) => {
+        return elem.id === "main";
+      })[0]
+      .querySelector<ShadyElement>(
         "#header > #header-author > #author-comment-badge > ytd-author-comment-badge-renderer > a > #channel-name > #container > #text-container > yt-formatted-string"
       );
   }