Kaynağa Gözat

fix: like btn not found & inert cfg bg elem bug

Sv443 11 ay önce
ebeveyn
işleme
e2d1dc59ea
3 değiştirilmiş dosya ile 67 ekleme ve 80 silme
  1. 55 60
      dist/BetterYTM.user.js
  2. 0 8
      src/components/BytmDialog.ts
  3. 12 12
      src/features/input.ts

+ 55 - 60
dist/BetterYTM.user.js

@@ -17,7 +17,7 @@
 // @license           AGPL-3.0-only
 // @author            Sv443
 // @copyright         Sv443 (https://github.com/Sv443)
-// @icon              https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/logo/logo_dev_48.png
+// @icon              https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/logo/logo_dev_48.png
 // @match             https://music.youtube.com/*
 // @match             https://www.youtube.com/*
 // @run-at            document-start
@@ -35,47 +35,47 @@
 // @grant             GM.openInTab
 // @grant             unsafeWindow
 // @noframes
-// @resource          css-bundle              https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/dist/BetterYTM.css
-// @resource          css-above_queue_btns    https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/style/aboveQueueBtns.css
-// @resource          css-anchor_improvements https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/style/anchorImprovements.css
-// @resource          css-fix_hdr             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/style/fixHDR.css
-// @resource          css-fix_spacing         https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/style/fixSpacing.css
-// @resource          css-vol_slider_size     https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/style/volSliderSize.css
-// @resource          doc-changelog           https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/changelog.md
-// @resource          icon-advanced_mode      https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/plus_circle_small.svg
-// @resource          icon-arrow_down         https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/arrow_down.svg
-// @resource          icon-auto_like_enabled  https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/auto_like_enabled.svg
-// @resource          icon-auto_like          https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/auto_like.svg
-// @resource          icon-clear_list         https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/clear_list.svg
-// @resource          icon-delete             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/delete.svg
-// @resource          icon-error              https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/error.svg
-// @resource          icon-experimental       https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/beaker_small.svg
-// @resource          icon-globe_small        https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/globe_small.svg
-// @resource          icon-globe              https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/globe.svg
-// @resource          icon-help               https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/help.svg
-// @resource          icon-image_filled       https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/image_filled.svg
-// @resource          icon-image              https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/image.svg
-// @resource          icon-link               https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/link.svg
-// @resource          icon-lyrics             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/lyrics.svg
-// @resource          icon-reload             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/refresh.svg
-// @resource          icon-skip_to            https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/skip_to.svg
-// @resource          icon-spinner            https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/icons/spinner.svg
-// @resource          img-close               https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/close.png
-// @resource          img-discord             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/external/discord.png
-// @resource          img-github              https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/external/github.png
-// @resource          img-greasyfork          https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/external/greasyfork.png
-// @resource          img-logo_dev            https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/logo/logo_dev_48.png
-// @resource          img-logo                https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/logo/logo_48.png
-// @resource          img-openuserjs          https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/images/external/openuserjs.png
-// @resource          trans-de_DE             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/de_DE.json
-// @resource          trans-en_US             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/en_US.json
-// @resource          trans-en_UK             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/en_UK.json
-// @resource          trans-es_ES             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/es_ES.json
-// @resource          trans-fr_FR             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/fr_FR.json
-// @resource          trans-hi_IN             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/hi_IN.json
-// @resource          trans-ja_JA             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/ja_JA.json
-// @resource          trans-pt_BR             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/pt_BR.json
-// @resource          trans-zh_CN             https://raw.githubusercontent.com/Sv443/BetterYTM/c1d7a866/assets/translations/zh_CN.json
+// @resource          css-bundle              https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/dist/BetterYTM.css
+// @resource          css-above_queue_btns    https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/style/aboveQueueBtns.css
+// @resource          css-anchor_improvements https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/style/anchorImprovements.css
+// @resource          css-fix_hdr             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/style/fixHDR.css
+// @resource          css-fix_spacing         https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/style/fixSpacing.css
+// @resource          css-vol_slider_size     https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/style/volSliderSize.css
+// @resource          doc-changelog           https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/changelog.md
+// @resource          icon-advanced_mode      https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/plus_circle_small.svg
+// @resource          icon-arrow_down         https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/arrow_down.svg
+// @resource          icon-auto_like_enabled  https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/auto_like_enabled.svg
+// @resource          icon-auto_like          https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/auto_like.svg
+// @resource          icon-clear_list         https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/clear_list.svg
+// @resource          icon-delete             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/delete.svg
+// @resource          icon-error              https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/error.svg
+// @resource          icon-experimental       https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/beaker_small.svg
+// @resource          icon-globe_small        https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/globe_small.svg
+// @resource          icon-globe              https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/globe.svg
+// @resource          icon-help               https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/help.svg
+// @resource          icon-image_filled       https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/image_filled.svg
+// @resource          icon-image              https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/image.svg
+// @resource          icon-link               https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/link.svg
+// @resource          icon-lyrics             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/lyrics.svg
+// @resource          icon-reload             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/refresh.svg
+// @resource          icon-skip_to            https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/skip_to.svg
+// @resource          icon-spinner            https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/icons/spinner.svg
+// @resource          img-close               https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/close.png
+// @resource          img-discord             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/external/discord.png
+// @resource          img-github              https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/external/github.png
+// @resource          img-greasyfork          https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/external/greasyfork.png
+// @resource          img-logo_dev            https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/logo/logo_dev_48.png
+// @resource          img-logo                https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/logo/logo_48.png
+// @resource          img-openuserjs          https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/images/external/openuserjs.png
+// @resource          trans-de_DE             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/de_DE.json
+// @resource          trans-en_US             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/en_US.json
+// @resource          trans-en_UK             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/en_UK.json
+// @resource          trans-es_ES             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/es_ES.json
+// @resource          trans-fr_FR             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/fr_FR.json
+// @resource          trans-hi_IN             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/hi_IN.json
+// @resource          trans-ja_JA             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/ja_JA.json
+// @resource          trans-pt_BR             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/pt_BR.json
+// @resource          trans-zh_CN             https://raw.githubusercontent.com/Sv443/BetterYTM/61dc8a23/assets/translations/zh_CN.json
 // @require           https://cdn.jsdelivr.net/npm/@sv443-network/[email protected]/dist/index.global.js
 // @require           https://cdn.jsdelivr.net/npm/[email protected]/dist/fuse.basic.js
 // @require           https://cdn.jsdelivr.net/npm/[email protected]/lib/marked.umd.js
