From b00634c786dfe9b04cb3a36eb98c098d1512d961 Mon Sep 17 00:00:00 2001 From: hucario Date: Wed, 26 May 2021 16:59:20 -0700 Subject: [PATCH 1/7] fix pvrs12#77 --- common/js/background.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common/js/background.js b/common/js/background.js index 8ab1271..6c231d0 100644 --- a/common/js/background.js +++ b/common/js/background.js @@ -16,10 +16,8 @@ get_browser().webRequest.onBeforeSendHeaders.addListener( }, { urls: [ - "http://*.pandora.com/*", - "https://*.pandora.com/*", - "http://*.p-cdn.com/*", - "http://*.p-cdn.us/*" + "http://*.pandora.com/services/json/", + "https://*.pandora.com/services/json/", ] }, ['blocking', 'requestHeaders'] From 9192b1fcb4de18ba0facd9cf749e6dfbd8a9fe22 Mon Sep 17 00:00:00 2001 From: hucario Date: Wed, 26 May 2021 17:02:13 -0700 Subject: [PATCH 2/7] attempt fix for pvrs#76 --- common/js/background.js | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/common/js/background.js b/common/js/background.js index 6c231d0..f4d129d 100644 --- a/common/js/background.js +++ b/common/js/background.js @@ -150,7 +150,13 @@ async function nextSong(depth=1, prev_station=undefined) { xhr2.send(null); } - callbacks.updatePlayer.forEach(e => { try{e && e()}catch(b){}}); + background.callbacks.updatePlayer.forEach((e) => { + try { + e(); + } catch(b) { + background.callbacks.updatePlayer.splice(background.callbacks.updatePlayer.indexOf(e), 1); + } + }); }; xhr.send(); } @@ -189,8 +195,14 @@ document.addEventListener('DOMContentLoaded', function () { mp3Player.addEventListener("play", function () { try { //check if the window exists - document.getElementById('mp3Player').yep = 'thisexists' - callbacks.updatePlayer.forEach(e => { try{e && e()}catch(b){}}); + document.getElementById('mp3Player').yep = 'thisexists' + background.callbacks.updatePlayer.forEach((e) => { + try { + e(); + } catch(b) { + background.callbacks.updatePlayer.splice(background.callbacks.updatePlayer.indexOf(e), 1); + } + }); currentSong.startTime = Math.round(new Date().getTime() / 1000); } catch (e) { //if it doesn"t exist, don"t draw here @@ -204,7 +216,13 @@ document.addEventListener('DOMContentLoaded', function () { try { //check if the window exists document.getElementById('mp3Player').yep = 'thisexists' - callbacks.drawPlayer.forEach(e => { e && e()}); + background.callbacks.drawPlayer.forEach((e) => { + try { + e(); + } catch(b) { + background.callbacks.drawPlayer.splice(background.callbacks.drawPlayer.indexOf(e), 1); + } + }); } catch(e){ //if it doesn"t, don"t draw here return; From a44af894855c4324a62d23d7e67a550685c256c2 Mon Sep 17 00:00:00 2001 From: hucario Date: Wed, 26 May 2021 17:25:51 -0700 Subject: [PATCH 3/7] fix pvrs12#76 --- common/js/anesidora.js | 1 + 1 file changed, 1 insertion(+) diff --git a/common/js/anesidora.js b/common/js/anesidora.js index b0ab873..04467a9 100644 --- a/common/js/anesidora.js +++ b/common/js/anesidora.js @@ -190,6 +190,7 @@ async function partnerLogin() { } syncTime = parseInt(s); clientStartTime = parseInt((new Date().getTime() + "").substr(0, 10)); + dontRetryPartnerLogin = false; return await userLogin(response); } } From 65e4c36a728c831378789ef5f83715efe3787076 Mon Sep 17 00:00:00 2001 From: hucario Date: Wed, 26 May 2021 17:29:25 -0700 Subject: [PATCH 4/7] actually fix #76 --- common/js/anesidora.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/js/anesidora.js b/common/js/anesidora.js index 04467a9..446bb10 100644 --- a/common/js/anesidora.js +++ b/common/js/anesidora.js @@ -164,6 +164,8 @@ async function userLogin(response) { return "uncool credentials"; } + dontRetryPartnerLogin = false; + userAuthToken = res.result.userAuthToken; userId = res.result.userId; if (stationList.length == 0) { @@ -190,7 +192,6 @@ async function partnerLogin() { } syncTime = parseInt(s); clientStartTime = parseInt((new Date().getTime() + "").substr(0, 10)); - dontRetryPartnerLogin = false; return await userLogin(response); } } From 7f71b4525deca0313dc24452b263c8468fc1f8e7 Mon Sep 17 00:00:00 2001 From: hucario Date: Wed, 26 May 2021 17:39:35 -0700 Subject: [PATCH 5/7] make login form handler smooth:tm: --- common/js/newpopup.js | 29 ++++++++++++++-------------- common/js/oldpopup.js | 45 ++++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/common/js/newpopup.js b/common/js/newpopup.js index 92cfe74..f3a6b72 100644 --- a/common/js/newpopup.js +++ b/common/js/newpopup.js @@ -447,20 +447,21 @@ document.addEventListener('DOMContentLoaded', async function () { unWarning.style.display = 'none'; pwWarning.style.display = 'none'; - login.addEventListener("submit", async function () { - localStorage.username = unInput.value; - localStorage.password = pwInput.value; - await background.partnerLogin(); - if (background.userAuthToken === "") { - document.getElementById("li1").classList.add("warning"); - document.getElementById("li2").classList.add("warning"); - return false; - } else { - await addStations(); - //move to mid panel - goToStations(); - return false; - } + login.addEventListener("submit", function () { + (async() => { + localStorage.username = unInput.value; + localStorage.password = pwInput.value; + await background.partnerLogin(); + if (background.userAuthToken === "") { + document.getElementById("li1").classList.add("warning"); + document.getElementById("li2").classList.add("warning"); + } else { + await addStations(); + //move to mid panel + goToStations(); + } + })(); + return false; }); ['keypress', 'change', 'input', 'paste'].forEach(e => { diff --git a/common/js/oldpopup.js b/common/js/oldpopup.js index 1820e04..a52c3f6 100644 --- a/common/js/oldpopup.js +++ b/common/js/oldpopup.js @@ -358,28 +358,29 @@ $(document).ready(async function () { }); $("#unWarning").hide(); $("#pwWarning").hide(); - $("#login").bind("submit", async function () { - localStorage.username = $("#username").val(); - localStorage.password = $("#password").val(); - await background.partnerLogin(); - if (background.userAuthToken === "") { - $("#unWarning").show(); - $("#pwWarning").show(); - $("#username").css({ - "padding-left": "16px", - "width": "216px" - }); - $("#password").css({ - "padding-left": "16px", - "width": "216px" - }); - return false; - } else { - addStations(); - //move to mid panel - goToStations(); - return false; - } + $("#login").bind("submit", function () { + (async() => { + localStorage.username = $("#username").val(); + localStorage.password = $("#password").val(); + await background.partnerLogin(); + if (background.userAuthToken === "") { + $("#unWarning").show(); + $("#pwWarning").show(); + $("#username").css({ + "padding-left": "16px", + "width": "216px" + }); + $("#password").css({ + "padding-left": "16px", + "width": "216px" + }); + } else { + addStations(); + //move to mid panel + goToStations(); + } + })(); + return false; }); $("#stationFilterInput").bind("keypress change input paste", () => { From 073ab1a00c227b4ddaf27749eca79cc9f75fccf4 Mon Sep 17 00:00:00 2001 From: hucario Date: Wed, 26 May 2021 17:49:54 -0700 Subject: [PATCH 6/7] sometimes I think "I should test this" then I think to myself: no lmao --- common/js/background.js | 4 ++-- common/js/newpopup.js | 3 ++- common/js/oldpopup.js | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/js/background.js b/common/js/background.js index f4d129d..cb49dc4 100644 --- a/common/js/background.js +++ b/common/js/background.js @@ -16,8 +16,8 @@ get_browser().webRequest.onBeforeSendHeaders.addListener( }, { urls: [ - "http://*.pandora.com/services/json/", - "https://*.pandora.com/services/json/", + "http://*.pandora.com/services/json/*", + "https://*.pandora.com/services/json/*", ] }, ['blocking', 'requestHeaders'] diff --git a/common/js/newpopup.js b/common/js/newpopup.js index f3a6b72..7cbf434 100644 --- a/common/js/newpopup.js +++ b/common/js/newpopup.js @@ -447,7 +447,7 @@ document.addEventListener('DOMContentLoaded', async function () { unWarning.style.display = 'none'; pwWarning.style.display = 'none'; - login.addEventListener("submit", function () { + login.addEventListener("submit", function (e) { (async() => { localStorage.username = unInput.value; localStorage.password = pwInput.value; @@ -461,6 +461,7 @@ document.addEventListener('DOMContentLoaded', async function () { goToStations(); } })(); + e.preventDefault(); return false; }); diff --git a/common/js/oldpopup.js b/common/js/oldpopup.js index a52c3f6..7070b93 100644 --- a/common/js/oldpopup.js +++ b/common/js/oldpopup.js @@ -358,7 +358,7 @@ $(document).ready(async function () { }); $("#unWarning").hide(); $("#pwWarning").hide(); - $("#login").bind("submit", function () { + $("#login").bind("submit", function (e) { (async() => { localStorage.username = $("#username").val(); localStorage.password = $("#password").val(); @@ -380,6 +380,7 @@ $(document).ready(async function () { goToStations(); } })(); + e.preventDefault(); return false; }); From 58016fda1c7faacd16607a45fb858ebd6ae4d01a Mon Sep 17 00:00:00 2001 From: pvrs12 <6956401+pvrs12@users.noreply.github.com> Date: Wed, 26 May 2021 21:07:37 -0400 Subject: [PATCH 7/7] version bump --- chrome/manifest.json | 2 +- firefox/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/manifest.json b/chrome/manifest.json index 108f9a7..6926b3c 100644 --- a/chrome/manifest.json +++ b/chrome/manifest.json @@ -44,7 +44,7 @@ "global": true } }, - "version": "2.1.2", + "version": "2.1.3", "options_ui": { "page": "options.htm", "chrome_style": true diff --git a/firefox/manifest.json b/firefox/manifest.json index 4fb2b08..b3425ec 100644 --- a/firefox/manifest.json +++ b/firefox/manifest.json @@ -46,7 +46,7 @@ "description": "Skip to the next song" } }, - "version": "2.1.2", + "version": "2.1.3", "options_ui": { "page": "options.htm", "browser_style": true