From 599f35a185206048ea447b3e791d5a70b86bde7f Mon Sep 17 00:00:00 2001 From: Sasha Aryutin Date: Sun, 5 Dec 2021 03:32:24 +0300 Subject: [PATCH] refactor: extract hardcoded values to const --- .../UserScript/Return Youtube Dislike.user.js | 10 +++++--- .../chrome/return-youtube-dislike.script.js | 24 +++++++++++-------- .../firefox/return-youtube-dislike.script.js | 20 +++++++++------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 937e282..a5ecc56 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -19,6 +19,10 @@ // @grant GM_addStyle // @run-at document-end // ==/UserScript== +const LIKED_STATE = "LIKED_STATE"; +const DISLIKED_STATE = "DISLIKED_STATE"; +const NEUTRAL_STATE = "NEUTRAL_STATE"; + function cLog(text, subtext = '') { subtext = subtext.trim() === '' ? '' : `(${subtext})`; console.log(`[Return YouTube Dislikes] ${text} ${subtext}`); @@ -60,12 +64,12 @@ function isVideoNotDisliked() { function getState() { if (isVideoLiked()) { - return "liked"; + return LIKED_STATE; } if (isVideoDisliked()) { - return "disliked"; + return DISLIKED_STATE; } - return "neutral"; + return NEUTRAL_STATE; } function setLikes(likesCount) { diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index dc713ca..066ed1a 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -1,7 +1,11 @@ +const LIKED_STATE = "LIKED_STATE"; +const DISLIKED_STATE = "DISLIKED_STATE"; +const NEUTRAL_STATE = "NEUTRAL_STATE"; + (function (extensionId) { let storedData = { dislikes: 0, - previousState: 'neutral' + previousState: NEUTRAL_STATE }; function cLog(message, writer) { @@ -54,12 +58,12 @@ function getState() { if (isVideoLiked()) { - return {current: "liked", previous: storedData.previousState}; + return {current: LIKED_STATE, previous: storedData.previousState}; } if (isVideoDisliked()) { - return {current: "disliked", previous: storedData.previousState}; + return {current: DISLIKED_STATE, previous: storedData.previousState}; } - return {current: "neutral", previous: storedData.previousState}; + return {current: NEUTRAL_STATE, previous: storedData.previousState}; } //--- Sets The Likes And Dislikes Values ---// @@ -122,10 +126,10 @@ function likeClicked() { console.log(storedData.previousState) - if (storedData.previousState == 'disliked') { + if (storedData.previousState == DISLIKED_STATE) { storedData.dislikes--; setDislikes(numberFormat(storedData.dislikes)); - storedData.previousState = 'liked'; + storedData.previousState = LIKED_STATE; } } @@ -134,14 +138,14 @@ console.log("Dislike State:",getState()); - if (state == 'disliked') { + if (state == DISLIKED_STATE) { storedData.dislikes++; setDislikes(numberFormat(storedData.dislikes)); - storedData.previousState = 'disliked'; - } else if (state == 'neutral') { + storedData.previousState = DISLIKED_STATE; + } else if (state == NEUTRAL_STATE) { storedData.dislikes--; setDislikes(numberFormat(storedData.dislikes)); - storedData.previousState = 'neutral'; + storedData.previousState = NEUTRAL_STATE; } // setState(); diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index bdf3184..8ef105e 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -1,7 +1,11 @@ +const LIKED_STATE = "LIKED_STATE"; +const DISLIKED_STATE = "DISLIKED_STATE"; +const NEUTRAL_STATE = "NEUTRAL_STATE"; + if (!storedData) { var storedData = { dislikes: 0, - previousState: 'neutral' + previousState: NEUTRAL_STATE }; } @@ -52,12 +56,12 @@ function isVideoNotDisliked() { function getState() { if (isVideoLiked()) { - return {current: "liked", previous: storedData.previousState}; + return {current: LIKED_STATE, previous: storedData.previousState}; } if (isVideoDisliked()) { - return {current: "disliked", previous: storedData.previousState}; + return {current: DISLIKED_STATE, previous: storedData.previousState}; } - return {current: "neutral", previous: storedData.previousState}; + return {current: NEUTRAL_STATE, previous: storedData.previousState}; } //--- Sets The Likes And Dislikes Values ---// @@ -120,14 +124,14 @@ function likeClicked() {} function dislikeClicked() { let state = getState().current; - if (state == "disliked") { + if (state == DISLIKED_STATE) { storedData.dislikes++; setDislikes(numberFormat(storedData.dislikes)); - storedData.previousState = 'disliked'; - } else if (state == "neutral") { + storedData.previousState = DISLIKED_STATE; + } else if (state == NEUTRAL_STATE) { storedData.dislikes--; setDislikes(numberFormat(storedData.dislikes)); - storedData.previousState = 'neutral'; + storedData.previousState = NEUTRAL_STATE; } // setState();