@@ -205,7 +205,7 @@ var PluginIntent;
 })(PluginIntent || (PluginIntent = {}));const modeRaw = "development";
 const branchRaw = "develop";
 const hostRaw = "github";
-const buildNumberRaw = "c1d7a866";
+const buildNumberRaw = "61dc8a23";
 /** The mode in which the script was built (production or development) */
 const mode = (modeRaw.match(/^#{{.+}}$/) ? "production" : modeRaw);
 /** The branch to use in various URLs that point to the GitHub repo */
@@ -603,9 +603,6 @@ class BytmDialog extends NanoEmitter {
             document.body.classList.add("bytm-disable-scroll");
             (_a = document.querySelector(getDomain() === "ytm" ? "ytmusic-app" : "ytd-app")) === null || _a === void 0 ? void 0 : _a.setAttribute("inert", "true");
             const dialogBg = document.querySelector(`#bytm-${this.id}-dialog-bg`);
-            // cfg menu compatibility
-            const cfgMenuBgEl = document.querySelector("#bytm-cfg-menu-bg");
-            cfgMenuBgEl === null || cfgMenuBgEl === void 0 ? void 0 : cfgMenuBgEl.setAttribute("inert", "true");
             if (!dialogBg)
                 return warn(`Couldn't find background element for dialog with ID '${this.id}'`);
             dialogBg.style.visibility = "visible";
@@ -639,9 +636,6 @@ class BytmDialog extends NanoEmitter {
         if (openDialogs.length === 0) {
             document.body.classList.remove("bytm-disable-scroll");
             (_a = document.querySelector(getDomain() === "ytm" ? "ytmusic-app" : "ytd-app")) === null || _a === void 0 ? void 0 : _a.removeAttribute("inert");
-            // cfg menu compatibility
-            const cfgMenuBgEl = document.querySelector("#bytm-cfg-menu-bg");
-            cfgMenuBgEl === null || cfgMenuBgEl === void 0 ? void 0 : cfgMenuBgEl.removeAttribute("inert");
         }
         this.events.emit("close");
         if (this.options.destroyOnClose)
@@ -3993,17 +3987,18 @@ function initAutoLikeChannels() {
                                 const likeChan = autoLikeStore.getData().channels.find((ch) => ch.id === chanId);
                                 if (!likeChan || !likeChan.enabled)
                                     return;
-                                const likeBtn = document.querySelector("#actions ytd-menu-renderer like-button-view-model button");
-                                if (!likeBtn)
-                                    return error("Couldn't auto-like channel because the like button couldn't be found");
-                                if (likeBtn.getAttribute("aria-pressed") !== "true") {
-                                    likeBtn.click();
-                                    showIconToast({
-                                        message: t("auto_liked_video"),
-                                        icon: "icon-auto_like",
-                                    });
-                                    log(`Auto-liked channel '${likeChan.name}' (ID: '${likeChan.id}')`);
-                                }
+                                addSelectorListener("watchMetadata", "#actions ytd-menu-renderer like-button-view-model button", {
+                                    listener(likeBtn) {
+                                        if (likeBtn.getAttribute("aria-pressed") !== "true") {
+                                            likeBtn.click();
+                                            showIconToast({
+                                                message: t("auto_liked_video"),
+                                                icon: "icon-auto_like",
+                                            });
+                                            log(`Auto-liked channel '${likeChan.name}' (ID: '${likeChan.id}')`);
+                                        }
+                                    }
+                                });
                             }
                         });
                     }, ((_a = getFeature("autoLikeTimeout")) !== null && _a !== void 0 ? _a : 5) * 1000);

