From df742d05664624d920ed2ddc6088b6ece6460970 Mon Sep 17 00:00:00 2001
From: Aneimytis <5927301+cyrildtm@users.noreply.github.com>
Date: Sun, 8 May 2022 05:40:20 -0500
Subject: [PATCH 1/6] Get the like number from proper place
When like button is clicked, only one of the two aria-label attributes gets updated. Use the correct one to reflect latest like count. Affects user option "re-format like numbers"
Attn #561
---
Extensions/combined/src/state.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js
index df9d561..0b987c1 100644
--- a/Extensions/combined/src/state.js
+++ b/Extensions/combined/src/state.js
@@ -153,7 +153,7 @@ function getLikeCountFromButton() {
return 0;
}
let likesStr = getLikeButton()
- .querySelector("button")
+ .querySelector("yt-formatted-string#text")
.getAttribute("aria-label")
.replace(/\D/g, "");
return likesStr.length > 0 ? parseInt(likesStr) : false;
From 260798d1a826f57ee5f91a0bba33511fd17bf2c1 Mon Sep 17 00:00:00 2001
From: Aneimytis <5927301+cyrildtm@users.noreply.github.com>
Date: Sun, 8 May 2022 05:41:30 -0500
Subject: [PATCH 2/6] Update like number when like/dislike button is clicked
When like button is clicked, YT will update like count. This conflicts with user option "re-format like numbers". Force update like number.
attn #561 #584
---
.../UserScript/Return Youtube Dislike.user.js | 16 ++++++++++++++++
Extensions/combined/src/events.js | 17 +++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js
index 476561b..149e7aa 100644
--- a/Extensions/UserScript/Return Youtube Dislike.user.js
+++ b/Extensions/UserScript/Return Youtube Dislike.user.js
@@ -372,6 +372,14 @@ function likeClicked() {
createRateBar(likesvalue, dislikesvalue);
previousState = 1;
}
+ if (extConfig.numberDisplayReformatLikes === true) {
+ const nativeLikes = getLikeCountFromButton();
+ if (nativeLikes !== false) {
+ setLikes(numberFormat(nativeLikes));
+ } else {
+ setLikes(numberFormat(storedData.likes));
+ }
+ }
}
}
@@ -393,6 +401,14 @@ function dislikeClicked() {
setDislikes(numberFormat(dislikesvalue));
createRateBar(likesvalue, dislikesvalue);
previousState = 2;
+ if (extConfig.numberDisplayReformatLikes === true) {
+ const nativeLikes = getLikeCountFromButton();
+ if (nativeLikes !== false) {
+ setLikes(numberFormat(nativeLikes));
+ } else {
+ setLikes(numberFormat(storedData.likes));
+ }
+ }
}
}
}
diff --git a/Extensions/combined/src/events.js b/Extensions/combined/src/events.js
index 99c7d14..2eea4e2 100644
--- a/Extensions/combined/src/events.js
+++ b/Extensions/combined/src/events.js
@@ -8,6 +8,7 @@ import {
extConfig,
storedData,
setLikes,
+ getLikeCountFromButton,
} from "./state";
import { createRateBar } from "./bar";
@@ -41,6 +42,14 @@ function likeClicked() {
createRateBar(storedData.likes, storedData.dislikes);
storedData.previousState = NEUTRAL_STATE;
}
+ if (extConfig.numberDisplayReformatLikes === true) {
+ const nativeLikes = getLikeCountFromButton();
+ if (nativeLikes !== false) {
+ setLikes(numberFormat(nativeLikes));
+ } else {
+ setLikes(numberFormat(storedData.likes));
+ }
+ }
}
}
@@ -65,6 +74,14 @@ function dislikeClicked() {
setDislikes(numberFormat(storedData.dislikes));
createRateBar(storedData.likes, storedData.dislikes);
storedData.previousState = DISLIKED_STATE;
+ if (extConfig.numberDisplayReformatLikes === true) {
+ const nativeLikes = getLikeCountFromButton();
+ if (nativeLikes !== false) {
+ setLikes(numberFormat(nativeLikes));
+ } else {
+ setLikes(numberFormat(storedData.likes));
+ }
+ }
}
}
}
From 41dd4e656efcf2a76fa725f222f75436e8ab437b Mon Sep 17 00:00:00 2001
From: Aneimytis <5927301+cyrildtm@users.noreply.github.com>
Date: Sun, 8 May 2022 05:50:54 -0500
Subject: [PATCH 3/6] don't use storedData.likes
Since official like count is still available, avoid using API server response.
---
Extensions/combined/src/events.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Extensions/combined/src/events.js b/Extensions/combined/src/events.js
index 2eea4e2..019f166 100644
--- a/Extensions/combined/src/events.js
+++ b/Extensions/combined/src/events.js
@@ -46,8 +46,6 @@ function likeClicked() {
const nativeLikes = getLikeCountFromButton();
if (nativeLikes !== false) {
setLikes(numberFormat(nativeLikes));
- } else {
- setLikes(numberFormat(storedData.likes));
}
}
}
@@ -78,8 +76,6 @@ function dislikeClicked() {
const nativeLikes = getLikeCountFromButton();
if (nativeLikes !== false) {
setLikes(numberFormat(nativeLikes));
- } else {
- setLikes(numberFormat(storedData.likes));
}
}
}
From 1d3f71170bcb5ca74693e37682a2f2890d2be8dd Mon Sep 17 00:00:00 2001
From: Aneimytis <5927301+cyrildtm@users.noreply.github.com>
Date: Sun, 8 May 2022 05:53:07 -0500
Subject: [PATCH 4/6] do not get Shorts like number
It does not work.
Also, in js zero is not false.
---
Extensions/combined/src/state.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js
index 0b987c1..e20db49 100644
--- a/Extensions/combined/src/state.js
+++ b/Extensions/combined/src/state.js
@@ -150,7 +150,7 @@ 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;
+ return false;
}
let likesStr = getLikeButton()
.querySelector("yt-formatted-string#text")
From 013bb5d37d436a43662d549fbf4a0a2fac3217af Mon Sep 17 00:00:00 2001
From: Aneimytis <5927301+cyrildtm@users.noreply.github.com>
Date: Sun, 8 May 2022 05:55:44 -0500
Subject: [PATCH 5/6] (userscript) additional like number fixes
synchronize with extension
---
Extensions/UserScript/Return Youtube Dislike.user.js | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js
index 149e7aa..5144d47 100644
--- a/Extensions/UserScript/Return Youtube Dislike.user.js
+++ b/Extensions/UserScript/Return Youtube Dislike.user.js
@@ -203,10 +203,10 @@ 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;
+ return false;
}
let likesStr = getLikeButton()
- .querySelector("button")
+ .querySelector("yt-formatted-string#text")
.getAttribute("aria-label")
.replace(/\D/g, "");
return likesStr.length > 0 ? parseInt(likesStr) : false;
@@ -376,8 +376,6 @@ function likeClicked() {
const nativeLikes = getLikeCountFromButton();
if (nativeLikes !== false) {
setLikes(numberFormat(nativeLikes));
- } else {
- setLikes(numberFormat(storedData.likes));
}
}
}
@@ -405,8 +403,6 @@ function dislikeClicked() {
const nativeLikes = getLikeCountFromButton();
if (nativeLikes !== false) {
setLikes(numberFormat(nativeLikes));
- } else {
- setLikes(numberFormat(storedData.likes));
}
}
}
From 08a7ec17adaa169552224a003078c5c9caba12ef Mon Sep 17 00:00:00 2001
From: Aneimytis <5927301+cyrildtm@users.noreply.github.com>
Date: Sun, 8 May 2022 05:59:58 -0500
Subject: [PATCH 6/6] Clarify user option re-format like number does not work
on Shorts
---
Extensions/combined/popup.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Extensions/combined/popup.html b/Extensions/combined/popup.html
index 7d39246..83eecaf 100644
--- a/Extensions/combined/popup.html
+++ b/Extensions/combined/popup.html
@@ -108,7 +108,7 @@
Show rounded down numbers
-