From 6790952f860eab70bff38be9d300365b08423818 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sat, 23 Nov 2019 12:26:24 -0500 Subject: [PATCH] Fixed error messages not working. Added message for error 503 and 0. --- _locales/en/messages.json | 3 +++ content.js | 7 +++++-- popup.js | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 806abcf4..42256bb1 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -262,5 +262,8 @@ }, "keybindDescriptionComplete": { "message": "The keybind has been set to: " + }, + "0": { + "message": "Connection Timeout. Check your internet connection. If your internet is working, the server is probably overloaded or down." } } diff --git a/content.js b/content.js index 276c93c9..ec55863b 100644 --- a/content.js +++ b/content.js @@ -1041,8 +1041,11 @@ function sendSubmitMessage(){ document.getElementById("submitButton").style.animation = "unset"; document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png"); - if([400,429,409,502].includes(response.statusCode)) { - alert(chrome.i18n.getMessage(response.statusCode)); + if([400, 429, 409, 502, 0].includes(response.statusCode)) { + //treat them the same + if (response.statusCode == 503) response.statusCode = 502; + + alert(chrome.i18n.getMessage(response.statusCode + "")); } else { alert(chrome.i18n.getMessage("connectionError") + response.statusCode); } diff --git a/popup.js b/popup.js index 5dfaadda..337dd020 100644 --- a/popup.js +++ b/popup.js @@ -811,8 +811,11 @@ function runThePopup() { } else { let errorMessage = ""; - if([400,429,409,502].includes(response.statusCode)) { - errorMessage = chrome.i18n.getMessage(response.statusCode); + if([400, 429, 409, 502, 0].includes(response.statusCode)) { + //treat them the same + if (response.statusCode == 503) response.statusCode = 502; + + errorMessage = chrome.i18n.getMessage(response.statusCode + ""); } else { errorMessage = chrome.i18n.getMessage("connectionError") + response.statusCode; } @@ -1109,8 +1112,10 @@ function runThePopup() { type: type, UUID: UUID }, function(response) { + console.log(response) if (response != undefined) { //see if it was a success or failure + console.log(response) if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) { //success (treat rate limits as a success) addVoteMessage(chrome.i18n.getMessage("voted"), UUID)