From da184d75ff6738a6c9c6af59605d36f08e00bbf0 Mon Sep 17 00:00:00 2001 From: hyperstown Date: Sat, 10 Sep 2022 13:47:46 +0200 Subject: [PATCH 1/5] add support for new yt layout --- Extensions/UserScript/Return Youtube Dislike.user.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index b9ffa27..66f5411 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -82,7 +82,10 @@ function getButtons() { return document.querySelector(".slim-video-action-bar-actions"); } if (document.getElementById("menu-container")?.offsetParent === null) { - return document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div"); + return ( + document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div") ?? + document.querySelector("ytd-menu-renderer.ytd-video-primary-info-renderer > div") + ) } else { return document .getElementById("menu-container") @@ -108,7 +111,8 @@ function getDislikeButton() { function getDislikeTextContainer() { return ( getDislikeButton().querySelector("#text") ?? - getDislikeButton().getElementsByTagName("yt-formatted-string")[0] + getDislikeButton().getElementsByTagName("yt-formatted-string")[0] ?? + getDislikeButton().querySelector("span[role='text']") ); } @@ -594,7 +598,7 @@ function setEventListeners(evt) { let jsInitChecktimer; function checkForJS_Finish() { - console.log(); + //console.log(); if (isShorts() || (getButtons()?.offsetParent && isVideoLoaded())) { const buttons = getButtons(); From 6a2806cbbe0c2165b2e35e3a6a4d013e8366087c Mon Sep 17 00:00:00 2001 From: hyperstown Date: Sat, 10 Sep 2022 14:45:40 +0200 Subject: [PATCH 2/5] add support for new yt layout on mobile --- .../UserScript/Return Youtube Dislike.user.js | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 66f5411..827303d 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -2,7 +2,7 @@ // @name Return YouTube Dislike // @namespace https://www.returnyoutubedislike.com/ // @homepage https://www.returnyoutubedislike.com/ -// @version 3.0.1 +// @version 3.1.0 // @encoding utf-8 // @description Return of the YouTube Dislike, Based off https://www.returnyoutubedislike.com/ // @icon https://github.com/Anarios/return-youtube-dislike/raw/main/Icons/Return%20Youtube%20Dislike%20-%20Transparent.png @@ -79,13 +79,16 @@ function getButtons() { } } if (isMobile) { - return document.querySelector(".slim-video-action-bar-actions"); + return ( + document.querySelector(".slim-video-action-bar-actions .segmented-buttons") ?? + document.querySelector(".slim-video-action-bar-actions") + ); } if (document.getElementById("menu-container")?.offsetParent === null) { return ( document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div") ?? document.querySelector("ytd-menu-renderer.ytd-video-primary-info-renderer > div") - ) + ); } else { return document .getElementById("menu-container") @@ -636,7 +639,24 @@ if (isMobile) { return originalPush.apply(history, args); }; setInterval(() => { - getDislikeButton().querySelector(".button-renderer-text").innerText = - mobileDislikes; + if (getDislikeButton().querySelector(".button-renderer-text") === null) { + if (getDislikeButton().querySelector(".cbox span") === null) { + let dislikeArea = document.createElement('div'); + dislikeArea.classList.add('cbox'); + let dislikeAreaSpan = document.createElement('span'); + dislikeAreaSpan.classList.add( + 'yt-core-attributed-string', + 'yt-core-attributed-string--white-space-no-wrap'); + dislikeAreaSpan.innerText = "Dislike"; + dislikeAreaSpan.style.marginLeft = "2px"; + dislikeArea.appendChild(dislikeAreaSpan); + getDislikeButton().querySelector("button").appendChild(dislikeArea); + } + getDislikeButton().querySelector(".cbox span").innerText = mobileDislikes; + } + else{ + getDislikeButton().querySelector(".button-renderer-text").innerText = + mobileDislikes; + } }, 1000); } From 06261eda3773743a9cdabb36be0da85669f0c918 Mon Sep 17 00:00:00 2001 From: hyperstown Date: Sat, 10 Sep 2022 15:27:33 +0200 Subject: [PATCH 3/5] fix dislike width --- Extensions/UserScript/Return Youtube Dislike.user.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 827303d..8d33ec9 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -651,6 +651,7 @@ if (isMobile) { dislikeAreaSpan.style.marginLeft = "2px"; dislikeArea.appendChild(dislikeAreaSpan); getDislikeButton().querySelector("button").appendChild(dislikeArea); + getDislikeButton().querySelector("button").style.width = "auto"; } getDislikeButton().querySelector(".cbox span").innerText = mobileDislikes; } From 59e3dc98eeb3a27278a155fed180a2fe28ae9344 Mon Sep 17 00:00:00 2001 From: hyperstown Date: Sat, 10 Sep 2022 16:16:25 +0200 Subject: [PATCH 4/5] fix shorts number --- Extensions/UserScript/Return Youtube Dislike.user.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 8d33ec9..20709df 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -639,7 +639,7 @@ if (isMobile) { return originalPush.apply(history, args); }; setInterval(() => { - if (getDislikeButton().querySelector(".button-renderer-text") === null) { + if (getDislikeButton().querySelector(".button-renderer-text") === null && !isShorts()) { if (getDislikeButton().querySelector(".cbox span") === null) { let dislikeArea = document.createElement('div'); dislikeArea.classList.add('cbox'); @@ -655,6 +655,9 @@ if (isMobile) { } getDislikeButton().querySelector(".cbox span").innerText = mobileDislikes; } + else if(getDislikeButton().querySelector(".button-renderer-text") === null && isShorts()){ + getDislikeTextContainer().innerText = mobileDislikes; + } else{ getDislikeButton().querySelector(".button-renderer-text").innerText = mobileDislikes; From af4c0a16b48c14faaf89f0a757a7cd650ecf3a03 Mon Sep 17 00:00:00 2001 From: hyperstown Date: Sat, 10 Sep 2022 19:20:30 +0200 Subject: [PATCH 5/5] fix wrong dislike button select --- .../UserScript/Return Youtube Dislike.user.js | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 20709df..b58e2ed 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -97,7 +97,10 @@ function getButtons() { } function getLikeButton() { - return getButtons().children[0]; + return getButtons().children[0].tagName === + "YTD-SEGMENTED-LIKE-DISLIKE-BUTTON-RENDERER" + ? getButtons().children[0].children[0] + : getButtons().children[0]; } function getLikeTextContainer() { @@ -108,15 +111,26 @@ function getLikeTextContainer() { } function getDislikeButton() { - return getButtons().children[1]; + return getButtons().children[0].tagName === + "YTD-SEGMENTED-LIKE-DISLIKE-BUTTON-RENDERER" + ? getButtons().children[0].children[1] + : getButtons().children[1]; } function getDislikeTextContainer() { - return ( + let result = getDislikeButton().querySelector("#text") ?? getDislikeButton().getElementsByTagName("yt-formatted-string")[0] ?? getDislikeButton().querySelector("span[role='text']") - ); + if (result === null) { + let textSpan = document.createElement("span"); + textSpan.id = "text"; + textSpan.style.marginLeft = "2px"; + getDislikeButton().querySelector("button").appendChild(textSpan); + getDislikeButton().querySelector("button").style.width = "auto"; + result = getDislikeButton().querySelector("#text"); + } + return result; } let mutationObserver = new Object(); @@ -639,23 +653,7 @@ if (isMobile) { return originalPush.apply(history, args); }; setInterval(() => { - if (getDislikeButton().querySelector(".button-renderer-text") === null && !isShorts()) { - if (getDislikeButton().querySelector(".cbox span") === null) { - let dislikeArea = document.createElement('div'); - dislikeArea.classList.add('cbox'); - let dislikeAreaSpan = document.createElement('span'); - dislikeAreaSpan.classList.add( - 'yt-core-attributed-string', - 'yt-core-attributed-string--white-space-no-wrap'); - dislikeAreaSpan.innerText = "Dislike"; - dislikeAreaSpan.style.marginLeft = "2px"; - dislikeArea.appendChild(dislikeAreaSpan); - getDislikeButton().querySelector("button").appendChild(dislikeArea); - getDislikeButton().querySelector("button").style.width = "auto"; - } - getDislikeButton().querySelector(".cbox span").innerText = mobileDislikes; - } - else if(getDislikeButton().querySelector(".button-renderer-text") === null && isShorts()){ + if(getDislikeButton().querySelector(".button-renderer-text") === null){ getDislikeTextContainer().innerText = mobileDislikes; } else{