music detection fixed & internationalized

code-charity · Mar 24, 2023 · 5da5d51 · 5da5d51
1 parent 97962ae
commit 5da5d51
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/js&css/web-accessible/functions.js b/js&css/web-accessible/functions.js
@@ -32,7 +32,7 @@ ImprovedTube.ytElementsHandler = function (node) {
 		}
 	} else if (name === 'META') {
 		if (node.getAttribute('itemprop') === 'genre') {
-			ImprovedTube.genre = node.content;
+			ImprovedTube.category = node.content;
 		}
 		if (node.getAttribute('name') === 'keywords') {
 			ImprovedTube.keywords = node.content;

diff --git a/js&css/web-accessible/init.js b/js&css/web-accessible/init.js
@@ -69,7 +69,7 @@ ImprovedTube.init = function () {
 
 document.addEventListener('yt-navigate-finish', function () {
 	ImprovedTube.pageType();
-	ImprovedTube.commentsSidebarPosition();
+	ImprovedTube.commentsSidebar();
 
 	if (ImprovedTube.elements.player && ImprovedTube.elements.player.setPlaybackRate) {
 		ImprovedTube.videoPageUpdate();

diff --git a/js&css/web-accessible/www.youtube.com/appearance.js b/js&css/web-accessible/www.youtube.com/appearance.js
@@ -152,7 +152,7 @@ ImprovedTube.playerRemainingDuration = function () {
 /*------------------------------------------------------------------------------
 4.2.1.6 Comments position to sidebar
 ------------------------------------------------------------------------------*/
-ImprovedTube.commentsSidebarPosition=()=>{ if(ImprovedTube.storage.comments_sidebar_position){ 
+ImprovedTube.commentsSidebar=()=>{ if(ImprovedTube.storage.comments_sidebar){ 
       document.querySelector("#columns").appendChild(document.querySelector("#comments"));
 
   if(window.matchMedia("(max-width: 1598px)").matches)

diff --git a/js&css/web-accessible/www.youtube.com/player.js b/js&css/web-accessible/www.youtube.com/player.js
@@ -80,11 +80,11 @@ ImprovedTube.playerPlaybackSpeed = function (change) {
 		if (this.storage.player_forced_playback_speed === true) {
 			if (player.getVideoData().isLive === false &&
 				(this.storage.player_force_speed_on_music === true ||
-					(document.querySelector('h3#title')?.innerText !== 'Music'
-					&& (ImprovedTube.genre !== 'Music' || /interview|back[- ]?stage/i.test(ImprovedTube.keywords + ImprovedTube.title) ) 
-					&& !/official (music )?video|lyrics|cover[\)\]]|[\(\[]cover|cover version|karaoke|(sing|play)[- ]?along/i.test(ImprovedTube.title + ImprovedTube.keywords)	 
-					&& location.href.indexOf('music') === -1
-					)
+				 document.querySelector('h3#title')?.innerText !== 'Music'  // (=buyable/registered music table)
+				|| ( 
+				    (ImprovedTube.elements.category !== 'Music' && !/official (music )?video|lyrics|cover[\)\]]|[\(\[]cover|cover version|karaok|(sing|play)[- ]?along|卡拉OK|卡拉OK|الكاريوكيкараоке|カラオケ|노래방/i.test(ImprovedTube.elements.title + ImprovedTube.elements.keywords)	 	
+					) || /do[ck]u|interv[iyj]|back[- ]?stage|インタビュー|entrevista|面试|面試|회견|wawancara|مقابلة|интервью|entretien|기록한 것|记录|記錄|ドキュメンタリ|وثائقي|документальный/i.test(ImprovedTube.elements.keywords + ImprovedTube.elements.title)
+				  ) // && location.href.indexOf('music') === -1   // (=only running on www.youtube.com anyways)
 			)) {
 				player.setPlaybackRate(Number(option));
 				video.playbackRate = Number(option);
@@ -394,7 +394,7 @@ ImprovedTube.playerAds = function (parent) {
 				button.click(); document.querySelector("*[target-id*='engagement-panel-ads']").remove(); document.querySelector(".ytd-ad-slot-renderer").remove();
 			}
 		} else if (this.storage.player_ads === 'block_music') {
-			if (ImprovedTube.elements.genre === 'music') {
+			if (ImprovedTube.elements.category === 'music') {
 				button.click(); document.querySelector("*[target-id*='engagement-panel-ads']").remove(); document.querySelector(".ytd-ad-slot-renderer").remove();
 			}
 		}

diff --git a/menu/skeleton-parts/appearance.js b/menu/skeleton-parts/appearance.js
@@ -738,7 +738,7 @@ extension.skeleton.main.layers.section.appearance.on.click.comments = {
             },
 				comments_sidebar_position: {
                 component: "switch",
-                text: "SidebarPosition",
+                text: "sidebar",
             },
 			squared_user_images: {
 				component: 'switch',