👽️ Fixes from changes to YTM API

ElectricalBoy · Oct 11, 2023 · 613a71a · 613a71a
1 parent f09bba8
commit 613a71a
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 45 deletions.
diff --git a/src/integrations/volume-ratio/index.ts b/src/integrations/volume-ratio/index.ts
@@ -24,8 +24,9 @@ export default class VolumeRatio implements IIntegration {
     this.isEnabled = true;
     if ((this.isEnabled && this.hasInjected) || this.ytmView === null) return;
 
-    this.ytmView.webContents.executeJavaScript(enableScript)
-    .catch((err) => { console.log(err); });
+    this.ytmView.webContents.executeJavaScript(enableScript).catch(err => {
+      console.log(err);
+    });
 
     this.forceUpdateVolume();
 
@@ -36,7 +37,9 @@ export default class VolumeRatio implements IIntegration {
     this.isEnabled = false;
     if (!this.hasInjected) return;
 
-    this.ytmView.webContents.executeJavaScript(`
+    this.ytmView.webContents
+      .executeJavaScript(
+        `
       {
         if (typeof window.HTMLMediaElement_volume !== 'undefined' &&
             typeof window.HTMLMediaElement_volume.get !== 'undefined' &&
@@ -54,23 +57,31 @@ export default class VolumeRatio implements IIntegration {
 
       // Electron is not happy with whatever is returned, so we just give it an empty string.
       '';
-    `)
-    .catch((err) => { err; });
+    `
+      )
+      .catch(err => {
+        err;
+      });
 
     this.forceUpdateVolume();
     this.hasInjected = false;
   }
 
   private forceUpdateVolume(): void {
-    this.ytmView.webContents.executeJavaScript(`
+    this.ytmView.webContents
+      .executeJavaScript(
+        `
       {
-        let volume = document.querySelector("ytmusic-player-bar").playerApi_.getVolume();
-        document.querySelector("ytmusic-player-bar").playerApi_.setVolume(volume);
+        let volume = document.querySelector("ytmusic-player-bar").playerApi.getVolume();
+        document.querySelector("ytmusic-player-bar").playerApi.setVolume(volume);
         document.querySelector("ytmusic-player-bar").store.dispatch({ type: 'SET_VOLUME', payload: volume });
         
         volume;
       }
-    `)
-    .catch((err) => { err; });
+    `
+      )
+      .catch(err => {
+        err;
+      });
   }
-} 
+}
diff --git a/src/ytmview/preload.ts b/src/ytmview/preload.ts
@@ -203,7 +203,7 @@ window.addEventListener("load", async () => {
     const interval = setInterval(async () => {
       const playerApiReady: boolean = await webFrame.executeJavaScript(`
         {
-          document.querySelector("ytmusic-player-bar").playerApi_.isReady();
+          document.querySelector("ytmusic-player-bar").playerApi.isReady();
         }
       `);
 
@@ -237,14 +237,14 @@ window.addEventListener("load", async () => {
                 {
                   document.querySelector("ytmusic-popup-container").refitPopups_();
                 }
-              `)
+              `);
               heightTransitionCount++;
               if (heightTransitionCount >= 2) {
                 document.querySelector("ytmusic-player-bar").removeEventListener("transitionend", transitionEnd);
               }
             }
           }
-        }
+        };
         document.querySelector("ytmusic-player-bar").addEventListener("transitionend", transitionEnd);
 
         document.dispatchEvent(
@@ -263,7 +263,7 @@ window.addEventListener("load", async () => {
     } else {
       webFrame.executeJavaScript(`
         {
-          window.ytmd.sendVideoData(document.querySelector("ytmusic-player-bar").playerApi_.getPlayerResponse().videoDetails, document.querySelector("ytmusic-player-bar").playerApi_.getPlaylistId());
+          window.ytmd.sendVideoData(document.querySelector("ytmusic-player-bar").playerApi.getPlayerResponse().videoDetails, document.querySelector("ytmusic-player-bar").playerApi.getPlaylistId());
         }
       `);
     }
@@ -279,7 +279,7 @@ window.addEventListener("load", async () => {
       case "playPause": {
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playing_ ? document.querySelector("ytmusic-player-bar").playerApi_.pauseVideo() : document.querySelector("ytmusic-player-bar").playerApi_.playVideo();
+            document.querySelector("ytmusic-player-bar").playing ? document.querySelector("ytmusic-player-bar").playerApi.pauseVideo() : document.querySelector("ytmusic-player-bar").playerApi.playVideo();
           }
         `);
         break;
@@ -288,7 +288,7 @@ window.addEventListener("load", async () => {
       case "play": {
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.playVideo();
+            document.querySelector("ytmusic-player-bar").playerApi.playVideo();
           }
         `);
         break;
@@ -297,7 +297,7 @@ window.addEventListener("load", async () => {
       case "pause": {
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.pauseVideo();
+            document.querySelector("ytmusic-player-bar").playerApi.pauseVideo();
           }
         `);
         break;
@@ -306,7 +306,7 @@ window.addEventListener("load", async () => {
       case "next": {
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.nextVideo();
+            document.querySelector("ytmusic-player-bar").playerApi.nextVideo();
           }
         `);
         break;
@@ -315,7 +315,7 @@ window.addEventListener("load", async () => {
       case "previous": {
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.previousVideo();
+            document.querySelector("ytmusic-player-bar").playerApi.previousVideo();
           }
         `);
         break;
@@ -334,7 +334,7 @@ window.addEventListener("load", async () => {
       case "volumeUp": {
         const currentVolumeUp: number = await webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.getVolume();
+            document.querySelector("ytmusic-player-bar").playerApi.getVolume();
           }
         `);
 
@@ -344,7 +344,7 @@ window.addEventListener("load", async () => {
         }
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.setVolume(${newVolumeUp});
+            document.querySelector("ytmusic-player-bar").playerApi.setVolume(${newVolumeUp});
             document.querySelector("ytmusic-player-bar").store.dispatch({ type: 'SET_VOLUME', payload: ${newVolumeUp} });
           }
         `);
@@ -354,7 +354,7 @@ window.addEventListener("load", async () => {
       case "volumeDown": {
         const currentVolumeDown: number = await webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.getVolume();
+            document.querySelector("ytmusic-player-bar").playerApi.getVolume();
           }
         `);
 
@@ -364,7 +364,7 @@ window.addEventListener("load", async () => {
         }
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.setVolume(${newVolumeDown});
+            document.querySelector("ytmusic-player-bar").playerApi.setVolume(${newVolumeDown});
             document.querySelector("ytmusic-player-bar").store.dispatch({ type: 'SET_VOLUME', payload: ${newVolumeDown} });
           }
         `);
@@ -380,7 +380,7 @@ window.addEventListener("load", async () => {
 
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.setVolume(${valueInt});
+            document.querySelector("ytmusic-player-bar").playerApi.setVolume(${valueInt});
             document.querySelector("ytmusic-player-bar").store.dispatch({ type: 'SET_VOLUME', payload: ${valueInt} });
           }
         `);
@@ -390,7 +390,7 @@ window.addEventListener("load", async () => {
       case "mute":
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.mute();
+            document.querySelector("ytmusic-player-bar").playerApi.mute();
             document.querySelector("ytmusic-player-bar").store.dispatch({ type: 'SET_MUTED', payload: true });
           }
         `);
@@ -399,7 +399,7 @@ window.addEventListener("load", async () => {
       case "unmute":
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.unMute();
+            document.querySelector("ytmusic-player-bar").playerApi.unMute();
             document.querySelector("ytmusic-player-bar").store.dispatch({ type: 'SET_MUTED', payload: false });
           }
         `);
@@ -416,15 +416,15 @@ window.addEventListener("load", async () => {
       case "seekTo":
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").playerApi_.seekTo(${value});
+            document.querySelector("ytmusic-player-bar").playerApi.seekTo(${value});
           }
         `);
         break;
-      
+
       case "shuffle":
         webFrame.executeJavaScript(`
           {
-            document.querySelector("ytmusic-player-bar").queue_.shuffle();
+            document.querySelector("ytmusic-player-bar").queue.shuffle();
           }
         `);
         break;

diff --git a/src/ytmview/scripts/getplaylists.script.js b/src/ytmview/scripts/getplaylists.script.js
@@ -11,7 +11,7 @@
           document.querySelector("ytmusic-player-bar"),
           {
             addToPlaylistEndpoint: {
-              videoId: document.querySelector("ytmusic-player-bar").playerApi_.getPlayerResponse().videoDetails.videoId
+              videoId: document.querySelector("ytmusic-player-bar").playerApi.getPlayerResponse().videoDetails.videoId
             }
           }
         ],

diff --git a/src/ytmview/scripts/hookplayerapievents.script.js b/src/ytmview/scripts/hookplayerapievents.script.js
@@ -1,22 +1,22 @@
 {
-  document.querySelector("ytmusic-player-bar").playerApi_.addEventListener("onVideoProgress", progress => {
+  document.querySelector("ytmusic-player-bar").playerApi.addEventListener("onVideoProgress", progress => {
     window.ytmd.sendVideoProgress(progress);
   });
-  document.querySelector("ytmusic-player-bar").playerApi_.addEventListener("onStateChange", state => {
+  document.querySelector("ytmusic-player-bar").playerApi.addEventListener("onStateChange", state => {
     window.ytmd.sendVideoState(state);
   });
-  document.querySelector("ytmusic-player-bar").playerApi_.addEventListener("onVideoDataChange", event => {
+  document.querySelector("ytmusic-player-bar").playerApi.addEventListener("onVideoDataChange", event => {
     if (event.playertype === 1 && (event.type === "dataloaded" || event.type === "dataupdated")) {
       window.ytmd.sendVideoData(
-        document.querySelector("ytmusic-player-bar").playerApi_.getPlayerResponse().videoDetails,
-        document.querySelector("ytmusic-player-bar").playerApi_.getPlaylistId()
+        document.querySelector("ytmusic-player-bar").playerApi.getPlayerResponse().videoDetails,
+        document.querySelector("ytmusic-player-bar").playerApi.getPlaylistId()
       );
     }
   });
-  document.querySelector("ytmusic-player-bar").playerApi_.addEventListener("onAdStart", () => {
+  document.querySelector("ytmusic-player-bar").playerApi.addEventListener("onAdStart", () => {
     window.ytmd.sendAdState(true);
   });
-  document.querySelector("ytmusic-player-bar").playerApi_.addEventListener("onAdEnd", () => {
+  document.querySelector("ytmusic-player-bar").playerApi.addEventListener("onAdEnd", () => {
     window.ytmd.sendAdState(false);
   });
   document.querySelector("ytmusic-player-bar").store.subscribe(() => {
@@ -42,7 +42,7 @@
       }
     }
 
-    const videoId = document.querySelector("ytmusic-player-bar").playerApi_.getPlayerResponse()?.videoDetails?.videoId;
+    const videoId = document.querySelector("ytmusic-player-bar").playerApi.getPlayerResponse()?.videoDetails?.videoId;
     const likeButtonData = document.querySelector("ytmusic-player-bar").querySelector("ytmusic-like-button-renderer").data;
     const defaultLikeStatus = likeButtonData?.likeStatus ?? "UNKNOWN";
 

diff --git a/src/ytmview/scripts/playerbarcontrols.script.js b/src/ytmview/scripts/playerbarcontrols.script.js
@@ -135,9 +135,9 @@
   });
   libraryButton.insertAdjacentElement("afterend", playlistButton);
 
-  document.querySelector("ytmusic-player-bar").playerApi_.addEventListener("onVideoDataChange", event => {
+  document.querySelector("ytmusic-player-bar").playerApi.addEventListener("onVideoDataChange", event => {
     if (event.type === "dataloaded" && event.playertype === 1) {
-      currentVideoId = document.querySelector("ytmusic-player-bar").playerApi_.getPlayerResponse().videoDetails.videoId;
+      currentVideoId = document.querySelector("ytmusic-player-bar").playerApi.getPlayerResponse().videoDetails.videoId;
     }
   });
 
@@ -382,8 +382,8 @@
               sleepTimerButton.classList.remove("active");
               sleepTimerButton.setAttribute("title", "Sleep timer off");
 
-              if (document.querySelector("ytmusic-player-bar").playing_) {
-                document.querySelector("ytmusic-player-bar").playerApi_.pauseVideo();
+              if (document.querySelector("ytmusic-player-bar").playing) {
+                document.querySelector("ytmusic-player-bar").playerApi.pauseVideo();
 
                 document.body.dispatchEvent(
                   new CustomEvent("yt-action", {

diff --git a/src/ytmview/scripts/toggledislike.script.js b/src/ytmview/scripts/toggledislike.script.js
@@ -1,5 +1,5 @@
 {
-  const videoId = document.querySelector("ytmusic-player-bar").playerApi_.getPlayerResponse().videoDetails.videoId;
+  const videoId = document.querySelector("ytmusic-player-bar").playerApi.getPlayerResponse().videoDetails.videoId;
   const likeButtonData = document.querySelector("ytmusic-player-bar").querySelector("ytmusic-like-button-renderer").data;
 
   let dislikeServiceEndpoint = null;

diff --git a/src/ytmview/scripts/togglelike.script.js b/src/ytmview/scripts/togglelike.script.js
@@ -1,5 +1,5 @@
 {
-  const videoId = document.querySelector("ytmusic-player-bar").playerApi_.getPlayerResponse().videoDetails.videoId;
+  const videoId = document.querySelector("ytmusic-player-bar").playerApi.getPlayerResponse().videoDetails.videoId;
   const likeButtonData = document.querySelector("ytmusic-player-bar").querySelector("ytmusic-like-button-renderer").data;
 
   let likeServiceEndpoint = null;