From 9df69d65dd8b3d65bd854eb951685302d341c211 Mon Sep 17 00:00:00 2001 From: Dmitrii Selivanov Date: Fri, 19 Nov 2021 16:56:21 +0300 Subject: [PATCH] Release 0.0.0.4 Rate bar added Bug caused by security token resolved by removing security token Various bugs and console errors fixed More like/dislike data is now saved on scroll --- Extensions/chrome/background.js | 94 ++++++---- Extensions/chrome/background.zip | Bin 0 -> 4315 bytes Extensions/chrome/content-script.js | 2 +- Extensions/chrome/content-style.css | 16 ++ Extensions/chrome/manifest.json | 7 +- Extensions/chrome/popup.js | 5 +- Extensions/chrome/script.js | 271 +++++++++++++++++----------- StaticSite/index.html | 2 +- 8 files changed, 249 insertions(+), 148 deletions(-) create mode 100644 Extensions/chrome/background.zip create mode 100644 Extensions/chrome/content-style.css diff --git a/Extensions/chrome/background.js b/Extensions/chrome/background.js index aca9ba3..5a3d3ee 100644 --- a/Extensions/chrome/background.js +++ b/Extensions/chrome/background.js @@ -1,41 +1,61 @@ const apiUrl = "https://return-youtube-dislike-api.azurewebsites.net"; -const securityToken = Math.random().toString(36).substring(2, 15); -chrome.runtime.onMessage.addListener((request, sender, sendResponse) => { - sendResponse(securityToken); -}); +// Security token causes issues if extension is reloaded/updated while several tabs are open +// const securityToken = Math.random().toString(36).substring(2, 15); +// +// chrome.runtime.onMessage.addListener((request, sender, sendResponse) => { +// sendResponse(securityToken); +// }); -chrome.runtime.onMessageExternal.addListener((request, sender, sendResponse) => { - if (request.securityToken === securityToken) { - if (request.message === "get_auth_token") { - // chrome.identity.getAuthToken({ interactive: true }, function (token) { - // console.log(token); - // chrome.identity.getProfileUserInfo(function (userInfo) { - // console.log(JSON.stringify(userInfo)); - // }); - // }); - } else if (request.message === "log_off") { - // console.log("logging off"); - // chrome.identity.clearAllCachedAuthTokens(() => console.log("logged off")); - } else if (request.message == "set_state") { - // console.log(request); - // chrome.identity.getAuthToken({ interactive: true }, function (token) { - let token = ""; - fetch(`${apiUrl}/votes?videoId=${request.videoId}`, { - method: "GET", - headers: { - Accept: "application/json", - Authorization: "Bearer " + token, - }, - }) - .then((response) => response.json()) - .then((response) => { - console.log(response); - sendResponse(response); - }) - .catch(); - //}); - return true; +chrome.runtime.onMessageExternal.addListener( + (request, sender, sendResponse) => { + if (request.message === "get_auth_token") { + // chrome.identity.getAuthToken({ interactive: true }, function (token) { + // console.log(token); + // chrome.identity.getProfileUserInfo(function (userInfo) { + // console.log(JSON.stringify(userInfo)); + // }); + // }); + } else if (request.message === "log_off") { + // console.log("logging off"); + // chrome.identity.clearAllCachedAuthTokens(() => console.log("logged off")); + } else if (request.message == "set_state") { + // console.log(request); + // chrome.identity.getAuthToken({ interactive: true }, function (token) { + let token = ""; + fetch(`${apiUrl}/votes?videoId=${request.videoId}`, { + method: "GET", + headers: { + Accept: "application/json", + Authorization: "Bearer " + token, + }, + }) + .then((response) => response.json()) + .then((response) => { + sendResponse(response); + }) + .catch(); + //}); + return true; + } else if (request.message == "send_links") { + toSend = toSend.concat(request.videoIds.filter((x) => !sentIds.has(x))); + if (toSend.length >= 20) { + fetch(`${apiUrl}/votes`, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(toSend), + }); + for (const toSendUrl of toSend) { + sentIds.add(toSendUrl); + } + toSend = []; } - } -}); \ No newline at end of file + } + + } +); + +const sentIds = new Set(); +let toSend = []; diff --git a/Extensions/chrome/background.zip b/Extensions/chrome/background.zip new file mode 100644 index 0000000000000000000000000000000000000000..c2686c3f23e198d0a262c7d9b5a44ff714e44d9b GIT binary patch literal 4315 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 literal 0 HcmV?d00001 diff --git a/Extensions/chrome/content-script.js b/Extensions/chrome/content-script.js index ebed2e3..b5bbd3d 100644 --- a/Extensions/chrome/content-script.js +++ b/Extensions/chrome/content-script.js @@ -7,4 +7,4 @@ chrome.runtime.sendMessage({}, (securityToken) => { this.remove(); }; (document.head || document.documentElement).appendChild(script); -}); \ No newline at end of file +}); diff --git a/Extensions/chrome/content-style.css b/Extensions/chrome/content-style.css new file mode 100644 index 0000000..c06e123 --- /dev/null +++ b/Extensions/chrome/content-style.css @@ -0,0 +1,16 @@ +#return-youtube-dislike-bar-container { + background: #c6c6c6; +} + +#return-youtube-dislike-bar { + background: #5094c8; +} + + +[dark] #return-youtube-dislike-bar-container { + +} + +[dark] #return-youtube-dislike-bar { + background: #3ea6ff; +} diff --git a/Extensions/chrome/manifest.json b/Extensions/chrome/manifest.json index 807d7c0..aed3d45 100644 --- a/Extensions/chrome/manifest.json +++ b/Extensions/chrome/manifest.json @@ -1,7 +1,7 @@ { "name": "Youtube Dislike Button", "description": "Returns ability to see dislikes", - "version": "0.0.0.3", + "version": "0.0.0.4", "manifest_version": 3, "background": { "service_worker": "background.js" @@ -18,7 +18,8 @@ { "matches": ["*://*.youtube.com/*"], "js": ["content-script.js"], - "run_at": "document_start" + "run_at": "document_start", + "css": ["content-style.css"] } ], "externally_connectable": { @@ -30,4 +31,4 @@ "matches": ["*://*.youtube.com/*"] } ] -} \ No newline at end of file +} diff --git a/Extensions/chrome/popup.js b/Extensions/chrome/popup.js index 9dbdffb..0507499 100644 --- a/Extensions/chrome/popup.js +++ b/Extensions/chrome/popup.js @@ -4,7 +4,6 @@ document.querySelector('#login') chrome.runtime.sendMessage({ message: 'get_auth_token' }); }); -document.querySelector('#log_off') -.addEventListener('click', function () { - chrome.runtime.sendMessage({ message: 'log_off' }); +document.querySelector("#log_off").addEventListener("click", function () { + chrome.runtime.sendMessage({ message: "log_off" }); }); diff --git a/Extensions/chrome/script.js b/Extensions/chrome/script.js index 64dc402..9aadd3f 100644 --- a/Extensions/chrome/script.js +++ b/Extensions/chrome/script.js @@ -1,122 +1,187 @@ -(function(securityToken, extensionId) { - function getButtons() { - return document - .getElementById("menu-container") - ?.querySelector("#top-level-buttons-computed"); - } +(function (extensionId) { + function getButtons() { + return document + .getElementById("menu-container") + ?.querySelector("#top-level-buttons-computed"); + } - function getLikeButton() { - return getButtons().children[0]; - } + function getLikeButton() { + return getButtons().children[0]; + } - function getDislikeButton() { - return getButtons().children[1]; - } + 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() { - if (isVideoLiked()) { - return "liked"; + function getState() { + if (isVideoLiked()) { + return "liked"; + } + if (isVideoDisliked()) { + return "disliked"; + } + return "neutral"; + } + + function setLikes(likesCount) { + getButtons().children[0].querySelector("#text").innerText = likesCount; + } + + function setDislikes(dislikesCount) { + getButtons().children[1].querySelector("#text").innerText = dislikesCount; + } + + function setState() { + chrome.runtime.sendMessage( + extensionId, + { + message: "set_state", + videoId: getVideoId(window.location.href), + state: getState(), + }, + function (response) { + if (response != undefined) { + const formattedDislike = numberFormat(response.dislikes); + // setLikes(response.likes); + setDislikes(formattedDislike); + createRateBar(response.likes, response.dislikes); + } else { } - if (isVideoDisliked()) { - return "disliked"; + } + ); + } + + function likeClicked() { + // console.log("like" + getState()); + // setState(); + } + + function dislikeClicked() { + // console.log("dislike" + getState()); + // setState(); + } + + function setInitalState() { + setState(); + setTimeout(() => sendVideoIds(), 1500); + } + + function getVideoId(url) { + const urlObject = new URL(url); + const videoId = urlObject.searchParams.get("v"); + return videoId; + } + + function isVideoLoaded() { + const videoId = getVideoId(window.location.href); + return ( + document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null + ); + } + + function numberFormat(numberState) { + const userLocales = navigator.language; + const formatter = Intl.NumberFormat(userLocales, { notation: "compact" }); + return formatter.format(numberState); + } + + var jsInitChecktimer = null; + + 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); + window.returnDislikeButtonlistenersSet = true; } - return "neutral"; + setInitalState(); + } } - function setLikes(likesCount) { - getButtons().children[0].querySelector("#text").innerText = likesCount; + if (window.location.href.indexOf("watch?") >= 0) { + jsInitChecktimer = setInterval(checkForJS_Finish, 111); } + } - function setDislikes(dislikesCount) { - getButtons().children[1].querySelector("#text").innerText = dislikesCount; + function createRateBar(likes, dislikes) { + var rateBar = document.getElementById( + "return-youtube-dislike-bar-container" + ); + const widthPx = + getButtons().children[0].clientWidth + + getButtons().children[1].clientWidth; + + const widthPercent = + likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50; + + if (!rateBar) { + document.getElementById("menu-container").insertAdjacentHTML( + "beforeend", + `
+
+
` + ); + } else { + document.getElementById( + "return-youtube-dislike-bar-container" + ).style.width = widthPx + "px"; + document.getElementById("return-youtube-dislike-bar").style.width = + widthPercent + "%"; } + } - function setState() { - chrome.runtime.sendMessage(extensionId, { - securityToken: securityToken, - message: "set_state", - videoId: getVideoId(), - state: getState(), - }, - function(response) { - if (response != undefined) { - const formattedDislike = numberFormat(response.dislikes); - // setLikes(response.likes); - console.log(response); - setDislikes(formattedDislike); - } else {} - } - ); - } + function sendVideoIds() { + const ids = Array.from( + document.getElementsByClassName( + "yt-simple-endpoint ytd-compact-video-renderer" + ) + ) + .concat( + Array.from( + document.getElementsByClassName("yt-simple-endpoint ytd-thumbnail") + ) + ) + .filter((x) => x.href && x.href.indexOf("/watch?v=") > 0) + .map((x) => getVideoId(x.href)); + chrome.runtime.sendMessage(extensionId, { + message: "send_links", + videoIds: ids, + }); + } - function likeClicked() { - console.log("like" + getState()); - setState(); - } - - function dislikeClicked() { - console.log("dislike" + getState()); - setState(); - } - - function setInitalState() { - setState(); - } - - function getVideoId() { - const urlParams = new URLSearchParams(window.location.search); - const videoId = urlParams.get("v"); - return videoId; - } - - function isVideoLoaded() { - const videoId = getVideoId(); - return ( - document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null - ); - } - - function numberFormat(numberState) { - const userLocales = navigator.language; - const formatter = Intl.NumberFormat(userLocales, { notation: "compact" }); - return formatter.format(numberState); - } - - function setEventListeners(evt) { - function checkForJS_Finish() { - if (getButtons()?.offsetParent && isVideoLoaded()) { - clearInterval(jsInitChecktimer); - const buttons = getButtons(); - if (!window.returnDislikeButtonlistenersSet) { - buttons.children[0].addEventListener("click", likeClicked); - buttons.children[1].addEventListener("click", dislikeClicked); - window.returnDislikeButtonlistenersSet = true; - } - setInitalState(); - } - } - - if (window.location.href.indexOf("watch?") >= 0) { - var jsInitChecktimer = setInterval(checkForJS_Finish, 111); - } - } + setEventListeners(); + document.addEventListener("yt-navigate-finish", function (event) { + if (jsInitChecktimer !== null) clearInterval(jsInitChecktimer); + window.returnDislikeButtonlistenersSet = false; setEventListeners(); + }); -})(document.currentScript.getAttribute("security-token"), document.currentScript.getAttribute("extension-id")); + window.onscrollend = () => { + sendVideoIds(); + }; + + setTimeout(() => sendVideoIds(), 1500); +})(document.currentScript.getAttribute("extension-id")); diff --git a/StaticSite/index.html b/StaticSite/index.html index aa6339e..37cfd6c 100644 --- a/StaticSite/index.html +++ b/StaticSite/index.html @@ -20,7 +20,7 @@

Now available in firefox addon store!

-

Chrome users - update to 0.0.0.3 (via Load Unpacked, instructions below) to prevent Chrome disabling the extension

+

Version 0.0.0.4 released - ratio (like/dislike) bar added

This is a Chrome/Firefox/Userscript extension that return dislike statistics to YouTube. For now, it only works if a video had public display of dislikes enabled before YouTube removed dislike stats.