From fb46b07db6f8b972c2c6a26f0f31b55ba3563778 Mon Sep 17 00:00:00 2001 From: Anarios Date: Sat, 6 Sep 2025 15:21:37 +0200 Subject: [PATCH] Shorts fix, logging fix --- Extensions/combined/popup.js | 94 ++++++++--------------- Extensions/combined/ryd.content-script.js | 11 +-- Extensions/combined/src/bar.js | 4 +- Extensions/combined/src/events.js | 3 +- Extensions/combined/src/starRating.js | 3 +- Extensions/combined/src/state.js | 26 ++++--- Extensions/combined/src/utils.js | 30 +++++--- Extensions/combined/src/utils.spec.js | 1 - webpack.config.js | 2 +- 9 files changed, 71 insertions(+), 103 deletions(-) diff --git a/Extensions/combined/popup.js b/Extensions/combined/popup.js index 2fd5297..d117bd4 100644 --- a/Extensions/combined/popup.js +++ b/Extensions/combined/popup.js @@ -1,5 +1,3 @@ -import { cLog } from "./src/utils"; - /* Config */ const config = { advanced: false, @@ -62,14 +60,12 @@ function createLink(url, id) { }); } -document - .getElementById("disable_vote_submission") - .addEventListener("click", (ev) => { - chrome.storage.sync.set({ disableVoteSubmission: ev.target.checked }); - }); +document.getElementById("disable_vote_submission").addEventListener("click", (ev) => { + chrome.storage.sync.set({ disableVoteSubmission: ev.target.checked }); +}); document.getElementById("disable_logging").addEventListener("click", (ev) => { - chrome.storage.sync.set({ disableLogging:ev.target.checked }) + chrome.storage.sync.set({ disableLogging: ev.target.checked }); }); document.getElementById("colored_thumbs").addEventListener("click", (ev) => { @@ -88,23 +84,17 @@ document.getElementById("number_format").addEventListener("change", (ev) => { chrome.storage.sync.set({ numberDisplayFormat: ev.target.value }); }); -document - .getElementById("show_tooltip_percentage") - .addEventListener("click", (ev) => { - chrome.storage.sync.set({ showTooltipPercentage: ev.target.checked }); - }); +document.getElementById("show_tooltip_percentage").addEventListener("click", (ev) => { + chrome.storage.sync.set({ showTooltipPercentage: ev.target.checked }); +}); -document - .getElementById("tooltip_percentage_mode") - .addEventListener("change", (ev) => { - chrome.storage.sync.set({ tooltipPercentageMode: ev.target.value }); - }); +document.getElementById("tooltip_percentage_mode").addEventListener("change", (ev) => { + chrome.storage.sync.set({ tooltipPercentageMode: ev.target.value }); +}); -document - .getElementById("number_reformat_likes") - .addEventListener("click", (ev) => { - chrome.storage.sync.set({ numberDisplayReformatLikes: ev.target.checked }); - }); +document.getElementById("number_reformat_likes").addEventListener("click", (ev) => { + chrome.storage.sync.set({ numberDisplayReformatLikes: ev.target.checked }); +}); /* Advanced Toggle */ const advancedToggle = document.getElementById("advancedToggle"); @@ -149,8 +139,7 @@ function initializeVersionNumber() { .then((response) => response.json()) .then((json) => { if (compareVersions(json.version, version)) { - document.getElementById("ext-update").innerHTML = - chrome.i18n.getMessage("textUpdate") + " v" + json.version; + document.getElementById("ext-update").innerHTML = chrome.i18n.getMessage("textUpdate") + " v" + json.version; document.getElementById("ext-update").style.padding = ".25rem .5rem"; } }); @@ -183,8 +172,8 @@ function initializeDisableVoteSubmission() { }); } -function initializeDisableLogging(){ - chrome.storage.sync.get(['disableLogging'], (res) => { +function initializeDisableLogging() { + chrome.storage.sync.get(["disableLogging"], (res) => { handleDisableLoggingChangeEvent(res.disableLogging); }); } @@ -230,10 +219,8 @@ function updateNumberDisplayFormatContent() { let testValue = 123456; document.getElementById("number_format_compactShort").innerHTML = getNumberFormatter("compactShort").format(testValue); - document.getElementById("number_format_compactLong").innerHTML = - getNumberFormatter("compactLong").format(testValue); - document.getElementById("number_format_standard").innerHTML = - getNumberFormatter("standard").format(testValue); + document.getElementById("number_format_compactLong").innerHTML = getNumberFormatter("compactLong").format(testValue); + document.getElementById("number_format_standard").innerHTML = getNumberFormatter("standard").format(testValue); } function initializeNumberDisplayReformatLikes() { @@ -246,9 +233,7 @@ chrome.storage.onChanged.addListener(storageChangeHandler); function storageChangeHandler(changes, area) { if (changes.disableVoteSubmission !== undefined) { - handleDisableVoteSubmissionChangeEvent( - changes.disableVoteSubmission.newValue, - ); + handleDisableVoteSubmissionChangeEvent(changes.disableVoteSubmission.newValue); } if (changes.disableLogging !== undefined) { handleDisableLoggingChangeEvent(changes.disableLogging.newValue); @@ -266,14 +251,10 @@ function storageChangeHandler(changes, area) { handleNumberDisplayFormatChangeEvent(changes.numberDisplayFormat.newValue); } if (changes.showTooltipPercentage !== undefined) { - handleShowTooltipPercentageChangeEvent( - changes.showTooltipPercentage.newValue, - ); + handleShowTooltipPercentageChangeEvent(changes.showTooltipPercentage.newValue); } if (changes.numberDisplayReformatLikes !== undefined) { - handleNumberDisplayReformatLikesChangeEvent( - changes.numberDisplayReformatLikes.newValue, - ); + handleNumberDisplayReformatLikesChangeEvent(changes.numberDisplayReformatLikes.newValue); } } @@ -302,24 +283,18 @@ function handleColorThemeChangeEvent(value) { value = "classic"; } config.colorTheme = value; - document - .getElementById("color_theme") - .querySelector('option[value="' + value + '"]').selected = true; + document.getElementById("color_theme").querySelector('option[value="' + value + '"]').selected = true; updateColorThemePreviewContent(value); } function updateColorThemePreviewContent(themeName) { - document.getElementById("color_theme_example_like").style.backgroundColor = - getColorFromTheme(themeName, true); - document.getElementById("color_theme_example_dislike").style.backgroundColor = - getColorFromTheme(themeName, false); + document.getElementById("color_theme_example_like").style.backgroundColor = getColorFromTheme(themeName, true); + document.getElementById("color_theme_example_dislike").style.backgroundColor = getColorFromTheme(themeName, false); } function handleNumberDisplayFormatChangeEvent(value) { config.numberDisplayFormat = value; - document - .getElementById("number_format") - .querySelector('option[value="' + value + '"]').selected = true; + document.getElementById("number_format").querySelector('option[value="' + value + '"]').selected = true; } function handleShowTooltipPercentageChangeEvent(value) { @@ -333,9 +308,7 @@ function handleTooltipPercentageModeChangeEvent(value) { } config.tooltipPercentageMode = value; - document - .getElementById("tooltip_percentage_mode") - .querySelector('option[value="' + value + '"]').selected = true; + document.getElementById("tooltip_percentage_mode").querySelector('option[value="' + value + '"]').selected = true; } function handleNumberDisplayReformatLikesChangeEvent(value) { @@ -369,22 +342,17 @@ function getNumberFormatter(optionSelect) { formatterNotation = "compact"; formatterCompactDisplay = "short"; } - const formatter = Intl.NumberFormat( - document.documentElement.lang || userLocales || navigator.language, - { - notation: formatterNotation, - compactDisplay: formatterCompactDisplay, - }, - ); + const formatter = Intl.NumberFormat(document.documentElement.lang || userLocales || navigator.language, { + notation: formatterNotation, + compactDisplay: formatterCompactDisplay, + }); return formatter; } (async function getStatus() { let status = document.getElementById("status"); let serverStatus = document.getElementById("server-status"); - let resp = await fetch( - "https://returnyoutubedislikeapi.com/votes?videoId=YbJOTdZBX1g", - ); + let resp = await fetch("https://returnyoutubedislikeapi.com/votes?videoId=YbJOTdZBX1g"); let result = await resp.status; if (result === 200) { status.innerText = "Online"; diff --git a/Extensions/combined/ryd.content-script.js b/Extensions/combined/ryd.content-script.js index ac788eb..e350ce3 100644 --- a/Extensions/combined/ryd.content-script.js +++ b/Extensions/combined/ryd.content-script.js @@ -1,11 +1,6 @@ -//--- Import Button Functions ---// import { getButtons } from "./src/buttons"; - -//--- Import State Functions ---// import { isShorts, setInitialState, initExtConfig } from "./src/state"; - -//--- Import Video & Browser Functions ---// -import { getBrowser, isVideoLoaded, cLog } from "./src/utils"; +import { getBrowser, isVideoLoaded } from "./src/utils"; import { addLikeDislikeEventListener, createSmartimationObserver, storageChangeHandler } from "./src/events"; await initExtConfig(); @@ -27,7 +22,7 @@ async function setEventListeners(evt) { } } catch (exception) { if (!isSetInitialStateDone) { - cLog("error"); + console.log("error"); await setInitialState(); } } @@ -49,5 +44,5 @@ s.src = chrome.runtime.getURL("menu-fixer.js"); s.onload = function () { this.remove(); }; -// see also "Dynamic values in the injected code" section in this answer + (document.head || document.documentElement).appendChild(s); diff --git a/Extensions/combined/src/bar.js b/Extensions/combined/src/bar.js index 86d1be5..e05e023 100644 --- a/Extensions/combined/src/bar.js +++ b/Extensions/combined/src/bar.js @@ -7,7 +7,7 @@ import { isRoundedDesign, isShorts, } from "./state"; -import { cLog, getColorFromTheme, isInViewport } from "./utils"; +import { getColorFromTheme, isInViewport } from "./utils"; function createRateBar(likes, dislikes) { let rateBar = document.getElementById("ryd-bar-container"); @@ -117,7 +117,7 @@ function createRateBar(likes, dislikes) { } } } else { - cLog("removing bar"); + console.log("removing bar"); if (rateBar) { rateBar.parentNode.removeChild(rateBar); } diff --git a/Extensions/combined/src/events.js b/Extensions/combined/src/events.js index 326eaa7..ecf1ab5 100644 --- a/Extensions/combined/src/events.js +++ b/Extensions/combined/src/events.js @@ -2,7 +2,6 @@ import { getBrowser, getVideoId, numberFormat, - cLog, createObserver, } from "./utils"; import { @@ -128,7 +127,7 @@ function createSmartimationObserver() { smartimationContainer && smartimationObserver.container != smartimationContainer ) { - cLog("Initializing smartimation mutation observer"); + console.log("Initializing smartimation mutation observer"); smartimationObserver.disconnect(); smartimationObserver.observe(smartimationContainer); smartimationObserver.container = smartimationContainer; diff --git a/Extensions/combined/src/starRating.js b/Extensions/combined/src/starRating.js index 74779ed..0254e16 100644 --- a/Extensions/combined/src/starRating.js +++ b/Extensions/combined/src/starRating.js @@ -1,4 +1,3 @@ -import { cLog } from "./utils"; function createStarRating(rating, isMobile) { let starRating = document.createElement("label"); @@ -33,7 +32,7 @@ function createStarRating(rating, isMobile) { let YTBar = document.querySelector("#ryd-bar-container"); YTBar.setAttribute("style", "width: 190%; height: 2px;"); } catch (err) { - cLog("RateBar Not Present"); + console.log("RateBar Not Present"); } let style = `