From e18cb56d614e488c1ece875ad97e029df6aef409 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Tue, 1 Mar 2022 18:37:28 +0300
Subject: Fixed settings not being applied to Piped

---
 src/pages/background/background.js     | 9 +++------
 src/pages/options/youtube/youtube.html | 2 +-
 src/pages/options/youtube/youtube.js   | 3 ---
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 1f096b4c..d77495e0 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -72,13 +72,10 @@ browser.webRequest.onBeforeRequest.addListener(
 
     if (wikipediaHelper.isWikipedia(url, initiator)) newUrl = wikipediaHelper.redirect(url);
 
-    if (youtubeHelper.isPipedorInvidious(newUrl ?? url, details.type)) newUrl = youtubeHelper.addUrlParams(newUrl ?? url);
-
     if (exceptionsHelper.isException(url, initiator)) newUrl = null;
 
     if (bybassTabs.includes(details.tabId)) newUrl = null;
 
-
     if (newUrl) {
       if (newUrl == 'CANCEL') {
         console.log(`Canceled ${url}`);
@@ -108,7 +105,7 @@ browser.tabs.onRemoved.addListener((tabId) => {
 
 
 browser.tabs.onUpdated.addListener(
-  (tabId, changeInfo) => {
-    if (changeInfo.url && youtubeHelper.isUrlPipedorInvidious(changeInfo.url, 'invidious'))
-      youtubeHelper.invidiousInitCookies(tabId);
+  (tabId, changeInfo, _) => {
+    if (changeInfo.url && youtubeHelper.isUrlPipedorInvidious(changeInfo.url, 'piped')) youtubeHelper.initPipedLocalStorage(changeInfo.url, tabId);
+    if (changeInfo.url && youtubeHelper.isUrlPipedorInvidious(changeInfo.url, 'invidious')) youtubeHelper.invidiousInitCookies(changeInfo.url);
   });
\ No newline at end of file
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html
index 3e0bd638..b86936b1 100644
--- a/src/pages/options/youtube/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -96,8 +96,8 @@
     <div class="some-block option-block">
       <h4>Frontend</h4>
       <select id="youtube-frontend">
-        <option value="piped">Piped</option>
         <option value="invidious">Invidious</option>
+        <option value="piped">Piped</option>
         <option value="freetube">FreeTube</option>
         <option value="yatte">Yattee</option>
       </select>
diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js
index f1bd6351..cc87edbe 100644
--- a/src/pages/options/youtube/youtube.js
+++ b/src/pages/options/youtube/youtube.js
@@ -8,9 +8,6 @@ let pipedDivElement = document.getElementById("piped");
 let invidiousPipedDivElement = document.getElementById("invidious-piped");
 let freetubeYatteeDivElement = document.getElementById("freetube-yatte");
 
-
-
-
 function changeFrontendsSettings(frontend) {
     if (frontend == 'piped') {
         invidiousPipedDivElement.style.display = 'block'
-- 
cgit 1.4.1