+ 0 - 8
src/components/BytmDialog.ts

@@ -155,10 +155,6 @@ export class BytmDialog extends NanoEmitter<{
     document.querySelector(getDomain() === "ytm" ? "ytmusic-app" : "ytd-app")?.setAttribute("inert", "true");
     const dialogBg = document.querySelector<HTMLElement>(`#bytm-${this.id}-dialog-bg`);
 
-    // cfg menu compatibility
-    const cfgMenuBgEl = document.querySelector<HTMLElement>("#bytm-cfg-menu-bg");
-    cfgMenuBgEl?.setAttribute("inert", "true");
-
     if(!dialogBg)
       return warn(`Couldn't find background element for dialog with ID '${this.id}'`);
 
@@ -202,10 +198,6 @@ export class BytmDialog extends NanoEmitter<{
     if(openDialogs.length === 0) {
       document.body.classList.remove("bytm-disable-scroll");
       document.querySelector(getDomain() === "ytm" ? "ytmusic-app" : "ytd-app")?.removeAttribute("inert");
-
-      // cfg menu compatibility
-      const cfgMenuBgEl = document.querySelector<HTMLElement>("#bytm-cfg-menu-bg");
-      cfgMenuBgEl?.removeAttribute("inert");
     }
 
     this.events.emit("close");

+ 12 - 12
src/features/input.ts

@@ -258,18 +258,18 @@ export async function initAutoLikeChannels() {
               if(!likeChan || !likeChan.enabled)
                 return;
 
-              const likeBtn = document.querySelector<HTMLButtonElement>("#actions ytd-menu-renderer like-button-view-model button");
-              if(!likeBtn)
-                return error("Couldn't auto-like channel because the like button couldn't be found");
-
-              if(likeBtn.getAttribute("aria-pressed") !== "true") {
-                likeBtn.click();
-                showIconToast({
-                  message: t("auto_liked_video"),
-                  icon: "icon-auto_like",
-                });
-                log(`Auto-liked channel '${likeChan.name}' (ID: '${likeChan.id}')`);
-              }
+              addSelectorListener<0, "yt">("watchMetadata", "#actions ytd-menu-renderer like-button-view-model button", {
+                listener(likeBtn) {
+                  if(likeBtn.getAttribute("aria-pressed") !== "true") {
+                    likeBtn.click();
+                    showIconToast({
+                      message: t("auto_liked_video"),
+                      icon: "icon-auto_like",
+                    });
+                    log(`Auto-liked channel '${likeChan.name}' (ID: '${likeChan.id}')`);
+                  }
+                }
+              });
             }
           });
         }, (getFeature("autoLikeTimeout") ?? 5) * 1000);