From 6cba112185de0900200ca3d9ff66beeebe8b371a Mon Sep 17 00:00:00 2001 From: mphelp Date: Sun, 5 Dec 2021 20:52:07 -0600 Subject: [PATCH 1/3] Userscript clips functionality --- Extensions/UserScript/Return Youtube Dislike.user.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 2e6ec22..917eeed 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -265,10 +265,13 @@ function setInitialState() { } function getVideoId() { - const urlParams = new URLSearchParams(window.location.search); - const videoId = urlParams.get("v"); - - return videoId; + const urlObject = new URL(window.location.href); + const pathname = urlObject.pathname; + if (pathname.startsWith('/clips')) { + return document.querySelector("meta[itemprop='videoId']").content; + } else { + return urlObject.searchParams.get("v"); + } } function isVideoLoaded() { From 672c6db3f3db1aaed8871d062fd54f372eefa4ed Mon Sep 17 00:00:00 2001 From: mphelp Date: Mon, 6 Dec 2021 08:07:06 -0600 Subject: [PATCH 2/3] Fix Issue 199: Null check on menu container --- Extensions/UserScript/Return Youtube Dislike.user.js | 2 +- Extensions/chrome/return-youtube-dislike.script.js | 2 +- Extensions/firefox/return-youtube-dislike.script.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 2e6ec22..e1fe601 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -37,7 +37,7 @@ function getButtons() { if (isMobile) { return document.querySelector(".slim-video-action-bar-actions"); } - if (document.getElementById("menu-container").offsetParent === null) { + if (document.getElementById("menu-container")?.offsetParent === null) { return document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div"); } else { return document diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index d8872d0..e4dad22 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -20,7 +20,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; function getButtons() { //--- If Menu Element Is Displayed: ---// - if (document.getElementById('menu-container').offsetParent === null) { + if (document.getElementById('menu-container')?.offsetParent === null) { return document.querySelector( "ytd-menu-renderer.ytd-watch-metadata > div" ); diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 993a94c..566c460 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -20,7 +20,7 @@ function cLog(message, writer) { function getButtons() { //--- If Menu Element Is Displayed: ---// - if (document.getElementById("menu-container").offsetParent === null) { + if (document.getElementById("menu-container")?.offsetParent === null) { return document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div"); //--- If Menu Element Isnt Displayed: ---// } else { From a0e1a6dbab4c16752e24054c383d492d7a624d2e Mon Sep 17 00:00:00 2001 From: surrealegg Date: Mon, 6 Dec 2021 22:28:45 +0400 Subject: [PATCH 3/3] Fix Dislikes of Private Videos are "NaN" will fix #230 List of changes: * Adding a check to see if traceId exsits on response. This appears during error, so it will prevent setting dislike count to NaN. * Changed a way to check if fields exist. Because the old way 0 likes or 0 dislikes are considered invalid. --- Extensions/chrome/return-youtube-dislike.script.js | 14 +++++++------- .../firefox/return-youtube-dislike.script.js | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index d8872d0..84d3a68 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -24,7 +24,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; return document.querySelector( "ytd-menu-renderer.ytd-watch-metadata > div" ); - //--- If Menu Element Isnt Displayed: ---// + //--- If Menu Element Isnt Displayed: ---// } else { return document .getElementById("menu-container") @@ -58,12 +58,12 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; function getState() { if (isVideoLiked()) { - return {current: LIKED_STATE, previous: storedData.previousState}; + return { current: LIKED_STATE, previous: storedData.previousState }; } if (isVideoDisliked()) { - return {current: DISLIKED_STATE, previous: storedData.previousState}; + return { current: DISLIKED_STATE, previous: storedData.previousState }; } - return {current: NEUTRAL_STATE, previous: storedData.previousState}; + return { current: NEUTRAL_STATE, previous: storedData.previousState }; } //--- Sets The Likes And Dislikes Values ---// @@ -89,7 +89,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; cLog("response from youtube:"); cLog(JSON.stringify(response)); try { - if (response.likes && response.dislikes) { + if ("likes" in response && "dislikes" in response) { const formattedDislike = numberFormat(response.dislikes); setDislikes(formattedDislike); storedData.dislikes = parseInt(response.dislikes); @@ -113,7 +113,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; function (response) { cLog("response from api:"); cLog(JSON.stringify(response)); - if (response != undefined && !statsSet) { + if (response != undefined && !("traceId" in response) && !statsSet) { const formattedDislike = numberFormat(response.dislikes); // setLikes(response.likes); setDislikes(formattedDislike); @@ -136,7 +136,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; function dislikeClicked() { let state = getState().current; - console.log("Dislike State:",getState()); + console.log("Dislike State:", getState()); if (state == DISLIKED_STATE) { storedData.dislikes++; diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 993a94c..80ddd5d 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -56,12 +56,12 @@ function isVideoNotDisliked() { function getState() { if (isVideoLiked()) { - return {current: LIKED_STATE, previous: storedData.previousState}; + return { current: LIKED_STATE, previous: storedData.previousState }; } if (isVideoDisliked()) { - return {current: DISLIKED_STATE, previous: storedData.previousState}; + return { current: DISLIKED_STATE, previous: storedData.previousState }; } - return {current: NEUTRAL_STATE, previous: storedData.previousState}; + return { current: NEUTRAL_STATE, previous: storedData.previousState }; } //--- Sets The Likes And Dislikes Values ---// @@ -84,7 +84,7 @@ function setState() { cLog("response from youtube:"); cLog(JSON.stringify(response)); try { - if (response.likes && response.dislikes) { + if ("likes" in response && "dislikes" in response) { const formattedDislike = numberFormat(response.dislikes); setDislikes(formattedDislike); storedData.dislikes = parseInt(response.dislikes); @@ -107,7 +107,7 @@ function setState() { function (response) { cLog("response from api:"); cLog(JSON.stringify(response)); - if (response != undefined && !statsSet) { + if (response != undefined && !("traceId" in response) && !statsSet) { const formattedDislike = numberFormat(response.dislikes); storedData.dislikes = response.dislikes; // setLikes(response.likes);