diff --git a/Extensions/chrome/background.zip b/Extensions/chrome/background.zip deleted file mode 100644 index 149629e..0000000 Binary files a/Extensions/chrome/background.zip and /dev/null differ diff --git a/Extensions/chrome/manifest.json b/Extensions/chrome/manifest.json index 985638f..c405b31 100644 --- a/Extensions/chrome/manifest.json +++ b/Extensions/chrome/manifest.json @@ -1,10 +1,10 @@ { "name": "Return YouTube Dislike", "description": "Returns ability to see dislikes", - "version": "0.0.0.7", + "version": "0.0.0.9", "manifest_version": 3, "background": { - "service_worker": "background.js" + "service_worker": "return-youtube-dislike.background.js" }, "icons": { "48": "icons/icon48.png", @@ -21,7 +21,7 @@ "content_scripts": [ { "matches": ["*://*.youtube.com/*"], - "js": ["content-script.js"], + "js": ["return-youtube-dislike.content-script.js"], "run_at": "document_start", "css": ["content-style.css"] } @@ -31,7 +31,7 @@ }, "web_accessible_resources": [ { - "resources": ["script.js"], + "resources": ["return-youtube-dislike.script.js"], "matches": ["*://*.youtube.com/*"] } ] diff --git a/Extensions/chrome/background.js b/Extensions/chrome/return-youtube-dislike.background.js similarity index 100% rename from Extensions/chrome/background.js rename to Extensions/chrome/return-youtube-dislike.background.js diff --git a/Extensions/chrome/content-script.js b/Extensions/chrome/return-youtube-dislike.content-script.js similarity index 82% rename from Extensions/chrome/content-script.js rename to Extensions/chrome/return-youtube-dislike.content-script.js index 1165c84..89958c7 100644 --- a/Extensions/chrome/content-script.js +++ b/Extensions/chrome/return-youtube-dislike.content-script.js @@ -2,7 +2,7 @@ chrome.runtime.sendMessage({}, (securityToken) => { var script = document.createElement("script"); script.setAttribute("security-token", securityToken); script.setAttribute("extension-id", chrome.runtime.id); - script.src = chrome.runtime.getURL("script.js"); + script.src = chrome.runtime.getURL("return-youtube-dislike.script.js"); script.onload = function () { this.remove(); }; diff --git a/Extensions/chrome/return-youtube-dislike.content-script.zip b/Extensions/chrome/return-youtube-dislike.content-script.zip new file mode 100644 index 0000000..a22e607 Binary files /dev/null and b/Extensions/chrome/return-youtube-dislike.content-script.zip differ diff --git a/Extensions/chrome/script.js b/Extensions/chrome/return-youtube-dislike.script.js similarity index 67% rename from Extensions/chrome/script.js rename to Extensions/chrome/return-youtube-dislike.script.js index a63dede..6a148f7 100644 --- a/Extensions/chrome/script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -1,5 +1,5 @@ (function (extensionId) { - function cLog (message, writer) { + function cLog(message, writer) { message = `[return youtube dislike]: ${message}`; if (writer) { writer(message); @@ -8,65 +8,71 @@ } } - function getButtons () { - return document - .getElementById('menu-container') - ?.querySelector('#top-level-buttons-computed'); + function getButtons() { + if (document.getElementById("menu-container").offsetParent === null) { + return document.querySelector( + "ytd-menu-renderer.ytd-watch-metadata > div" + ); + } else { + return document + .getElementById("menu-container") + ?.querySelector("#top-level-buttons-computed"); + } } - function getLikeButton () { + function getLikeButton() { return getButtons().children[0]; } - function getDislikeButton () { + function getDislikeButton() { return getButtons().children[1]; } - function isVideoLiked () { - return getLikeButton().classList.contains('style-default-active'); + function isVideoLiked() { + return getLikeButton().classList.contains("style-default-active"); } - function isVideoDisliked () { - return getDislikeButton().classList.contains('style-default-active'); + function isVideoDisliked() { + return getDislikeButton().classList.contains("style-default-active"); } - function isVideoNotLiked () { - return getLikeButton().classList.contains('style-text'); + function isVideoNotLiked() { + return getLikeButton().classList.contains("style-text"); } - function isVideoNotDisliked () { - return getDislikeButton().classList.contains('style-text'); + function isVideoNotDisliked() { + return getDislikeButton().classList.contains("style-text"); } - function getState () { + function getState() { if (isVideoLiked()) { - return 'liked'; + return "liked"; } if (isVideoDisliked()) { - return 'disliked'; + return "disliked"; } - return 'neutral'; + return "neutral"; } - function setLikes (likesCount) { - getButtons().children[0].querySelector('#text').innerText = likesCount; + function setLikes(likesCount) { + getButtons().children[0].querySelector("#text").innerText = likesCount; } - function setDislikes (dislikesCount) { - getButtons().children[1].querySelector('#text').innerText = dislikesCount; + function setDislikes(dislikesCount) { + getButtons().children[1].querySelector("#text").innerText = dislikesCount; } - function setState () { + function setState() { let statsSet = false; chrome.runtime.sendMessage( extensionId, { - message: 'fetch_from_youtube', - videoId: getVideoId(window.location.href) + message: "fetch_from_youtube", + videoId: getVideoId(window.location.href), }, function (response) { if (response != undefined) { - cLog('response from youtube:'); + cLog("response from youtube:"); cLog(JSON.stringify(response)); try { if (response.likes || response.dislikes) { @@ -85,12 +91,12 @@ chrome.runtime.sendMessage( extensionId, { - message: 'set_state', + message: "set_state", videoId: getVideoId(window.location.href), - state: getState() + state: getState(), }, function (response) { - cLog('response from api:'); + cLog("response from api:"); cLog(JSON.stringify(response)); if (response != undefined && !statsSet) { const formattedDislike = numberFormat(response.dislikes); @@ -103,65 +109,65 @@ ); } - function likeClicked () { + function likeClicked() { // console.log("like" + getState()); // setState(); } - function dislikeClicked () { + function dislikeClicked() { // console.log("dislike" + getState()); // setState(); } - function setInitalState () { + function setInitalState() { setState(); // setTimeout(() => sendVideoIds(), 1500); } - function getVideoId (url) { + function getVideoId(url) { const urlObject = new URL(url); - const videoId = urlObject.searchParams.get('v'); + const videoId = urlObject.searchParams.get("v"); return videoId; } - function isVideoLoaded () { + function isVideoLoaded() { const videoId = getVideoId(window.location.href); return ( document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null ); } - function numberFormat (numberState) { + function numberFormat(numberState) { const userLocales = navigator.language; - const formatter = Intl.NumberFormat(userLocales, { notation: 'compact' }); + const formatter = Intl.NumberFormat(userLocales, { notation: "compact" }); return formatter.format(numberState); } var jsInitChecktimer = null; - function setEventListeners (evt) { - function checkForJS_Finish () { + function setEventListeners(evt) { + function checkForJS_Finish() { if (getButtons()?.offsetParent && isVideoLoaded()) { clearInterval(jsInitChecktimer); jsInitChecktimer = null; const buttons = getButtons(); if (!window.returnDislikeButtonlistenersSet) { - buttons.children[0].addEventListener('click', likeClicked); - buttons.children[1].addEventListener('click', dislikeClicked); + buttons.children[0].addEventListener("click", likeClicked); + buttons.children[1].addEventListener("click", dislikeClicked); window.returnDislikeButtonlistenersSet = true; } setInitalState(); } } - if (window.location.href.indexOf('watch?') >= 0) { + if (window.location.href.indexOf("watch?") >= 0) { jsInitChecktimer = setInterval(checkForJS_Finish, 111); } } - function createRateBar (likes, dislikes) { + function createRateBar(likes, dislikes) { var rateBar = document.getElementById( - 'return-youtube-dislike-bar-container' + "return-youtube-dislike-bar-container" ); const widthPx = @@ -201,9 +207,9 @@ document.getElementById("return-youtube-dislike-bar").style.width = widthPercent + "%"; - document - .getElementById("ryd-dislike-tooltip") - .firstChild().innerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`; + document.querySelector( + "#ryd-dislike-tooltip > #tooltip" + ).innerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`; } } @@ -228,7 +234,7 @@ setEventListeners(); - document.addEventListener('yt-navigate-finish', function (event) { + document.addEventListener("yt-navigate-finish", function (event) { if (jsInitChecktimer !== null) clearInterval(jsInitChecktimer); window.returnDislikeButtonlistenersSet = false; setEventListeners(); @@ -239,4 +245,4 @@ // }; // setTimeout(() => sendVideoIds(), 1500); -})(document.currentScript.getAttribute('extension-id')); +})(document.currentScript.getAttribute("extension-id")); diff --git a/Extensions/firefox/manifest.json b/Extensions/firefox/manifest.json index 6114f50..59fa79e 100644 --- a/Extensions/firefox/manifest.json +++ b/Extensions/firefox/manifest.json @@ -1,10 +1,10 @@ { - "name": "YouTube Dislike Button", + "name": "Return Youtube Dislike", "description": "Returns ability to see dislikes", - "version": "0.0.0.8", + "version": "0.0.0.9", "manifest_version": 2, "background": { - "scripts": ["background.js"] + "scripts": ["return-youtube-dislike.background.js"] }, "icons": { "48": "icons/icon48.png", diff --git a/Extensions/firefox/packed.zip b/Extensions/firefox/packed.zip index edd4c53..74e0d60 100644 Binary files a/Extensions/firefox/packed.zip and b/Extensions/firefox/packed.zip differ diff --git a/Extensions/firefox/background.js b/Extensions/firefox/return-youtube-dislike.background.js similarity index 98% rename from Extensions/firefox/background.js rename to Extensions/firefox/return-youtube-dislike.background.js index e9bf48d..57d3ab4 100644 --- a/Extensions/firefox/background.js +++ b/Extensions/firefox/return-youtube-dislike.background.js @@ -72,10 +72,11 @@ browser.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => { if (changeInfo.status == "complete" && new Date() - lastCalled > 100) { lastCalled = new Date(); console.log("Tab update complete"); + if (tab.url && tab.url.indexOf("youtube.") < 0) return; browser.tabs.get(tabId, (tab) => { browser.tabs.executeScript(tab.id, { - file: "script.js", + file: "return-youtube-dislike.script.js", }); }); } diff --git a/Extensions/firefox/script.js b/Extensions/firefox/return-youtube-dislike.script.js similarity index 85% rename from Extensions/firefox/script.js rename to Extensions/firefox/return-youtube-dislike.script.js index 7955e0e..058a38b 100644 --- a/Extensions/firefox/script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -8,9 +8,13 @@ function cLog(message, writer) { } function getButtons() { - return document - .getElementById("menu-container") - ?.querySelector("#top-level-buttons-computed"); + if (document.getElementById("menu-container").offsetParent === null) { + return document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div"); + } else { + return document + .getElementById("menu-container") + ?.querySelector("#top-level-buttons-computed"); + } } function getLikeButton() { @@ -170,19 +174,22 @@ function setEventListeners(evt) { function createRateBar(likes, dislikes) { var rateBar = document.getElementById("return-youtube-dislike-bar-container"); - + const widthPx = - getButtons().children[0].clientWidth + - getButtons().children[1].clientWidth + - 8; + getButtons().children[0].clientWidth + + getButtons().children[1].clientWidth + + 8; - const widthPercent = - likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50; + const widthPercent = + likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50; - if (!rateBar) { - document.getElementById("menu-container").insertAdjacentHTML( - "beforeend", - ` + if (!rateBar) { + ( + document.querySelector("#actions-inner") || + document.getElementById("menu-container") + ).insertAdjacentHTML( + "beforeend", + `