diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js
index 8ee7dcf..3056e6f 100644
--- a/Extensions/UserScript/Return Youtube Dislike.user.js
+++ b/Extensions/UserScript/Return Youtube Dislike.user.js
@@ -33,6 +33,7 @@ const extConfig = {
colorTheme: "classic", // [classic*, accessible, neon] Color theme (red/green, blue/yellow, pink/cyan)
numberDisplayFormat: "compactShort", // [compactShort*, compactLong, standard] Number format (For non-English locale users, you may be able to improve appearance with a different option. Please file a feature request if your locale is not covered)
numberDisplayRoundDown: true, // [true*, false] Round down numbers (Show rounded down numbers)
+ numberDisplayReformatLikes: false, // [true, false*] Re-format like numbers (Make likes and dislikes format consistent)
// END USER OPTIONS
};
@@ -198,6 +199,19 @@ function setDislikes(dislikesCount) {
getButtons().children[1].querySelector("#text").innerText = dislikesCount;
}
+function getLikeCountFromButton() {
+ if (isShorts()) {
+ //Youtube Shorts don't work with this query. It's not nessecary; we can skip it and still see the results.
+ //It should be possible to fix this function, but it's not critical to showing the dislike count.
+ return 0;
+ }
+ let likesStr = getLikeButton()
+ .querySelector("button")
+ .getAttribute("aria-label")
+ .replace(/\D/g, "");
+ return likesStr.length > 0 ? parseInt(likesStr) : false;
+}
+
(typeof GM_addStyle != "undefined"
? GM_addStyle
: (styles) => {
@@ -311,6 +325,12 @@ function setState() {
likesvalue = likes;
dislikesvalue = dislikes;
setDislikes(numberFormat(dislikes));
+ if (extConfig.numberDisplayReformatLikes === true) {
+ const nativeLikes = getLikeCountFromButton();
+ if (nativeLikes !== false) {
+ setLikes(numberFormat(nativeLikes));
+ }
+ }
createRateBar(likes, dislikes);
if (extConfig.coloredThumbs === true) {
if (isShorts()) { // for shorts, leave deactived buttons in default color
diff --git a/Extensions/combined/popup.html b/Extensions/combined/popup.html
index aeaba4c..7d39246 100644
--- a/Extensions/combined/popup.html
+++ b/Extensions/combined/popup.html
@@ -108,6 +108,12 @@
Show rounded down numbers
+
+
+
+ Re-format like numbers
+
+
Number format:
diff --git a/Extensions/combined/popup.js b/Extensions/combined/popup.js
index 53eb179..2fb0db7 100644
--- a/Extensions/combined/popup.js
+++ b/Extensions/combined/popup.js
@@ -7,6 +7,7 @@ const config = {
colorTheme: "classic",
numberDisplayFormat: "compactShort",
numberDisplayRoundDown: true,
+ numberDisplayReformatLikes: false,
showAdvancedMessage:
' ',
hideAdvancedMessage:
@@ -85,6 +86,10 @@ document.getElementById("number_format").addEventListener("change", (ev) => {
chrome.storage.sync.set({ numberDisplayFormat: ev.target.value });
});
+document.getElementById("number_reformat_likes").addEventListener("click", (ev) => {
+ chrome.storage.sync.set({ numberDisplayReformatLikes: ev.target.checked });
+});
+
/* Advanced Toggle */
const advancedToggle = document.getElementById("advancedToggle");
advancedToggle.addEventListener("click", () => {
@@ -114,6 +119,7 @@ function initConfig() {
initializeColorTheme();
initializeNumberDisplayFormat();
initializeNumberDisplayRoundDown();
+ initializeNumberDisplayReformatLikes();
}
function initializeVersionNumber() {
@@ -206,6 +212,12 @@ function updateNumberDisplayFormatContent(roundDown) {
getNumberFormatter("standard").format(testValue);
}
+function initializeNumberDisplayReformatLikes() {
+ chrome.storage.sync.get(["numberDisplayReformatLikes"], (res) => {
+ handleNumberDisplayReformatLikesChangeEvent(res.numberDisplayReformatLikes);
+ });
+}
+
chrome.storage.onChanged.addListener(storageChangeHandler);
function storageChangeHandler(changes, area) {
@@ -231,6 +243,9 @@ function storageChangeHandler(changes, area) {
if (changes.numberDisplayFormat !== undefined) {
handleNumberDisplayFormatChangeEvent(changes.numberDisplayFormat.newValue);
}
+ if (changes.numberDisplayReformatLikes !== undefined) {
+ handleNumberDisplayReformatLikesChangeEvent(changes.numberDisplayReformatLikes.newValue);
+ }
}
function handleDisableVoteSubmissionChangeEvent(value) {
@@ -278,6 +293,11 @@ function handleNumberDisplayFormatChangeEvent(value) {
.querySelector('option[value="' + value + '"]').selected = true;
}
+function handleNumberDisplayReformatLikesChangeEvent(value) {
+ config.numberDisplayReformatLikes = value;
+ document.getElementById("number_reformat_likes").checked = value;
+}
+
function getNumberFormatter(optionSelect) {
let formatterNotation;
let formatterCompactDisplay;
diff --git a/Extensions/combined/ryd.background.js b/Extensions/combined/ryd.background.js
index 08f6afa..10b08d2 100644
--- a/Extensions/combined/ryd.background.js
+++ b/Extensions/combined/ryd.background.js
@@ -9,10 +9,9 @@ let extConfig = {
coloredThumbs: false,
coloredBar: false,
colorTheme: "classic", // classic, accessible, neon
- // coloredThumbs: false,
- // coloredBar: false,
numberDisplayFormat: "compactShort", // compactShort, compactLong, standard
numberDisplayRoundDown: true, // locale 'de' shows exact numbers by default
+ numberDisplayReformatLikes: false, // use existing (native) likes number
};
if (isChrome()) api = chrome;
@@ -74,16 +73,16 @@ api.runtime.onMessage.addListener((request, sender, sendResponse) => {
}
});
- api.storage.sync.get(['lastShowChangelogVersion'], (details) => {
- if (extConfig.showUpdatePopup === true &&
- details.lastShowChangelogVersion !== chrome.runtime.getManifest().version
- ) {
- // keep it inside get to avoid race condition
- api.storage.sync.set({'lastShowChangelogVersion ': chrome.runtime.getManifest().version});
- // wait until async get runs & don't steal tab focus
- api.tabs.create({url: api.runtime.getURL("/changelog/3/changelog_3.0.html"), active: false});
- }
- });
+api.storage.sync.get(['lastShowChangelogVersion'], (details) => {
+ if (extConfig.showUpdatePopup === true &&
+ details.lastShowChangelogVersion !== chrome.runtime.getManifest().version
+ ) {
+ // keep it inside get to avoid race condition
+ api.storage.sync.set({'lastShowChangelogVersion ': chrome.runtime.getManifest().version});
+ // wait until async get runs & don't steal tab focus
+ api.tabs.create({url: api.runtime.getURL("/changelog/3/changelog_3.0.html"), active: false});
+ }
+});
async function sendVote(videoId, vote) {
api.storage.sync.get(null, async (storageResult) => {
@@ -270,6 +269,9 @@ function storageChangeHandler(changes, area) {
if (changes.numberDisplayFormat !== undefined) {
handleNumberDisplayFormatChangeEvent(changes.numberDisplayFormat.newValue);
}
+ if (changes.numberDisplayReformatLikes !== undefined) {
+ handleNumberDisplayReformatLikesChangeEvent(changes.numberDisplayReformatLikes.newValue);
+ }
}
function handleDisableVoteSubmissionChangeEvent(value) {
@@ -312,6 +314,10 @@ function handleColorThemeChangeEvent(value) {
extConfig.colorTheme = value;
}
+function handleNumberDisplayReformatLikesChangeEvent(value) {
+ extConfig.numberDisplayReformatLikes = value;
+}
+
api.storage.onChanged.addListener(storageChangeHandler);
function initExtConfig() {
@@ -321,6 +327,7 @@ function initExtConfig() {
initializeColorTheme();
initializeNumberDisplayFormat();
initializeNumberDisplayRoundDown();
+ initializeNumberDisplayReformatLikes();
}
function initializeDisableVoteSubmission() {
@@ -384,6 +391,16 @@ function initializeNumberDisplayFormat() {
});
}
+function initializeNumberDisplayReformatLikes() {
+ api.storage.sync.get(["numberDisplayReformatLikes"], (res) => {
+ if (res.numberDisplayReformatLikes === undefined) {
+ api.storage.sync.set({ numberDisplayReformatLikes: false });
+ } else {
+ extConfig.numberDisplayReformatLikes = res.numberDisplayReformatLikes;
+ }
+ });
+}
+
function isChrome() {
return typeof chrome !== "undefined" && typeof chrome.runtime !== "undefined";
}
diff --git a/Extensions/combined/src/events.js b/Extensions/combined/src/events.js
index 5b663d5..b56b142 100644
--- a/Extensions/combined/src/events.js
+++ b/Extensions/combined/src/events.js
@@ -130,6 +130,9 @@ function storageChangeHandler(changes, area) {
if (changes.numberDisplayFormat !== undefined) {
handleNumberDisplayFormatChangeEvent(changes.numberDisplayFormat.newValue);
}
+ if (changes.numberDisplayReformatLikes !== undefined) {
+ handleNumberDisplayReformatLikesChangeEvent(changes.numberDisplayReformatLikes.newValue);
+ }
}
function handleDisableVoteSubmissionChangeEvent(value) {
@@ -157,6 +160,10 @@ function handleNumberDisplayRoundDownChangeEvent(value) {
extConfig.numberDisplayRoundDown = value;
}
+function handleNumberDisplayReformatLikesChangeEvent(value) {
+ extConfig.numberDisplayReformatLikes = value;
+}
+
export {
sendVote,
sendVideoIds,
diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js
index 1ec2af5..87b3b06 100644
--- a/Extensions/combined/src/state.js
+++ b/Extensions/combined/src/state.js
@@ -23,6 +23,7 @@ let extConfig = {
colorTheme: "classic",
numberDisplayFormat: "compactShort",
numberDisplayRoundDown: true,
+ numberDisplayReformatLikes: false,
};
let storedData = {
@@ -153,6 +154,12 @@ function getLikeCountFromButton() {
function processResponse(response, storedData) {
const formattedDislike = numberFormat(response.dislikes);
setDislikes(formattedDislike);
+ if (extConfig.numberDisplayReformatLikes === true) {
+ const nativeLikes = getLikeCountFromButton();
+ if (nativeLikes !== false) {
+ setLikes(numberFormat(nativeLikes));
+ }
+ }
storedData.dislikes = parseInt(response.dislikes);
storedData.likes = getLikeCountFromButton() || parseInt(response.likes);
createRateBar(storedData.likes, storedData.dislikes);
@@ -229,6 +236,7 @@ function initExtConfig() {
initializeColorTheme();
initializeNumberDisplayFormat();
initializeNumberDisplayRoundDown();
+ initializeNumberDisplayReformatLikes();
}
function initializeDisableVoteSubmission() {
@@ -291,6 +299,16 @@ function initializeNumberDisplayFormat() {
});
}
+function initializeNumberDisplayReformatLikes() {
+ getBrowser().storage.sync.get(["numberDisplayReformatLikes"], (res) => {
+ if (res.numberDisplayReformatLikes === undefined) {
+ getBrowser().storage.sync.set({ numberDisplayReformatLikes: false });
+ } else {
+ extConfig.numberDisplayReformatLikes = res.numberDisplayReformatLikes;
+ }
+ });
+}
+
export {
isMobile,
isShorts,