From f1e15b076cf939e27d4c91245c08de130997fc7a Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Fri, 17 Dec 2021 23:32:33 +0100 Subject: [PATCH 01/13] remove confusing RYD class structure and make everything function --- Extensions/combined/ryd.content-script.js | 37 ++++++++--------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index ced1f8b..7dc2052 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -1,4 +1,3 @@ -function RYD() { const LIKED_STATE = "LIKED_STATE"; const DISLIKED_STATE = "DISLIKED_STATE"; const NEUTRAL_STATE = "NEUTRAL_STATE"; @@ -146,12 +145,12 @@ function RYD() { ); } - function sendVote(vote) { - RYDTools.getBrowser().runtime.sendMessage({ - message: "send_vote", - vote: vote, - videoId: getVideoId(window.location.href) - }); +function sendVote(vote) { + getBrowser().runtime.sendMessage({ + message: "send_vote", + vote: vote, + videoId: getVideoId(window.location.href), + }); } function likeClicked() { @@ -344,10 +343,10 @@ function RYD() { const ids = links .filter((x) => x.href && x.href.indexOf("/watch?v=") > 0) .map((x) => getVideoId(x.href)); - RYDTools.getBrowser().runtime.sendMessage({ - message: "send_links", - videoIds: ids, - }); + getBrowser().runtime.sendMessage({ + message: "send_links", + videoIds: ids, + }); } setEventListeners(); @@ -360,17 +359,7 @@ function RYD() { setTimeout(() => sendVideoIds(), 2500); - this.init = function () {}; -} - -RYD.getInstance = function () { - if (typeof RYD.instance == "undefined") RYD.instance = new RYD(); - return RYD.instance; -}; - -RYDTools = {}; - -RYDTools.getBrowser = function () { +function getBrowser() { if (typeof chrome !== "undefined" && typeof chrome.runtime !== "undefined") { return chrome; } else if ( @@ -382,6 +371,4 @@ RYDTools.getBrowser = function () { console.log("browser is not supported"); return false; } -}; - -RYD.getInstance().init(); +} From d20483737a0a5156218e272141440b1bdf04519e Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Fri, 17 Dec 2021 23:37:30 +0100 Subject: [PATCH 02/13] move states to state.js and import them in origin --- Extensions/combined/ryd.content-script.js | 9 ++++++--- Extensions/combined/src/state.js | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 Extensions/combined/src/state.js diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index 7dc2052..8bc4a84 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -1,6 +1,9 @@ - const LIKED_STATE = "LIKED_STATE"; - const DISLIKED_STATE = "DISLIKED_STATE"; - const NEUTRAL_STATE = "NEUTRAL_STATE"; +import { + LIKED_STATE, + DISLIKED_STATE, + NEUTRAL_STATE, +} from "./src/state"; + let storedData = { likes: 0, diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js new file mode 100644 index 0000000..e1195cd --- /dev/null +++ b/Extensions/combined/src/state.js @@ -0,0 +1,10 @@ +const LIKED_STATE = "LIKED_STATE"; +const DISLIKED_STATE = "DISLIKED_STATE"; +const NEUTRAL_STATE = "NEUTRAL_STATE"; + + +export { + LIKED_STATE, + DISLIKED_STATE, + NEUTRAL_STATE, +}; From b599f889cdc1f01c5f93ded87cfe151552e61dfb Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Fri, 17 Dec 2021 23:41:30 +0100 Subject: [PATCH 03/13] replace leftover RYDTools call with function call --- Extensions/combined/ryd.content-script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index 8bc4a84..92ca8b0 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -130,12 +130,12 @@ import { : NEUTRAL_STATE; let statsSet = false; - RYDTools.getBrowser().runtime.sendMessage( + getBrowser().runtime.sendMessage( { message: "set_state", videoId: getVideoId(window.location.href), - state: getState().current, - likeCount: getLikeCountFromButton() || null + state: getState(storedData).current, + likeCount: getLikeCountFromButton() || null, }, function (response) { cLog("response from api:"); From 782cd1eab1f4444d71e84261d11d5e1f5623f036 Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Fri, 17 Dec 2021 23:42:06 +0100 Subject: [PATCH 04/13] fix format --- Extensions/combined/ryd.content-script.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index 92ca8b0..df521d1 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -224,8 +224,7 @@ function sendVote(vote) { function isVideoLoaded() { const videoId = getVideoId(window.location.href); return ( - document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== - null || + document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null || // mobile: no video-id attribute document.querySelector('#player[loading="false"]:not([hidden])') !== null ); From 3bc47f9e56f1e0659137738fdaedd1bdbef64c09 Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Fri, 17 Dec 2021 23:48:29 +0100 Subject: [PATCH 05/13] move roundDown and numberFormat utils.js and import at origin --- Extensions/combined/ryd.content-script.js | 28 +---------------------- Extensions/combined/src/utils.js | 28 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 Extensions/combined/src/utils.js diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index df521d1..4a29eb6 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -4,6 +4,7 @@ import { NEUTRAL_STATE, } from "./src/state"; +import { numberFormat } from "./src/utils"; let storedData = { likes: 0, @@ -230,33 +231,6 @@ function sendVote(vote) { ); } - function roundDown(num) { - if (num < 1000) return num; - const int = Math.floor(Math.log10(num) - 2); - const decimal = int + (int % 3 ? 1 : 0); - const value = Math.floor(num / 10 ** decimal); - return value * 10 ** decimal; - } - - function numberFormat(numberState) { - let userLocales; - try { - userLocales = new URL( - Array.from(document.querySelectorAll("head > link[rel='search']")) - ?.find((n) => n?.getAttribute("href")?.includes("?locale=")) - ?.getAttribute("href") - )?.searchParams?.get("locale"); - } catch {} - const formatter = Intl.NumberFormat( - document.documentElement.lang || userLocales || navigator.language, - { - notation: "compact", - } - ); - - return formatter.format(roundDown(numberState)); - } - let jsInitChecktimer = null; function setEventListeners(evt) { diff --git a/Extensions/combined/src/utils.js b/Extensions/combined/src/utils.js new file mode 100644 index 0000000..8919251 --- /dev/null +++ b/Extensions/combined/src/utils.js @@ -0,0 +1,28 @@ +function roundDown(num) { + if (num < 1000) return num; + const int = Math.floor(Math.log10(num) - 2); + const decimal = int + (int % 3 ? 1 : 0); + const value = Math.floor(num / 10 ** decimal); + return value * 10 ** decimal; +} + +function numberFormat(numberState) { + let userLocales; + try { + userLocales = new URL( + Array.from(document.querySelectorAll("head > link[rel='search']")) + ?.find((n) => n?.getAttribute("href")?.includes("?locale=")) + ?.getAttribute("href") + )?.searchParams?.get("locale"); + } catch {} + const formatter = Intl.NumberFormat( + document.documentElement.lang || userLocales || navigator.language, + { + notation: "compact", + } + ); + + return formatter.format(roundDown(numberState)); +} + +export { numberFormat } \ No newline at end of file From 4d9f706904a9620cbb0779a1cc16a90323be3add Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Fri, 17 Dec 2021 23:50:25 +0100 Subject: [PATCH 06/13] create state.js, button.js and move functions into their own files, import at origin --- Extensions/combined/ryd.content-script.js | 447 +++++++++------------- Extensions/combined/src/buttons.js | 43 +++ Extensions/combined/src/state.js | 64 ++++ 3 files changed, 290 insertions(+), 264 deletions(-) create mode 100644 Extensions/combined/src/buttons.js diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index 4a29eb6..8fa5399 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -1,4 +1,17 @@ import { + getButtons, + getLikeButton, + getDislikeButton, + checkForSignInButton, +} from "./src/buttons"; +import { + isMobile, + isVideoDisliked, + isVideoLiked, + getState, + setLikes, + setDislikes, + getLikeCountFromButton, LIKED_STATE, DISLIKED_STATE, NEUTRAL_STATE, @@ -6,148 +19,54 @@ import { import { numberFormat } from "./src/utils"; - let storedData = { - likes: 0, - dislikes: 0, - previousState: NEUTRAL_STATE, - }; +let storedData = { + likes: 0, + dislikes: 0, + previousState: NEUTRAL_STATE, +}; - function cLog(message, writer) { - message = `[return youtube dislike]: ${message}`; - if (writer) { - writer(message); - } else { - console.log(message); - } +function cLog(message, writer) { + message = `[return youtube dislike]: ${message}`; + if (writer) { + writer(message); + } else { + console.log(message); } +} - function isMobile() { - return location.hostname == "m.youtube.com"; - } +function processResponse(response) { + const formattedDislike = numberFormat(response.dislikes); + setDislikes(formattedDislike); + storedData.dislikes = parseInt(response.dislikes); + storedData.likes = getLikeCountFromButton() || parseInt(response.likes); + createRateBar(storedData.likes, storedData.dislikes); +} - function getButtons() { - if (isMobile()) { - return document.querySelector(".slim-video-action-bar-actions"); - } - //--- If Menu Element Is Displayed: ---// - if (document.getElementById("menu-container")?.offsetParent === null) { - return document.querySelector( - "ytd-menu-renderer.ytd-watch-metadata > div" - ); - //--- If Menu Element Isnt Displayed: ---// - } else { - return document - .getElementById("menu-container") - ?.querySelector("#top-level-buttons-computed"); - } - } - - function getLikeButton() { - return getButtons().children[0]; - } - - function getDislikeButton() { - return getButtons().children[1]; - } - - 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 checkForSignInButton() { - if ( - document.querySelector( - "a[href^='https://accounts.google.com/ServiceLogin']" - ) - ) { - return true; - } else { - return false; - } - } - - function getState() { - if (isVideoLiked()) { - return { current: LIKED_STATE, previous: storedData.previousState }; - } - if (isVideoDisliked()) { - return { current: DISLIKED_STATE, previous: storedData.previousState }; - } - return { current: NEUTRAL_STATE, previous: storedData.previousState }; - } - - //--- Sets The Likes And Dislikes Values ---// - function setLikes(likesCount) { - (getButtons().children[0].querySelector("#text")).innerText = likesCount; - } - - function setDislikes(dislikesCount) { - if (isMobile()) { - getButtons().children[1].querySelector( - ".button-renderer-text" - ).innerText = dislikesCount; - return; - } - (getButtons().children[1].querySelector("#text").innerText) = dislikesCount; - } - - function getLikeCountFromButton() { - let likesStr = getLikeButton() - .querySelector("button") - .getAttribute("aria-label") - .replace(/\D/g, ""); - return likesStr.length > 0 ? parseInt(likesStr) : false; - } - - function processResponse(response) { - const formattedDislike = numberFormat(response.dislikes); - setDislikes(formattedDislike); - storedData.dislikes = parseInt(response.dislikes); - storedData.likes = getLikeCountFromButton() || parseInt(response.likes); - createRateBar(storedData.likes, storedData.dislikes); - } - - function setState() { - storedData.previousState = isVideoDisliked() - ? DISLIKED_STATE - : isVideoLiked() - ? LIKED_STATE - : NEUTRAL_STATE; - let statsSet = false; +function setState() { + storedData.previousState = isVideoDisliked() + ? DISLIKED_STATE + : isVideoLiked() + ? LIKED_STATE + : NEUTRAL_STATE; + let statsSet = false; getBrowser().runtime.sendMessage( - { - message: "set_state", - videoId: getVideoId(window.location.href), + { + message: "set_state", + videoId: getVideoId(window.location.href), state: getState(storedData).current, likeCount: getLikeCountFromButton() || null, - }, - function (response) { - cLog("response from api:"); - cLog(JSON.stringify(response)); - if (response !== undefined && !("traceId" in response) && !statsSet) { - processResponse(response); - } else { - } + }, + function (response) { + cLog("response from api:"); + cLog(JSON.stringify(response)); + if (response !== undefined && !("traceId" in response) && !statsSet) { + processResponse(response); + } else { } - ); - } + } + ); +} function sendVote(vote) { getBrowser().runtime.sendMessage({ @@ -155,122 +74,122 @@ function sendVote(vote) { vote: vote, videoId: getVideoId(window.location.href), }); - } +} - function likeClicked() { - if (checkForSignInButton() === false) { - if (storedData.previousState === DISLIKED_STATE) { - sendVote(1); - storedData.dislikes--; - storedData.likes++; - createRateBar(storedData.likes, storedData.dislikes); - setDislikes(numberFormat(storedData.dislikes)); - storedData.previousState = LIKED_STATE; - } else if (storedData.previousState === NEUTRAL_STATE) { - sendVote(1); - storedData.likes++; - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = LIKED_STATE; - } else if ((storedData.previousState = LIKED_STATE)) { - sendVote(0); - storedData.likes--; - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = NEUTRAL_STATE; - } +function likeClicked() { + if (checkForSignInButton() === false) { + if (storedData.previousState === DISLIKED_STATE) { + sendVote(1); + storedData.dislikes--; + storedData.likes++; + createRateBar(storedData.likes, storedData.dislikes); + setDislikes(numberFormat(storedData.dislikes)); + storedData.previousState = LIKED_STATE; + } else if (storedData.previousState === NEUTRAL_STATE) { + sendVote(1); + storedData.likes++; + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = LIKED_STATE; + } else if ((storedData.previousState = LIKED_STATE)) { + sendVote(0); + storedData.likes--; + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = NEUTRAL_STATE; } } +} - function dislikeClicked() { - if (checkForSignInButton() == false) { - if (storedData.previousState === NEUTRAL_STATE) { - sendVote(-1); - storedData.dislikes++; - setDislikes(numberFormat(storedData.dislikes)); - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = DISLIKED_STATE; - } else if (storedData.previousState === DISLIKED_STATE) { - sendVote(0); - storedData.dislikes--; - setDislikes(numberFormat(storedData.dislikes)); - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = NEUTRAL_STATE; - } else if (storedData.previousState === LIKED_STATE) { - sendVote(-1); - storedData.likes--; - storedData.dislikes++; - setDislikes(numberFormat(storedData.dislikes)); - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = DISLIKED_STATE; - } +function dislikeClicked() { + if (checkForSignInButton() == false) { + if (storedData.previousState === NEUTRAL_STATE) { + sendVote(-1); + storedData.dislikes++; + setDislikes(numberFormat(storedData.dislikes)); + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = DISLIKED_STATE; + } else if (storedData.previousState === DISLIKED_STATE) { + sendVote(0); + storedData.dislikes--; + setDislikes(numberFormat(storedData.dislikes)); + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = NEUTRAL_STATE; + } else if (storedData.previousState === LIKED_STATE) { + sendVote(-1); + storedData.likes--; + storedData.dislikes++; + setDislikes(numberFormat(storedData.dislikes)); + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = DISLIKED_STATE; } } +} - function setInitialState() { - setState(); - setTimeout(() => { - sendVideoIds(); - }, 1500); +function setInitialState() { + setState(); + setTimeout(() => { + sendVideoIds(); + }, 1500); +} + +function getVideoId(url) { + const urlObject = new URL(url); + const pathname = urlObject.pathname; + if (pathname.startsWith("/clip")) { + return document.querySelector("meta[itemprop='videoId']").content; + } else { + return urlObject.searchParams.get("v"); } +} - function getVideoId(url) { - const urlObject = new URL(url); - const pathname = urlObject.pathname; - if (pathname.startsWith("/clip")) { - return document.querySelector("meta[itemprop='videoId']").content; - } else { - return urlObject.searchParams.get("v"); - } - } - - function isVideoLoaded() { - const videoId = getVideoId(window.location.href); - return ( +function isVideoLoaded() { + const videoId = getVideoId(window.location.href); + return ( document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null || - // mobile: no video-id attribute - document.querySelector('#player[loading="false"]:not([hidden])') !== null - ); - } + // mobile: no video-id attribute + document.querySelector('#player[loading="false"]:not([hidden])') !== null + ); +} - let jsInitChecktimer = null; +let 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; - } - setInitialState(); +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; } - } - - if (window.location.href.indexOf("watch?") >= 0) { - jsInitChecktimer = setInterval(checkForJS_Finish, 111); + setInitialState(); } } - function createRateBar(likes, dislikes) { - let rateBar = document.getElementById("ryd-bar-container"); + if (window.location.href.indexOf("watch?") >= 0) { + jsInitChecktimer = setInterval(checkForJS_Finish, 111); + } +} - const widthPx = - getButtons().children[0].clientWidth + - getButtons().children[1].clientWidth + - 8; +function createRateBar(likes, dislikes) { + let rateBar = document.getElementById("ryd-bar-container"); - const widthPercent = - likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50; + const widthPx = + getButtons().children[0].clientWidth + + getButtons().children[1].clientWidth + + 8; - if (!rateBar) { - ( - document.getElementById("menu-container") || - document.querySelector("ytm-slim-video-action-bar-renderer") - ).insertAdjacentHTML( - "beforeend", - ` + const widthPercent = + likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50; + + if (!rateBar) { + ( + document.getElementById("menu-container") || + document.querySelector("ytm-slim-video-action-bar-renderer") + ).insertAdjacentHTML( + "beforeend", + `
` - ); - } else { - document.getElementById("ryd-bar-container").style.width = widthPx + "px"; - document.getElementById("ryd-bar").style.width = widthPercent + "%"; + ); + } else { + document.getElementById("ryd-bar-container").style.width = widthPx + "px"; + document.getElementById("ryd-bar").style.width = widthPercent + "%"; - document.querySelector( - "#ryd-dislike-tooltip > #tooltip" - ).innerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`; - } + document.querySelector( + "#ryd-dislike-tooltip > #tooltip" + ).innerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`; } +} - function sendVideoIds() { - let links = Array.from( - document.getElementsByClassName( - "yt-simple-endpoint ytd-compact-video-renderer" - ) - ).concat( - Array.from( - document.getElementsByClassName("yt-simple-endpoint ytd-thumbnail") +function sendVideoIds() { + let links = Array.from( + document.getElementsByClassName( + "yt-simple-endpoint ytd-compact-video-renderer" + ) + ).concat( + Array.from( + document.getElementsByClassName("yt-simple-endpoint ytd-thumbnail") + ) + ); + // Also try mobile + if (links.length < 1) + links = Array.from( + document.querySelectorAll( + ".large-media-item-metadata > a, a.large-media-item-thumbnail-container" ) ); - // Also try mobile - if (links.length < 1) - links = Array.from( - document.querySelectorAll( - ".large-media-item-metadata > a, a.large-media-item-thumbnail-container" - ) - ); - const ids = links - .filter((x) => x.href && x.href.indexOf("/watch?v=") > 0) - .map((x) => getVideoId(x.href)); + const ids = links + .filter((x) => x.href && x.href.indexOf("/watch?v=") > 0) + .map((x) => getVideoId(x.href)); getBrowser().runtime.sendMessage({ message: "send_links", videoIds: ids, }); - } +} +setEventListeners(); + +document.addEventListener("yt-navigate-finish", function (event) { + if (jsInitChecktimer !== null) clearInterval(jsInitChecktimer); + window.returnDislikeButtonlistenersSet = false; setEventListeners(); +}); - document.addEventListener("yt-navigate-finish", function (event) { - if (jsInitChecktimer !== null) clearInterval(jsInitChecktimer); - window.returnDislikeButtonlistenersSet = false; - setEventListeners(); - }); - - setTimeout(() => sendVideoIds(), 2500); +setTimeout(() => sendVideoIds(), 2500); function getBrowser() { if (typeof chrome !== "undefined" && typeof chrome.runtime !== "undefined") { diff --git a/Extensions/combined/src/buttons.js b/Extensions/combined/src/buttons.js new file mode 100644 index 0000000..24f81b6 --- /dev/null +++ b/Extensions/combined/src/buttons.js @@ -0,0 +1,43 @@ +import { isMobile } from "./state"; + +function getButtons() { + if (isMobile()) { + return document.querySelector(".slim-video-action-bar-actions"); + } + //--- If Menu Element Is Displayed: ---// + if (document.getElementById("menu-container")?.offsetParent === null) { + return document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div"); + //--- If Menu Element Isnt Displayed: ---// + } else { + return document + .getElementById("menu-container") + ?.querySelector("#top-level-buttons-computed"); + } +} + +function getLikeButton() { + return getButtons().children[0]; +} + +function getDislikeButton() { + return getButtons().children[1]; +} + +function checkForSignInButton() { + if ( + document.querySelector( + "a[href^='https://accounts.google.com/ServiceLogin']" + ) + ) { + return true; + } else { + return false; + } +} + +export { + getButtons, + getLikeButton, + getDislikeButton, + checkForSignInButton, +}; diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js index e1195cd..82dca35 100644 --- a/Extensions/combined/src/state.js +++ b/Extensions/combined/src/state.js @@ -1,9 +1,73 @@ +import { getLikeButton, getDislikeButton, getButtons } from "./buttons"; + const LIKED_STATE = "LIKED_STATE"; const DISLIKED_STATE = "DISLIKED_STATE"; const NEUTRAL_STATE = "NEUTRAL_STATE"; +function isMobile() { + return location.hostname == "m.youtube.com"; +} + +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 getState(storedData) { + if (isVideoLiked()) { + return { current: LIKED_STATE, previous: storedData.previousState }; + } + if (isVideoDisliked()) { + return { current: DISLIKED_STATE, previous: storedData.previousState }; + } + return { current: NEUTRAL_STATE, previous: storedData.previousState }; +} + +//--- Sets The Likes And Dislikes Values ---// +function setLikes(likesCount) { + getButtons().children[0].querySelector("#text").innerText = likesCount; +} + +function setDislikes(dislikesCount) { + if (isMobile()) { + getButtons().children[1].querySelector(".button-renderer-text").innerText = + dislikesCount; + return; + } + getButtons().children[1].querySelector("#text").innerText = dislikesCount; +} + +function getLikeCountFromButton() { + let likesStr = getLikeButton() + .querySelector("button") + .getAttribute("aria-label") + .replace(/\D/g, ""); + return likesStr.length > 0 ? parseInt(likesStr) : false; +} export { + isMobile, + isVideoDisliked, + isVideoLiked, + getState, + setLikes, + setDislikes, + getLikeCountFromButton, LIKED_STATE, DISLIKED_STATE, NEUTRAL_STATE, From 954967e701bfbf85a25d4b94be9e1fec9c15ef41 Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Sat, 18 Dec 2021 00:07:15 +0100 Subject: [PATCH 07/13] move getBrowser to utils.js --- Extensions/combined/ryd.content-script.js | 17 ++--------------- Extensions/combined/src/utils.js | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index 8fa5399..594513f 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -4,6 +4,7 @@ import { getDislikeButton, checkForSignInButton, } from "./src/buttons"; + import { isMobile, isVideoDisliked, @@ -17,7 +18,7 @@ import { NEUTRAL_STATE, } from "./src/state"; -import { numberFormat } from "./src/utils"; +import { numberFormat, getBrowser } from "./src/utils"; let storedData = { likes: 0, @@ -253,17 +254,3 @@ document.addEventListener("yt-navigate-finish", function (event) { }); setTimeout(() => sendVideoIds(), 2500); - -function getBrowser() { - if (typeof chrome !== "undefined" && typeof chrome.runtime !== "undefined") { - return chrome; - } else if ( - typeof browser !== "undefined" && - typeof browser.runtime !== "undefined" - ) { - return browser; - } else { - console.log("browser is not supported"); - return false; - } -} diff --git a/Extensions/combined/src/utils.js b/Extensions/combined/src/utils.js index 8919251..ad28f4c 100644 --- a/Extensions/combined/src/utils.js +++ b/Extensions/combined/src/utils.js @@ -25,4 +25,18 @@ function numberFormat(numberState) { return formatter.format(roundDown(numberState)); } -export { numberFormat } \ No newline at end of file +function getBrowser() { + if (typeof chrome !== "undefined" && typeof chrome.runtime !== "undefined") { + return chrome; + } else if ( + typeof browser !== "undefined" && + typeof browser.runtime !== "undefined" + ) { + return browser; + } else { + console.log("browser is not supported"); + return false; + } +} + +export { numberFormat, getBrowser } \ No newline at end of file From 81dbd52e21746ff44fd1d87f8889d8c4a6d28400 Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Sat, 18 Dec 2021 00:10:50 +0100 Subject: [PATCH 08/13] move cLog to utils.js --- Extensions/combined/ryd.content-script.js | 11 +---------- Extensions/combined/src/utils.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index 594513f..f6d8e58 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -18,7 +18,7 @@ import { NEUTRAL_STATE, } from "./src/state"; -import { numberFormat, getBrowser } from "./src/utils"; +import { numberFormat, getBrowser, cLog } from "./src/utils"; let storedData = { likes: 0, @@ -26,15 +26,6 @@ let storedData = { previousState: NEUTRAL_STATE, }; -function cLog(message, writer) { - message = `[return youtube dislike]: ${message}`; - if (writer) { - writer(message); - } else { - console.log(message); - } -} - function processResponse(response) { const formattedDislike = numberFormat(response.dislikes); setDislikes(formattedDislike); diff --git a/Extensions/combined/src/utils.js b/Extensions/combined/src/utils.js index ad28f4c..0d26ab9 100644 --- a/Extensions/combined/src/utils.js +++ b/Extensions/combined/src/utils.js @@ -39,4 +39,13 @@ function getBrowser() { } } -export { numberFormat, getBrowser } \ No newline at end of file +function cLog(message, writer) { + message = `[return youtube dislike]: ${message}`; + if (writer) { + writer(message); + } else { + console.log(message); + } +} + +export { numberFormat, getBrowser, cLog } \ No newline at end of file From d51a5a58b07839b9e3d1b84258492e8204018a14 Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Sat, 18 Dec 2021 00:24:22 +0100 Subject: [PATCH 09/13] move createRateBar to bar.js --- Extensions/combined/ryd.content-script.js | 49 +---------------------- Extensions/combined/src/bar.js | 49 +++++++++++++++++++++++ 2 files changed, 50 insertions(+), 48 deletions(-) create mode 100644 Extensions/combined/src/bar.js diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index f6d8e58..de85993 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -4,7 +4,6 @@ import { getDislikeButton, checkForSignInButton, } from "./src/buttons"; - import { isMobile, isVideoDisliked, @@ -17,8 +16,8 @@ import { DISLIKED_STATE, NEUTRAL_STATE, } from "./src/state"; - import { numberFormat, getBrowser, cLog } from "./src/utils"; +import { createRateBar } from "./src/bar"; let storedData = { likes: 0, @@ -164,52 +163,6 @@ function setEventListeners(evt) { } } -function createRateBar(likes, dislikes) { - let rateBar = document.getElementById("ryd-bar-container"); - - const widthPx = - getButtons().children[0].clientWidth + - getButtons().children[1].clientWidth + - 8; - - const widthPercent = - likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50; - - if (!rateBar) { - ( - document.getElementById("menu-container") || - document.querySelector("ytm-slim-video-action-bar-renderer") - ).insertAdjacentHTML( - "beforeend", - ` -
-
-
-
-
-
- - ${likes.toLocaleString()} / ${dislikes.toLocaleString()} - -
- ` - ); - } else { - document.getElementById("ryd-bar-container").style.width = widthPx + "px"; - document.getElementById("ryd-bar").style.width = widthPercent + "%"; - - document.querySelector( - "#ryd-dislike-tooltip > #tooltip" - ).innerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`; - } -} - function sendVideoIds() { let links = Array.from( document.getElementsByClassName( diff --git a/Extensions/combined/src/bar.js b/Extensions/combined/src/bar.js new file mode 100644 index 0000000..4f0c8aa --- /dev/null +++ b/Extensions/combined/src/bar.js @@ -0,0 +1,49 @@ +import { getButtons } from "./buttons"; + +function createRateBar(likes, dislikes) { + let rateBar = document.getElementById("ryd-bar-container"); + + const widthPx = + getButtons().children[0].clientWidth + + getButtons().children[1].clientWidth + + 8; + + const widthPercent = + likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50; + + if (!rateBar) { + ( + document.getElementById("menu-container") || + document.querySelector("ytm-slim-video-action-bar-renderer") + ).insertAdjacentHTML( + "beforeend", + ` +
+
+
+
+
+
+ + ${likes.toLocaleString()} / ${dislikes.toLocaleString()} + +
+ ` + ); + } else { + document.getElementById("ryd-bar-container").style.width = widthPx + "px"; + document.getElementById("ryd-bar").style.width = widthPercent + "%"; + + document.querySelector( + "#ryd-dislike-tooltip > #tooltip" + ).innerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`; + } +} + +export { createRateBar }; From 689b0b7f8c92fb51d085b7ab8bf90ab0f48c48c8 Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Sat, 18 Dec 2021 00:41:12 +0100 Subject: [PATCH 10/13] add setState, processResponse to state.js, getVideoId to utils.js --- Extensions/combined/ryd.content-script.js | 49 ++--------------------- Extensions/combined/src/state.js | 37 +++++++++++++++++ Extensions/combined/src/utils.js | 12 +++++- 3 files changed, 51 insertions(+), 47 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index de85993..e1f5dce 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -9,6 +9,7 @@ import { isVideoDisliked, isVideoLiked, getState, + setState, setLikes, setDislikes, getLikeCountFromButton, @@ -16,7 +17,7 @@ import { DISLIKED_STATE, NEUTRAL_STATE, } from "./src/state"; -import { numberFormat, getBrowser, cLog } from "./src/utils"; +import { numberFormat, getBrowser, getVideoId, cLog } from "./src/utils"; import { createRateBar } from "./src/bar"; let storedData = { @@ -25,40 +26,6 @@ let storedData = { previousState: NEUTRAL_STATE, }; -function processResponse(response) { - const formattedDislike = numberFormat(response.dislikes); - setDislikes(formattedDislike); - storedData.dislikes = parseInt(response.dislikes); - storedData.likes = getLikeCountFromButton() || parseInt(response.likes); - createRateBar(storedData.likes, storedData.dislikes); -} - -function setState() { - storedData.previousState = isVideoDisliked() - ? DISLIKED_STATE - : isVideoLiked() - ? LIKED_STATE - : NEUTRAL_STATE; - let statsSet = false; - - getBrowser().runtime.sendMessage( - { - message: "set_state", - videoId: getVideoId(window.location.href), - state: getState(storedData).current, - likeCount: getLikeCountFromButton() || null, - }, - function (response) { - cLog("response from api:"); - cLog(JSON.stringify(response)); - if (response !== undefined && !("traceId" in response) && !statsSet) { - processResponse(response); - } else { - } - } - ); -} - function sendVote(vote) { getBrowser().runtime.sendMessage({ message: "send_vote", @@ -116,22 +83,12 @@ function dislikeClicked() { } function setInitialState() { - setState(); + setState(storedData); setTimeout(() => { sendVideoIds(); }, 1500); } -function getVideoId(url) { - const urlObject = new URL(url); - const pathname = urlObject.pathname; - if (pathname.startsWith("/clip")) { - return document.querySelector("meta[itemprop='videoId']").content; - } else { - return urlObject.searchParams.get("v"); - } -} - function isVideoLoaded() { const videoId = getVideoId(window.location.href); return ( diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js index 82dca35..fa4df1b 100644 --- a/Extensions/combined/src/state.js +++ b/Extensions/combined/src/state.js @@ -1,4 +1,6 @@ import { getLikeButton, getDislikeButton, getButtons } from "./buttons"; +import { createRateBar } from "./bar"; +import { getBrowser, getVideoId, cLog, numberFormat } from "./utils"; const LIKED_STATE = "LIKED_STATE"; const DISLIKED_STATE = "DISLIKED_STATE"; @@ -60,11 +62,46 @@ function getLikeCountFromButton() { return likesStr.length > 0 ? parseInt(likesStr) : false; } +function processResponse(response, storedData) { + const formattedDislike = numberFormat(response.dislikes); + setDislikes(formattedDislike); + storedData.dislikes = parseInt(response.dislikes); + storedData.likes = getLikeCountFromButton() || parseInt(response.likes); + createRateBar(storedData.likes, storedData.dislikes); +} + +function setState(storedData) { + storedData.previousState = isVideoDisliked() + ? DISLIKED_STATE + : isVideoLiked() + ? LIKED_STATE + : NEUTRAL_STATE; + let statsSet = false; + + getBrowser().runtime.sendMessage( + { + message: "set_state", + videoId: getVideoId(window.location.href), + state: getState(storedData).current, + likeCount: getLikeCountFromButton() || null, + }, + function (response) { + cLog("response from api:"); + cLog(JSON.stringify(response)); + if (response !== undefined && !("traceId" in response) && !statsSet) { + processResponse(response, storedData); + } else { + } + } + ); +} + export { isMobile, isVideoDisliked, isVideoLiked, getState, + setState, setLikes, setDislikes, getLikeCountFromButton, diff --git a/Extensions/combined/src/utils.js b/Extensions/combined/src/utils.js index 0d26ab9..a7a12a5 100644 --- a/Extensions/combined/src/utils.js +++ b/Extensions/combined/src/utils.js @@ -39,6 +39,16 @@ function getBrowser() { } } +function getVideoId(url) { + const urlObject = new URL(url); + const pathname = urlObject.pathname; + if (pathname.startsWith("/clip")) { + return document.querySelector("meta[itemprop='videoId']").content; + } else { + return urlObject.searchParams.get("v"); + } +} + function cLog(message, writer) { message = `[return youtube dislike]: ${message}`; if (writer) { @@ -48,4 +58,4 @@ function cLog(message, writer) { } } -export { numberFormat, getBrowser, cLog } \ No newline at end of file +export { numberFormat, getBrowser, getVideoId, cLog } \ No newline at end of file From e6a1716e7e59b12c7baef0781a5be11380490a3c Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Sat, 18 Dec 2021 00:48:44 +0100 Subject: [PATCH 11/13] move isVideoLoaded to utils.js --- Extensions/combined/ryd.content-script.js | 11 +---------- Extensions/combined/src/utils.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index e1f5dce..059d6f1 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -17,7 +17,7 @@ import { DISLIKED_STATE, NEUTRAL_STATE, } from "./src/state"; -import { numberFormat, getBrowser, getVideoId, cLog } from "./src/utils"; +import { numberFormat, getBrowser, getVideoId, isVideoLoaded, cLog } from "./src/utils"; import { createRateBar } from "./src/bar"; let storedData = { @@ -89,15 +89,6 @@ function setInitialState() { }, 1500); } -function isVideoLoaded() { - const videoId = getVideoId(window.location.href); - return ( - document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null || - // mobile: no video-id attribute - document.querySelector('#player[loading="false"]:not([hidden])') !== null - ); -} - let jsInitChecktimer = null; function setEventListeners(evt) { diff --git a/Extensions/combined/src/utils.js b/Extensions/combined/src/utils.js index a7a12a5..e1c6dbe 100644 --- a/Extensions/combined/src/utils.js +++ b/Extensions/combined/src/utils.js @@ -49,6 +49,15 @@ function getVideoId(url) { } } +function isVideoLoaded() { + const videoId = getVideoId(window.location.href); + return ( + document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null || + // mobile: no video-id attribute + document.querySelector('#player[loading="false"]:not([hidden])') !== null + ); +} + function cLog(message, writer) { message = `[return youtube dislike]: ${message}`; if (writer) { @@ -58,4 +67,4 @@ function cLog(message, writer) { } } -export { numberFormat, getBrowser, getVideoId, cLog } \ No newline at end of file +export { numberFormat, getBrowser, getVideoId, isVideoLoaded, cLog } \ No newline at end of file From ed9a950d12036ef48e8f2863596f2681c280f730 Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Sat, 18 Dec 2021 01:19:00 +0100 Subject: [PATCH 12/13] move sendVote, sendVideoIds, likeClicked, dislikeClicked to events.js --- Extensions/combined/ryd.content-script.js | 87 +--------------------- Extensions/combined/src/events.js | 88 +++++++++++++++++++++++ 2 files changed, 91 insertions(+), 84 deletions(-) create mode 100644 Extensions/combined/src/events.js diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index 059d6f1..c169093 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -19,6 +19,7 @@ import { } from "./src/state"; import { numberFormat, getBrowser, getVideoId, isVideoLoaded, cLog } from "./src/utils"; import { createRateBar } from "./src/bar"; +import { sendVideoIds, sendVote, likeClicked, dislikeClicked } from "./src/events" let storedData = { likes: 0, @@ -26,62 +27,6 @@ let storedData = { previousState: NEUTRAL_STATE, }; -function sendVote(vote) { - getBrowser().runtime.sendMessage({ - message: "send_vote", - vote: vote, - videoId: getVideoId(window.location.href), - }); -} - -function likeClicked() { - if (checkForSignInButton() === false) { - if (storedData.previousState === DISLIKED_STATE) { - sendVote(1); - storedData.dislikes--; - storedData.likes++; - createRateBar(storedData.likes, storedData.dislikes); - setDislikes(numberFormat(storedData.dislikes)); - storedData.previousState = LIKED_STATE; - } else if (storedData.previousState === NEUTRAL_STATE) { - sendVote(1); - storedData.likes++; - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = LIKED_STATE; - } else if ((storedData.previousState = LIKED_STATE)) { - sendVote(0); - storedData.likes--; - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = NEUTRAL_STATE; - } - } -} - -function dislikeClicked() { - if (checkForSignInButton() == false) { - if (storedData.previousState === NEUTRAL_STATE) { - sendVote(-1); - storedData.dislikes++; - setDislikes(numberFormat(storedData.dislikes)); - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = DISLIKED_STATE; - } else if (storedData.previousState === DISLIKED_STATE) { - sendVote(0); - storedData.dislikes--; - setDislikes(numberFormat(storedData.dislikes)); - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = NEUTRAL_STATE; - } else if (storedData.previousState === LIKED_STATE) { - sendVote(-1); - storedData.likes--; - storedData.dislikes++; - setDislikes(numberFormat(storedData.dislikes)); - createRateBar(storedData.likes, storedData.dislikes); - storedData.previousState = DISLIKED_STATE; - } - } -} - function setInitialState() { setState(storedData); setTimeout(() => { @@ -98,8 +43,8 @@ function setEventListeners(evt) { 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(storedData)); + buttons.children[1].addEventListener("click", () => dislikeClicked(storedData)); window.returnDislikeButtonlistenersSet = true; } setInitialState(); @@ -111,32 +56,6 @@ function setEventListeners(evt) { } } -function sendVideoIds() { - let links = Array.from( - document.getElementsByClassName( - "yt-simple-endpoint ytd-compact-video-renderer" - ) - ).concat( - Array.from( - document.getElementsByClassName("yt-simple-endpoint ytd-thumbnail") - ) - ); - // Also try mobile - if (links.length < 1) - links = Array.from( - document.querySelectorAll( - ".large-media-item-metadata > a, a.large-media-item-thumbnail-container" - ) - ); - const ids = links - .filter((x) => x.href && x.href.indexOf("/watch?v=") > 0) - .map((x) => getVideoId(x.href)); - getBrowser().runtime.sendMessage({ - message: "send_links", - videoIds: ids, - }); -} - setEventListeners(); document.addEventListener("yt-navigate-finish", function (event) { diff --git a/Extensions/combined/src/events.js b/Extensions/combined/src/events.js new file mode 100644 index 0000000..c3c1e29 --- /dev/null +++ b/Extensions/combined/src/events.js @@ -0,0 +1,88 @@ +import { getBrowser, getVideoId, numberFormat } from "./utils" +import { checkForSignInButton } from "./buttons" +import { NEUTRAL_STATE, LIKED_STATE, DISLIKED_STATE, setDislikes } from "./state" +import { createRateBar } from "./bar" + +function sendVote(vote) { + getBrowser().runtime.sendMessage({ + message: "send_vote", + vote: vote, + videoId: getVideoId(window.location.href), + }); +} + +function sendVideoIds() { + let links = Array.from( + document.getElementsByClassName( + "yt-simple-endpoint ytd-compact-video-renderer" + ) + ).concat( + Array.from( + document.getElementsByClassName("yt-simple-endpoint ytd-thumbnail") + ) + ); + // Also try mobile + if (links.length < 1) + links = Array.from( + document.querySelectorAll( + ".large-media-item-metadata > a, a.large-media-item-thumbnail-container" + ) + ); + const ids = links + .filter((x) => x.href && x.href.indexOf("/watch?v=") > 0) + .map((x) => getVideoId(x.href)); + getBrowser().runtime.sendMessage({ + message: "send_links", + videoIds: ids, + }); +} + +function likeClicked(storedData) { + if (checkForSignInButton() === false) { + if (storedData.previousState === DISLIKED_STATE) { + sendVote(1); + storedData.dislikes--; + storedData.likes++; + createRateBar(storedData.likes, storedData.dislikes); + setDislikes(numberFormat(storedData.dislikes)); + storedData.previousState = LIKED_STATE; + } else if (storedData.previousState === NEUTRAL_STATE) { + sendVote(1); + storedData.likes++; + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = LIKED_STATE; + } else if ((storedData.previousState = LIKED_STATE)) { + sendVote(0); + storedData.likes--; + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = NEUTRAL_STATE; + } + } +} + +function dislikeClicked(storedData) { + if (checkForSignInButton() == false) { + if (storedData.previousState === NEUTRAL_STATE) { + sendVote(-1); + storedData.dislikes++; + setDislikes(numberFormat(storedData.dislikes)); + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = DISLIKED_STATE; + } else if (storedData.previousState === DISLIKED_STATE) { + sendVote(0); + storedData.dislikes--; + setDislikes(numberFormat(storedData.dislikes)); + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = NEUTRAL_STATE; + } else if (storedData.previousState === LIKED_STATE) { + sendVote(-1); + storedData.likes--; + storedData.dislikes++; + setDislikes(numberFormat(storedData.dislikes)); + createRateBar(storedData.likes, storedData.dislikes); + storedData.previousState = DISLIKED_STATE; + } + } +} + +export { sendVote, sendVideoIds, likeClicked, dislikeClicked } \ No newline at end of file From 4342f7e36fe70842d36f1fcb0466bf34ce9a4c3e Mon Sep 17 00:00:00 2001 From: Leon Bubova Date: Sat, 18 Dec 2021 01:28:43 +0100 Subject: [PATCH 13/13] move setInitialState to events.js --- Extensions/combined/ryd.content-script.js | 10 ++-------- Extensions/combined/src/state.js | 9 +++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index c169093..2c8d40a 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -10,6 +10,7 @@ import { isVideoLiked, getState, setState, + setInitialState, setLikes, setDislikes, getLikeCountFromButton, @@ -27,13 +28,6 @@ let storedData = { previousState: NEUTRAL_STATE, }; -function setInitialState() { - setState(storedData); - setTimeout(() => { - sendVideoIds(); - }, 1500); -} - let jsInitChecktimer = null; function setEventListeners(evt) { @@ -47,7 +41,7 @@ function setEventListeners(evt) { buttons.children[1].addEventListener("click", () => dislikeClicked(storedData)); window.returnDislikeButtonlistenersSet = true; } - setInitialState(); + setInitialState(storedData); } } diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js index fa4df1b..7f3eeda 100644 --- a/Extensions/combined/src/state.js +++ b/Extensions/combined/src/state.js @@ -1,6 +1,7 @@ import { getLikeButton, getDislikeButton, getButtons } from "./buttons"; import { createRateBar } from "./bar"; import { getBrowser, getVideoId, cLog, numberFormat } from "./utils"; +import { sendVideoIds } from "./events"; const LIKED_STATE = "LIKED_STATE"; const DISLIKED_STATE = "DISLIKED_STATE"; @@ -96,12 +97,20 @@ function setState(storedData) { ); } +function setInitialState(storedData) { + setState(storedData); + setTimeout(() => { + sendVideoIds(); + }, 1500); +} + export { isMobile, isVideoDisliked, isVideoLiked, getState, setState, + setInitialState, setLikes, setDislikes, getLikeCountFromButton,