From 0440c60228baa167d13fe2441f5bed14ff1b91b4 Mon Sep 17 00:00:00 2001 From: Jack <69592559+jacksbrand@users.noreply.github.com> Date: Sun, 5 Dec 2021 07:31:55 +0000 Subject: [PATCH 1/3] Fixing small typo & grammatical error on FAQ page --- Website/pages/faq.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Website/pages/faq.vue b/Website/pages/faq.vue index b29fcec..99d266d 100644 --- a/Website/pages/faq.vue +++ b/Website/pages/faq.vue @@ -37,7 +37,7 @@ }, { question: "Why isn't the dislike count updating?", - answer: "Right now video dislikes are cached and they arent updated very frequenly. Currently this is set to update once every 2–3 days. This isn't ideal and we are working on improving how often we can update them" + answer: "Right now video dislikes are cached and they aren't updated very frequently. Currently this is set to update once every 2–3 days. This isn't ideal and we are working on improving how often we can update them." }, { question: "How does this work?", From af013d72f2d94e69b5a0b23c2a3a9aedb33345f1 Mon Sep 17 00:00:00 2001 From: Trevor Petersen Date: Sun, 5 Dec 2021 00:14:04 -0800 Subject: [PATCH 2/3] Fix misspelling of word 'initial' in method names --- Extensions/UserScript/Return Youtube Dislike.user.js | 4 ++-- Extensions/chrome/return-youtube-dislike.script.js | 4 ++-- Extensions/firefox/return-youtube-dislike.script.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 937e282..aa93161 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -202,7 +202,7 @@ function dislikeClicked() { setState(); } -function setInitalState() { +function setInitialState() { setState(); } @@ -284,7 +284,7 @@ function setEventListeners(evt) { buttons.children[1].addEventListener("click", dislikeClicked); window.returnDislikeButtonlistenersSet = true; } - setInitalState(); + setInitialState(); } } diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index dc713ca..178b7d5 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -147,7 +147,7 @@ // setState(); } - function setInitalState() { + function setInitialState() { setState(); setTimeout(() => sendVideoIds(), 1500); } @@ -196,7 +196,7 @@ buttons.children[1].addEventListener("click", dislikeClicked); window.returnDislikeButtonlistenersSet = true; } - setInitalState(); + setInitialState(); } } diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index bdf3184..25c4846 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -133,7 +133,7 @@ function dislikeClicked() { // setState(); } -function setInitalState() { +function setInitialState() { setState(); // setTimeout(() => sendVideoIds(), 1500); } @@ -193,7 +193,7 @@ function setEventListeners(evt) { // }); window.returnDislikeButtonlistenersSet = true; } - setInitalState(); + setInitialState(); } } From eebf832a5323d3679ba3f4f51f465794b69d24e9 Mon Sep 17 00:00:00 2001 From: ironblockhd <69308275+ironblockhd@users.noreply.github.com> Date: Sun, 5 Dec 2021 10:05:37 +0100 Subject: [PATCH 3/3] UserScript: Add support for mobile --- .../UserScript/Return Youtube Dislike.user.js | 97 ++++++++++++++++--- 1 file changed, 82 insertions(+), 15 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 937e282..70e13cf 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -16,15 +16,21 @@ // @downloadURL https://github.com/Anarios/return-youtube-dislike/raw/main/Extensions/UserScript/Return%20Youtube%20Dislike.user.js // @updateURL https://github.com/Anarios/return-youtube-dislike/raw/main/Extensions/UserScript/Return%20Youtube%20Dislike.user.js // @grant GM.xmlHttpRequest +// @connect youtube.com // @grant GM_addStyle // @run-at document-end // ==/UserScript== +var isMobile = (location.hostname == "m.youtube.com"); +var mobileDislikes = 0; function cLog(text, subtext = '') { subtext = subtext.trim() === '' ? '' : `(${subtext})`; console.log(`[Return YouTube Dislikes] ${text} ${subtext}`); } function getButtons() { + if (isMobile) { + 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"); } else { @@ -43,18 +49,30 @@ function getDislikeButton() { } function isVideoLiked() { + if (isMobile) { + return getLikeButton().querySelector("button").getAttribute("aria-label") == "true"; + } return getLikeButton().classList.contains("style-default-active"); } function isVideoDisliked() { + if (isMobile) { + return getDislikeButton().querySelector("button").getAttribute("aria-label") == "true"; + } return getDislikeButton().classList.contains("style-default-active"); } function isVideoNotLiked() { + if (isMobile) { + return !isVideoLiked(); + } return getLikeButton().classList.contains("style-text"); } function isVideoNotDisliked() { + if (isMobile) { + return !isVideoDisliked(); + } return getDislikeButton().classList.contains("style-text"); } @@ -69,10 +87,18 @@ function getState() { } function setLikes(likesCount) { + if (isMobile) { + getButtons().children[0].querySelector(".button-renderer-text").innerText = likesCount; + return; + } getButtons().children[0].querySelector("#text").innerText = likesCount; } function setDislikes(dislikesCount) { + if (isMobile) { + mobileDislikes = dislikesCount; + return; + } getButtons().children[1].querySelector("#text").innerText = dislikesCount; } @@ -113,6 +139,9 @@ function setDislikes(dislikesCount) { `); function createRateBar(likes, dislikes) { + if (isMobile) { + return; + } var rateBar = document.getElementById("return-youtube-dislike-bar-container"); const widthPx = @@ -161,22 +190,45 @@ function createRateBar(likes, dislikes) { function setState() { cLog("Fetching votes..."); let statsSet = false; - - fetch(`https://www.youtube.com/watch?v=${getVideoId()}`).then((response) => { - response.text().then((text) => { - let result = getDislikesFromYoutubeResponse(text); - if (result) { - cLog("response from youtube:"); - cLog(JSON.stringify(result)); - if (result.likes && result.dislikes) { - const formattedDislike = numberFormat(result.dislikes); - setDislikes(formattedDislike); - createRateBar(result.likes, result.dislikes); - statsSet = true; + if (isMobile) { + GM.xmlHttpRequest({ + method: "GET", + url: `https://youtube.com/watch?v=${getVideoId()}`, + headers: { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.3674" + }, + onload: (response) => { + let result = getDislikesFromYoutubeResponse(response.responseText); + if (result) { + cLog("response from youtube:"); + cLog(JSON.stringify(result)); + if (result.likes && result.dislikes) { + const formattedDislike = numberFormat(result.dislikes); + setDislikes(formattedDislike); + createRateBar(result.likes, result.dislikes); + statsSet = true; + } } } }); - }); + } + else { + fetch(`https://youtube.com/watch?v=${getVideoId()}`).then((response) => { + response.text().then((text) => { + let result = getDislikesFromYoutubeResponse(text); + if (result) { + cLog("response from youtube:"); + cLog(JSON.stringify(result)); + if (result.likes && result.dislikes) { + const formattedDislike = numberFormat(result.dislikes); + setDislikes(formattedDislike); + createRateBar(result.likes, result.dislikes); + statsSet = true; + } + } + }); + }); + } fetch( `https://returnyoutubedislikeapi.com/votes?videoId=${getVideoId()}` @@ -214,6 +266,9 @@ function getVideoId() { } function isVideoLoaded() { + if (isMobile) { + return document.getElementById("player").getAttribute("loading") == "false"; + } const videoId = getVideoId(); return ( @@ -273,7 +328,8 @@ function getDislikesFromYoutubeResponse(htmlResponse) { } function setEventListeners(evt) { - function checkForJS_Finish() { + function checkForJS_Finish(check) { + console.log() if (getButtons()?.offsetParent && isVideoLoaded()) { clearInterval(jsInitChecktimer); const buttons = getButtons(); @@ -288,7 +344,7 @@ function setEventListeners(evt) { } } - if (window.location.href.indexOf("watch?") >= 0) { + if (window.location.href.indexOf("watch?") >= 0 || (isMobile && evt?.indexOf("watch?") >= 0)) { cLog("Setting up..."); var jsInitChecktimer = setInterval(checkForJS_Finish, 111); } @@ -299,3 +355,14 @@ function setEventListeners(evt) { window.addEventListener("yt-navigate-finish", setEventListeners, true); setEventListeners(); })(); +if (isMobile) { + let originalPush = history.pushState; + history.pushState = function (...args) { + window.returnDislikeButtonlistenersSet = false; + setEventListeners(args[2]); + return originalPush.apply(history, args); + } + setInterval(() => { + getDislikeButton().querySelector(".button-renderer-text").innerText = mobileDislikes; + }, 1000); +} \ No newline at end of file