From a5a54d0f878db91bb28707cc80a0a4267bd15b3a Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Mon, 21 Feb 2022 21:38:52 +0300 Subject: [PATCH] fix libredirect not working at all #55 --- src/assets/javascripts/helpers/exceptions.js | 4 +- src/assets/javascripts/helpers/imgur.js | 10 ++-- src/assets/javascripts/helpers/instagram.js | 10 ++-- src/assets/javascripts/helpers/maps.js | 4 +- src/assets/javascripts/helpers/medium.js | 10 ++-- src/assets/javascripts/helpers/reddit.js | 18 +++---- src/assets/javascripts/helpers/search.js | 28 +++++------ src/assets/javascripts/helpers/tiktok.js | 10 ++-- src/assets/javascripts/helpers/translate.js | 22 ++++---- src/assets/javascripts/helpers/twitter.js | 16 +++--- src/assets/javascripts/helpers/wikipedia.js | 10 ++-- .../helpers/youtube/invidious-cookies.js | 2 +- .../javascripts/helpers/youtube/youtube.js | 50 +++++++++---------- src/assets/javascripts/remove-twitter-sw.js | 4 +- src/pages/options/general/general.js | 4 +- src/pages/options/init.js | 2 +- 16 files changed, 102 insertions(+), 102 deletions(-) diff --git a/src/assets/javascripts/helpers/exceptions.js b/src/assets/javascripts/helpers/exceptions.js index e799b4b1..5969cc4c 100644 --- a/src/assets/javascripts/helpers/exceptions.js +++ b/src/assets/javascripts/helpers/exceptions.js @@ -9,13 +9,13 @@ let exceptions = { const getExceptions = () => exceptions; function setExceptions(val) { exceptions = val; - browser.storage.sync.set({ exceptions }) + browser.storage.local.set({ exceptions }) console.log("exceptions: ", val) } async function init() { return new Promise((resolve) => { - browser.storage.sync.get("exceptions", (result) => { + browser.storage.local.get("exceptions", (result) => { if (result.exceptions) exceptions = result.exceptions; resolve(); }); diff --git a/src/assets/javascripts/helpers/imgur.js b/src/assets/javascripts/helpers/imgur.js index 8ec764e5..f54ec52c 100644 --- a/src/assets/javascripts/helpers/imgur.js +++ b/src/assets/javascripts/helpers/imgur.js @@ -35,7 +35,7 @@ const getCustomRedirects = function () { function setRedirects(val) { redirects.rimgo = val; - browser.storage.sync.set({ imgurRedirects: redirects }) + browser.storage.local.set({ imgurRedirects: redirects }) console.log("imgurRedirects: ", val) for (const item of rimgoNormalRedirectsChecks) if (!redirects.rimgo.normal.includes(item)) { @@ -49,7 +49,7 @@ let rimgoNormalRedirectsChecks; const getRimgoNormalRedirectsChecks = () => rimgoNormalRedirectsChecks; function setRimgoNormalRedirectsChecks(val) { rimgoNormalRedirectsChecks = val; - browser.storage.sync.set({ rimgoNormalRedirectsChecks }) + browser.storage.local.set({ rimgoNormalRedirectsChecks }) console.log("rimgoNormalRedirectsChecks: ", val) } @@ -57,7 +57,7 @@ let rimgoNormalCustomRedirects = []; const getRimgoNormalCustomRedirects = () => rimgoNormalCustomRedirects; function setRimgoNormalCustomRedirects(val) { rimgoNormalCustomRedirects = val; - browser.storage.sync.set({ rimgoNormalCustomRedirects }) + browser.storage.local.set({ rimgoNormalCustomRedirects }) console.log("rimgoNormalCustomRedirects: ", val) } @@ -65,7 +65,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableImgur: disable }) + browser.storage.local.set({ disableImgur: disable }) } function isImgur(url, initiator) { @@ -96,7 +96,7 @@ function redirect(url, type) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( [ "disableImgur", "imgurRedirects", diff --git a/src/assets/javascripts/helpers/instagram.js b/src/assets/javascripts/helpers/instagram.js index a5a1ffea..46051970 100644 --- a/src/assets/javascripts/helpers/instagram.js +++ b/src/assets/javascripts/helpers/instagram.js @@ -32,7 +32,7 @@ const getCustomRedirects = function () { }; function setRedirects(val) { redirects.bibliogram = val; - browser.storage.sync.set({ instagramRedirects: redirects }) + browser.storage.local.set({ instagramRedirects: redirects }) console.log("instagramRedirects: ", val) for (const item of bibliogramNormalRedirectsChecks) if (!redirects.bibliogram.normal.includes(item)) { @@ -46,7 +46,7 @@ let bibliogramNormalRedirectsChecks; const getBibliogramNormalRedirectsChecks = () => bibliogramNormalRedirectsChecks; function setBibliogramNormalRedirectsChecks(val) { bibliogramNormalRedirectsChecks = val; - browser.storage.sync.set({ bibliogramNormalRedirectsChecks }) + browser.storage.local.set({ bibliogramNormalRedirectsChecks }) console.log("bibliogramNormalRedirectsChecks: ", val) } @@ -54,7 +54,7 @@ let bibliogramNormalCustomRedirects = []; const getBibliogramNormalCustomRedirects = () => bibliogramNormalCustomRedirects; function setBibliogramNormalCustomRedirects(val) { bibliogramNormalCustomRedirects = val; - browser.storage.sync.set({ bibliogramNormalCustomRedirects }) + browser.storage.local.set({ bibliogramNormalCustomRedirects }) console.log("bibliogramNormalCustomRedirects: ", val) } @@ -90,7 +90,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableInstagram: disable }) + browser.storage.local.set({ disableInstagram: disable }) } function isInstagram(url, initiator) { @@ -120,7 +120,7 @@ function redirect(url, type) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( [ "disableInstagram", "instagramRedirects", diff --git a/src/assets/javascripts/helpers/maps.js b/src/assets/javascripts/helpers/maps.js index 0b2d63b4..3fd77005 100644 --- a/src/assets/javascripts/helpers/maps.js +++ b/src/assets/javascripts/helpers/maps.js @@ -49,7 +49,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableMaps: disable }) + browser.storage.local.set({ disableMaps: disable }) } function isMaps(url, initiator) { @@ -128,7 +128,7 @@ function redirect(url) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( "disableMaps", (result) => { disable = result.disableMaps ?? false diff --git a/src/assets/javascripts/helpers/medium.js b/src/assets/javascripts/helpers/medium.js index a5aa96b8..dcec5743 100644 --- a/src/assets/javascripts/helpers/medium.js +++ b/src/assets/javascripts/helpers/medium.js @@ -38,7 +38,7 @@ const getCustomRedirects = function () { }; function setRedirects(val) { redirects.scribe = val; - browser.storage.sync.set({ mediumRedirects: redirects }) + browser.storage.local.set({ mediumRedirects: redirects }) console.log("mediumRedirects: ", val) for (const item of scribeNormalRedirectsChecks) if (!redirects.scribe.normal.includes(item)) { var index = scribeNormalRedirectsChecks.indexOf(item); @@ -51,7 +51,7 @@ let scribeNormalRedirectsChecks; const getScribeNormalRedirectsChecks = () => scribeNormalRedirectsChecks; function setScribeNormalRedirectsChecks(val) { scribeNormalRedirectsChecks = val; - browser.storage.sync.set({ scribeNormalRedirectsChecks }) + browser.storage.local.set({ scribeNormalRedirectsChecks }) console.log("scribeNormalRedirectsChecks: ", val) } @@ -59,7 +59,7 @@ let scribeNormalCustomRedirects = []; const getScribeNormalCustomRedirects = () => scribeNormalCustomRedirects; function setScribeNormalCustomRedirects(val) { scribeNormalCustomRedirects = val; - browser.storage.sync.set({ scribeNormalCustomRedirects }) + browser.storage.local.set({ scribeNormalCustomRedirects }) console.log("scribeNormalCustomRedirects: ", val) } @@ -67,7 +67,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableMedium: disable }) + browser.storage.local.set({ disableMedium: disable }) console.log("disableMedium", disable) } @@ -95,7 +95,7 @@ function redirect(url, type) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( [ "disableMedium", "mediumRedirects", diff --git a/src/assets/javascripts/helpers/reddit.js b/src/assets/javascripts/helpers/reddit.js index 3105b4b0..27fec5d2 100644 --- a/src/assets/javascripts/helpers/reddit.js +++ b/src/assets/javascripts/helpers/reddit.js @@ -73,7 +73,7 @@ const getCustomRedirects = function () { function setLibredditRedirects(val) { redirects.libreddit = val; - browser.storage.sync.set({ redditRedirects: redirects }) + browser.storage.local.set({ redditRedirects: redirects }) console.log("libredditRedirects:", val) for (const item of libredditNormalRedirectsChecks) if (!redirects.libreddit.normal.includes(item)) { @@ -85,7 +85,7 @@ function setLibredditRedirects(val) { function setTedditRedirects(val) { redirects.teddit = val; - browser.storage.sync.set({ redditRedirects: redirects }) + browser.storage.local.set({ redditRedirects: redirects }) console.log("tedditRedirects:", val) for (const item of tedditNormalRedirectsChecks) if (!redirects.teddit.normal.includes(item)) { @@ -100,7 +100,7 @@ let libredditNormalRedirectsChecks; const getLibredditNormalRedirectsChecks = () => libredditNormalRedirectsChecks; function setLibredditNormalRedirectsChecks(val) { libredditNormalRedirectsChecks = val; - browser.storage.sync.set({ libredditNormalRedirectsChecks }) + browser.storage.local.set({ libredditNormalRedirectsChecks }) console.log("libredditNormalRedirectsChecks: ", val) } @@ -108,7 +108,7 @@ let libredditNormalCustomRedirects = []; const getLibredditNormalCustomRedirects = () => libredditNormalCustomRedirects; function setLibredditNormalCustomRedirects(val) { libredditNormalCustomRedirects = val; - browser.storage.sync.set({ libredditNormalCustomRedirects }) + browser.storage.local.set({ libredditNormalCustomRedirects }) console.log("libredditNormalCustomRedirects: ", val) } @@ -116,7 +116,7 @@ let tedditNormalRedirectsChecks; const getTedditNormalRedirectsChecks = () => tedditNormalRedirectsChecks; function setTedditNormalRedirectsChecks(val) { tedditNormalRedirectsChecks = val; - browser.storage.sync.set({ tedditNormalRedirectsChecks }) + browser.storage.local.set({ tedditNormalRedirectsChecks }) console.log("tedditNormalRedirectsChecks: ", val) } @@ -124,7 +124,7 @@ let tedditNormalCustomRedirects = []; const getTedditNormalCustomRedirects = () => tedditNormalCustomRedirects; function setTedditNormalCustomRedirects(val) { tedditNormalCustomRedirects = val; - browser.storage.sync.set({ tedditNormalCustomRedirects }) + browser.storage.local.set({ tedditNormalCustomRedirects }) console.log("tedditNormalCustomRedirects: ", val) } @@ -134,14 +134,14 @@ let disableReddit; const getDisableReddit = () => disableReddit; function setDisableReddit(val) { disableReddit = val; - browser.storage.sync.set({ disableReddit }) + browser.storage.local.set({ disableReddit }) } let redditFrontend; const getRedditFrontend = () => redditFrontend; function setRedditFrontend(val) { redditFrontend = val; - browser.storage.sync.set({ redditFrontend }) + browser.storage.local.set({ redditFrontend }) }; function isReddit(url, initiator) { @@ -207,7 +207,7 @@ function redirect(url, type) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( [ "disableReddit", "redditFrontend", diff --git a/src/assets/javascripts/helpers/search.js b/src/assets/javascripts/helpers/search.js index da51fb7b..07bb20b4 100644 --- a/src/assets/javascripts/helpers/search.js +++ b/src/assets/javascripts/helpers/search.js @@ -33,7 +33,7 @@ const getCustomRedirects = () => { function setSearxRedirects(val) { redirects.searx = val; - browser.storage.sync.set({ searchRedirects: redirects }) + browser.storage.local.set({ searchRedirects: redirects }) console.log("searxRedirects:", val) for (const item of searxNormalRedirectsChecks) if (!redirects.searx.normal.includes(item)) { var index = searxNormalRedirectsChecks.indexOf(item); @@ -50,7 +50,7 @@ function setSearxRedirects(val) { function setWhoogleRedirects(val) { redirects.whoogle = val; - browser.storage.sync.set({ searchRedirects: redirects }) + browser.storage.local.set({ searchRedirects: redirects }) console.log("whoogleRedirects:", val) for (const item of whoogleNormalRedirectsChecks) if (!redirects.whoogle.normal.includes(item)) { var index = whoogleNormalRedirectsChecks.indexOf(item); @@ -69,7 +69,7 @@ let whoogleNormalRedirectsChecks; const getWhoogleNormalRedirectsChecks = () => whoogleNormalRedirectsChecks; function setWhoogleNormalRedirectsChecks(val) { whoogleNormalRedirectsChecks = val; - browser.storage.sync.set({ whoogleNormalRedirectsChecks }) + browser.storage.local.set({ whoogleNormalRedirectsChecks }) console.log("whoogleNormalRedirectsChecks: ", val) } @@ -77,7 +77,7 @@ let whoogleTorRedirectsChecks; const getWhoogleTorRedirectsChecks = () => whoogleTorRedirectsChecks; function setWhoogleTorRedirectsChecks(val) { whoogleTorRedirectsChecks = val; - browser.storage.sync.set({ whoogleTorRedirectsChecks }) + browser.storage.local.set({ whoogleTorRedirectsChecks }) console.log("whoogleTorRedirectsChecks: ", val) } @@ -85,7 +85,7 @@ let whoogleNormalCustomRedirects = []; const getWhoogleNormalCustomRedirects = () => whoogleNormalCustomRedirects; function setWhoogleNormalCustomRedirects(val) { whoogleNormalCustomRedirects = val; - browser.storage.sync.set({ whoogleNormalCustomRedirects }) + browser.storage.local.set({ whoogleNormalCustomRedirects }) console.log("whoogleNormalCustomRedirects: ", val) } @@ -93,7 +93,7 @@ let whoogleTorCustomRedirects = []; const getWhoogleTorCustomRedirects = () => whoogleTorCustomRedirects; function setWhoogleTorCustomRedirects(val) { whoogleTorCustomRedirects = val; - browser.storage.sync.set({ whoogleTorCustomRedirects }) + browser.storage.local.set({ whoogleTorCustomRedirects }) console.log("whoogleTorCustomRedirects: ", val) } @@ -101,7 +101,7 @@ let searxNormalRedirectsChecks; const getSearxNormalRedirectsChecks = () => searxNormalRedirectsChecks; function setSearxNormalRedirectsChecks(val) { searxNormalRedirectsChecks = val; - browser.storage.sync.set({ searxNormalRedirectsChecks }) + browser.storage.local.set({ searxNormalRedirectsChecks }) console.log("searxNormalRedirectsChecks: ", val) } @@ -109,7 +109,7 @@ let searxTorRedirectsChecks; const getSearxTorRedirectsChecks = () => searxTorRedirectsChecks; function setSearxTorRedirectsChecks(val) { searxTorRedirectsChecks = val; - browser.storage.sync.set({ searxTorRedirectsChecks }) + browser.storage.local.set({ searxTorRedirectsChecks }) console.log("searxTorRedirectsChecks: ", val) } @@ -117,7 +117,7 @@ let searxNormalCustomRedirects = []; const getSearxNormalCustomRedirects = () => searxNormalCustomRedirects; function setSearxNormalCustomRedirects(val) { searxNormalCustomRedirects = val; - browser.storage.sync.set({ searxNormalCustomRedirects }) + browser.storage.local.set({ searxNormalCustomRedirects }) console.log("searxNormalCustomRedirects: ", val) } @@ -125,7 +125,7 @@ let searxTorCustomRedirects = []; const getSearxTorCustomRedirects = () => searxTorCustomRedirects; function setSearxTorCustomRedirects(val) { searxTorCustomRedirects = val; - browser.storage.sync.set({ searxTorCustomRedirects }) + browser.storage.local.set({ searxTorCustomRedirects }) console.log("searxTorCustomRedirects: ", val) } @@ -133,7 +133,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableSearch: disable }) + browser.storage.local.set({ disableSearch: disable }) console.log("disableSearch: ", disable) } @@ -141,7 +141,7 @@ let frontend; const getFrontend = () => frontend; function setFrontend(val) { frontend = val; - browser.storage.sync.set({ searchFrontend: frontend }) + browser.storage.local.set({ searchFrontend: frontend }) console.log("searchFrontend: ", frontend) }; @@ -149,7 +149,7 @@ let protocol; const getprotocol = () => protocol; function setProtocol(val) { protocol = val; - browser.storage.sync.set({ searchProtocol: val }) + browser.storage.local.set({ searchProtocol: val }) console.log("searchProtocol: ", val) } @@ -190,7 +190,7 @@ async function init() { return new Promise((resolve) => { fetch('/instances/data.json').then(response => response.text()).then(data => { let dataJson = JSON.parse(data); - browser.storage.sync.get( + browser.storage.local.get( [ "disableSearch", "searchFrontend", diff --git a/src/assets/javascripts/helpers/tiktok.js b/src/assets/javascripts/helpers/tiktok.js index 7ac52560..1ad35be9 100644 --- a/src/assets/javascripts/helpers/tiktok.js +++ b/src/assets/javascripts/helpers/tiktok.js @@ -25,7 +25,7 @@ const getCustomRedirects = function () { function setRedirects(val) { redirects.proxiTok = val; - browser.storage.sync.set({ tiktokRedirects: redirects }) + browser.storage.local.set({ tiktokRedirects: redirects }) console.log("tiktokRedirects: ", val) for (const item of proxiTokNormalRedirectsChecks) if (!redirects.proxiTok.normal.includes(item)) { @@ -39,7 +39,7 @@ let proxiTokNormalRedirectsChecks; const getProxiTokNormalRedirectsChecks = () => proxiTokNormalRedirectsChecks; function setProxiTokNormalRedirectsChecks(val) { proxiTokNormalRedirectsChecks = val; - browser.storage.sync.set({ proxiTokNormalRedirectsChecks }) + browser.storage.local.set({ proxiTokNormalRedirectsChecks }) console.log("proxiTokNormalRedirectsChecks: ", val) } @@ -47,7 +47,7 @@ let proxiTokNormalCustomRedirects = []; const getProxiTokNormalCustomRedirects = () => proxiTokNormalCustomRedirects; function setProxiTokNormalCustomRedirects(val) { proxiTokNormalCustomRedirects = val; - browser.storage.sync.set({ proxiTokNormalCustomRedirects }) + browser.storage.local.set({ proxiTokNormalCustomRedirects }) console.log("proxiTokNormalCustomRedirects: ", val) } @@ -55,7 +55,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableTiktok: disable }) + browser.storage.local.set({ disableTiktok: disable }) } function isTiktok(url, initiator) { @@ -81,7 +81,7 @@ function redirect(url, type) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( [ "disableTiktok", "tiktokRedirects", diff --git a/src/assets/javascripts/helpers/translate.js b/src/assets/javascripts/helpers/translate.js index 5be80266..18d6ff57 100644 --- a/src/assets/javascripts/helpers/translate.js +++ b/src/assets/javascripts/helpers/translate.js @@ -52,7 +52,7 @@ const getCustomRedirects = function () { function setSimplyTranslateRedirects(val) { redirects.simplyTranslate = val; - browser.storage.sync.set({ translateRedirects: redirects }) + browser.storage.local.set({ translateRedirects: redirects }) console.log("simplyTranslateRedirects:", val) for (const item of simplyTranslateNormalRedirectsChecks) if (!redirects.simplyTranslate.normal.includes(item)) { @@ -66,7 +66,7 @@ let simplyTranslateNormalRedirectsChecks; const getSimplyTranslateNormalRedirectsChecks = () => simplyTranslateNormalRedirectsChecks; function setSimplyTranslateNormalRedirectsChecks(val) { simplyTranslateNormalRedirectsChecks = val; - browser.storage.sync.set({ simplyTranslateNormalRedirectsChecks }) + browser.storage.local.set({ simplyTranslateNormalRedirectsChecks }) console.log("simplyTranslateNormalRedirectsChecks: ", val) } @@ -74,13 +74,13 @@ let simplyTranslateNormalCustomRedirects = []; const getSimplyTranslateNormalCustomRedirects = () => simplyTranslateNormalCustomRedirects; function setSimplyTranslateNormalCustomRedirects(val) { simplyTranslateNormalCustomRedirects = val; - browser.storage.sync.set({ simplyTranslateNormalCustomRedirects }) + browser.storage.local.set({ simplyTranslateNormalCustomRedirects }) console.log("simplyTranslateNormalCustomRedirects: ", val) } function setLingvaRedirects(val) { redirects.lingva = val; - browser.storage.sync.set({ translateRedirects: redirects }) + browser.storage.local.set({ translateRedirects: redirects }) console.log("lingvaRedirects:", val) for (const item of lingvaNormalRedirectsChecks) if (!redirects.lingva.normal.includes(item)) { @@ -94,7 +94,7 @@ let lingvaNormalRedirectsChecks; const getLingvaNormalRedirectsChecks = () => lingvaNormalRedirectsChecks; function setLingvaNormalRedirectsChecks(val) { lingvaNormalRedirectsChecks = val; - browser.storage.sync.set({ lingvaNormalRedirectsChecks }) + browser.storage.local.set({ lingvaNormalRedirectsChecks }) console.log("lingvaNormalRedirectsChecks: ", val) } @@ -102,7 +102,7 @@ let lingvaNormalCustomRedirects = []; const getLingvaNormalCustomRedirects = () => lingvaNormalCustomRedirects; function setLingvaNormalCustomRedirects(val) { lingvaNormalCustomRedirects = val; - browser.storage.sync.set({ lingvaNormalCustomRedirects }) + browser.storage.local.set({ lingvaNormalCustomRedirects }) console.log("lingvaNormalCustomRedirects: ", val) } @@ -110,7 +110,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ translateDisable: disable }) + browser.storage.local.set({ translateDisable: disable }) console.log("disable: ", disable) } @@ -118,7 +118,7 @@ let frontend; const getFrontend = () => frontend; function setFrontend(val) { frontend = val; - browser.storage.sync.set({ translateFrontend: frontend }) + browser.storage.local.set({ translateFrontend: frontend }) console.log("translateFrontend: ", frontend) } @@ -126,7 +126,7 @@ let from; const getFrom = () => from; function setFrom(val) { from = val; - browser.storage.sync.set({ translateFrom: from }) + browser.storage.local.set({ translateFrom: from }) console.log("from: ", from) } @@ -134,7 +134,7 @@ let to; const getTo = () => to; function setTo(val) { to = val; - browser.storage.sync.set({ translateTo: to }) + browser.storage.local.set({ translateTo: to }) console.log("to: ", to) } @@ -175,7 +175,7 @@ function redirect(url) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( [ "translateDisable", "translateFrontend", diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/helpers/twitter.js index 520ca842..4e0c4845 100644 --- a/src/assets/javascripts/helpers/twitter.js +++ b/src/assets/javascripts/helpers/twitter.js @@ -30,7 +30,7 @@ function getCustomRedirects() { function setRedirects(val) { redirects.nitter = val; - browser.storage.sync.set({ twitterRedirects: redirects }) + browser.storage.local.set({ twitterRedirects: redirects }) console.log("twitterRedirects:", val) for (const item of nitterNormalRedirectsChecks) if (!redirects.nitter.normal.includes(item)) { @@ -51,7 +51,7 @@ let nitterNormalRedirectsChecks; const getNitterNormalRedirectsChecks = () => nitterNormalRedirectsChecks; function setNitterNormalRedirectsChecks(val) { nitterNormalRedirectsChecks = val; - browser.storage.sync.set({ nitterNormalRedirectsChecks }) + browser.storage.local.set({ nitterNormalRedirectsChecks }) console.log("nitterNormalRedirectsChecks: ", val) } @@ -59,7 +59,7 @@ let nitterNormalCustomRedirects = []; const getNitterNormalCustomRedirects = () => nitterNormalCustomRedirects; function setNitterNormalCustomRedirects(val) { nitterNormalCustomRedirects = val; - browser.storage.sync.set({ nitterNormalCustomRedirects }) + browser.storage.local.set({ nitterNormalCustomRedirects }) console.log("nitterNormalCustomRedirects: ", val) } @@ -67,7 +67,7 @@ let nitterTorRedirectsChecks; const getNitterTorRedirectsChecks = () => nitterTorRedirectsChecks; function setNitterTorRedirectsChecks(val) { nitterTorRedirectsChecks = val; - browser.storage.sync.set({ nitterTorRedirectsChecks }) + browser.storage.local.set({ nitterTorRedirectsChecks }) console.log("nitterTorRedirectsChecks: ", val) } @@ -75,7 +75,7 @@ let nitterTorCustomRedirects = []; const getNitterTorCustomRedirects = () => nitterTorCustomRedirects; function setNitterTorCustomRedirects(val) { nitterTorCustomRedirects = val; - browser.storage.sync.set({ nitterTorCustomRedirects }) + browser.storage.local.set({ nitterTorCustomRedirects }) console.log("nitterTorCustomRedirects: ", val) } @@ -84,14 +84,14 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableTwitter: disable }) + browser.storage.local.set({ disableTwitter: disable }) } let protocol; const getprotocol = () => protocol; function setProtocol(val) { protocol = val; - browser.storage.sync.set({ nitterProtocol: val }) + browser.storage.local.set({ nitterProtocol: val }) console.log("nitterProtocol: ", val) } @@ -136,7 +136,7 @@ async function init() { return new Promise((resolve) => { fetch('/instances/data.json').then(response => response.text()).then(data => { let dataJson = JSON.parse(data); - browser.storage.sync.get( + browser.storage.local.get( [ "disableTwitter", "twitterRedirects", diff --git a/src/assets/javascripts/helpers/wikipedia.js b/src/assets/javascripts/helpers/wikipedia.js index 218f4b27..fc777bee 100644 --- a/src/assets/javascripts/helpers/wikipedia.js +++ b/src/assets/javascripts/helpers/wikipedia.js @@ -27,7 +27,7 @@ const getCustomRedirects = function () { }; function setRedirects(val) { redirects.wikiless = val; - browser.storage.sync.set({ wikipediaRedirects: redirects }) + browser.storage.local.set({ wikipediaRedirects: redirects }) console.log("wikipediaRedirects: ", val) for (const item of wikilessNormalRedirectsChecks) if (!redirects.wikiless.normal.includes(item)) { @@ -41,14 +41,14 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableWikipedia: disable }) + browser.storage.local.set({ disableWikipedia: disable }) } let wikilessNormalRedirectsChecks; const getWikilessNormalRedirectsChecks = () => wikilessNormalRedirectsChecks; function setWikilessNormalRedirectsChecks(val) { wikilessNormalRedirectsChecks = val; - browser.storage.sync.set({ wikilessNormalRedirectsChecks }) + browser.storage.local.set({ wikilessNormalRedirectsChecks }) console.log("wikilessNormalRedirectsChecks: ", val) } @@ -56,7 +56,7 @@ let wikilessNormalCustomRedirects = []; const getWikilessNormalCustomRedirects = () => wikilessNormalCustomRedirects; function setWikilessNormalCustomRedirects(val) { wikilessNormalCustomRedirects = val; - browser.storage.sync.set({ wikilessNormalCustomRedirects }) + browser.storage.local.set({ wikilessNormalCustomRedirects }) console.log("wikilessNormalCustomRedirects: ", val) } @@ -100,7 +100,7 @@ function redirect(url) { async function init() { return new Promise((resolve) => { - browser.storage.sync.get( + browser.storage.local.get( [ "disableWikipedia", "wikipediaRedirects", diff --git a/src/assets/javascripts/helpers/youtube/invidious-cookies.js b/src/assets/javascripts/helpers/youtube/invidious-cookies.js index cefbddd8..ac11ebcc 100644 --- a/src/assets/javascripts/helpers/youtube/invidious-cookies.js +++ b/src/assets/javascripts/helpers/youtube/invidious-cookies.js @@ -10,7 +10,7 @@ function getCookie() { return {}; } -browser.storage.sync.get( +browser.storage.local.get( [ "invidiousAlwaysProxy", "invidiousSubtitles", diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js index d5dfb032..70148f7d 100644 --- a/src/assets/javascripts/helpers/youtube/youtube.js +++ b/src/assets/javascripts/helpers/youtube/youtube.js @@ -49,7 +49,7 @@ function getCustomRedirects() { function setInvidiousRedirects(val) { redirects.invidious = val; - browser.storage.sync.set({ youtubeRedirects: redirects }) + browser.storage.local.set({ youtubeRedirects: redirects }) console.log("invidiousRedirects: ", val) } @@ -57,7 +57,7 @@ let invidiousNormalRedirectsChecks; const getInvidiousNormalRedirectsChecks = () => invidiousNormalRedirectsChecks; function setInvidiousNormalRedirectsChecks(val) { invidiousNormalRedirectsChecks = val; - browser.storage.sync.set({ invidiousNormalRedirectsChecks }) + browser.storage.local.set({ invidiousNormalRedirectsChecks }) console.log("invidiousNormalRedirectsChecks: ", val) } @@ -65,7 +65,7 @@ let invidiousNormalCustomRedirects = []; const getInvidiousNormalCustomRedirects = () => invidiousNormalCustomRedirects; function setInvidiousNormalCustomRedirects(val) { invidiousNormalCustomRedirects = val; - browser.storage.sync.set({ invidiousNormalCustomRedirects }) + browser.storage.local.set({ invidiousNormalCustomRedirects }) console.log("invidiousNormalCustomRedirects: ", val) } @@ -74,7 +74,7 @@ let invidiousTorRedirectsChecks; const getInvidiousTorRedirectsChecks = () => invidiousTorRedirectsChecks; function setInvidiousTorRedirectsChecks(val) { invidiousTorRedirectsChecks = val; - browser.storage.sync.set({ invidiousTorRedirectsChecks }) + browser.storage.local.set({ invidiousTorRedirectsChecks }) console.log("invidiousTorRedirectsChecks: ", val) } @@ -82,7 +82,7 @@ let invidiousTorCustomRedirects = []; const getInvidiousTorCustomRedirects = () => invidiousTorCustomRedirects; function setInvidiousTorCustomRedirects(val) { invidiousTorCustomRedirects = val; - browser.storage.sync.set({ invidiousTorCustomRedirects }) + browser.storage.local.set({ invidiousTorCustomRedirects }) console.log("invidiousTorCustomRedirects: ", val) } @@ -91,7 +91,7 @@ let pipedNormalRedirectsChecks; const getPipedNormalRedirectsChecks = () => pipedNormalRedirectsChecks; function setPipedNormalRedirectsChecks(val) { pipedNormalRedirectsChecks = val; - browser.storage.sync.set({ pipedNormalRedirectsChecks }) + browser.storage.local.set({ pipedNormalRedirectsChecks }) console.log("pipedNormalRedirectsChecks: ", val) } @@ -99,7 +99,7 @@ let pipedNormalCustomRedirects = []; const getPipedNormalCustomRedirects = () => pipedNormalCustomRedirects; function setPipedNormalCustomRedirects(val) { pipedNormalCustomRedirects = val; - browser.storage.sync.set({ pipedNormalCustomRedirects }) + browser.storage.local.set({ pipedNormalCustomRedirects }) console.log("pipedNormalCustomRedirects: ", val) } @@ -108,7 +108,7 @@ let pipedTorRedirectsChecks; const getPipedTorRedirectsChecks = () => pipedTorRedirectsChecks; function setPipedTorRedirectsChecks(val) { pipedTorRedirectsChecks = val; - browser.storage.sync.set({ pipedTorRedirectsChecks }) + browser.storage.local.set({ pipedTorRedirectsChecks }) console.log("pipedTorRedirectsChecks: ", val) } @@ -116,13 +116,13 @@ let pipedTorCustomRedirects = []; const getPipedTorCustomRedirects = () => pipedTorCustomRedirects; function setPipedTorCustomRedirects(val) { pipedTorCustomRedirects = val; - browser.storage.sync.set({ pipedTorCustomRedirects }) + browser.storage.local.set({ pipedTorCustomRedirects }) console.log("pipedTorCustomRedirects: ", val) } function setPipedRedirects(val) { redirects.piped = val; - browser.storage.sync.set({ youtubeRedirects: redirects }) + browser.storage.local.set({ youtubeRedirects: redirects }) console.log("pipedRedirects: ", val) } @@ -130,7 +130,7 @@ let disable; const getDisable = () => disable; function setDisable(val) { disable = val; - browser.storage.sync.set({ disableYoutube: disable }) + browser.storage.local.set({ disableYoutube: disable }) console.log("disableYoutube: ", disable) } @@ -139,14 +139,14 @@ let protocol; const getprotocol = () => protocol; function setProtocol(val) { protocol = val; - browser.storage.sync.set({ youtubeProtocol: val }) + browser.storage.local.set({ youtubeProtocol: val }) console.log("youtubeProtocol: ", val) } let invidiousAlwaysProxy; function setInvidiousAlwaysProxy(val) { invidiousAlwaysProxy = val; - browser.storage.sync.set({ invidiousAlwaysProxy }) + browser.storage.local.set({ invidiousAlwaysProxy }) console.log("invidiousAlwaysProxy: ", invidiousAlwaysProxy); } const getInvidiousAlwaysProxy = () => invidiousAlwaysProxy; @@ -154,7 +154,7 @@ const getInvidiousAlwaysProxy = () => invidiousAlwaysProxy; let OnlyEmbeddedVideo; function setOnlyEmbeddedVideo(val) { OnlyEmbeddedVideo = val; - browser.storage.sync.set({ OnlyEmbeddedVideo }) + browser.storage.local.set({ OnlyEmbeddedVideo }) console.log("OnlyEmbeddedVideo: ", OnlyEmbeddedVideo) } const getOnlyEmbeddedVideo = () => OnlyEmbeddedVideo; @@ -162,7 +162,7 @@ const getOnlyEmbeddedVideo = () => OnlyEmbeddedVideo; let invidiousVideoQuality; function setInvidiousVideoQuality(val) { invidiousVideoQuality = val; - browser.storage.sync.set({ invidiousVideoQuality }) + browser.storage.local.set({ invidiousVideoQuality }) console.log("invidiousVideoQuality: ", invidiousVideoQuality) } const getInvidiousVideoQuality = () => invidiousVideoQuality; @@ -171,7 +171,7 @@ let theme; const getTheme = () => theme; function setTheme(val) { theme = val; - browser.storage.sync.set({ youtubeTheme: theme }) + browser.storage.local.set({ youtubeTheme: theme }) console.log("theme: ", theme) } @@ -179,7 +179,7 @@ let volume; const getVolume = () => volume; function setVolume(val) { volume = val; - browser.storage.sync.set({ youtubeVolume: volume }) + browser.storage.local.set({ youtubeVolume: volume }) console.log("youtubeVolume: ", volume) } @@ -187,7 +187,7 @@ let invidiousPlayerStyle; const getInvidiousPlayerStyle = () => invidiousPlayerStyle; function setInvidiousPlayerStyle(val) { invidiousPlayerStyle = val; - browser.storage.sync.set({ invidiousPlayerStyle }) + browser.storage.local.set({ invidiousPlayerStyle }) console.log("invidiousPlayerStyle: ", invidiousPlayerStyle) } @@ -195,7 +195,7 @@ let invidiousSubtitles; let getInvidiousSubtitles = () => invidiousSubtitles; function setInvidiousSubtitles(val) { invidiousSubtitles = val; - browser.storage.sync.set({ invidiousSubtitles }) + browser.storage.local.set({ invidiousSubtitles }) console.log("invidiousSubtitles: ", invidiousSubtitles) } @@ -203,7 +203,7 @@ let autoplay; const getAutoplay = () => autoplay; function setAutoplay(val) { autoplay = val; - browser.storage.sync.set({ youtubeAutoplay: autoplay }) + browser.storage.local.set({ youtubeAutoplay: autoplay }) console.log("autoplay: ", autoplay) } @@ -211,7 +211,7 @@ let frontend; const getFrontend = () => frontend; function setFrontend(val) { frontend = val; - browser.storage.sync.set({ youtubeFrontend: val }) + browser.storage.local.set({ youtubeFrontend: val }) console.log("youtubeFrontend: ", val) } @@ -219,7 +219,7 @@ let freetubeFrontend; const getFreetubeFrontend = () => freetubeFrontend; function setFreetubeFrontend(val) { freetubeFrontend = val; - browser.storage.sync.set({ freetubeFrontend }) + browser.storage.local.set({ freetubeFrontend }) console.log("freetubeFrontend: ", freetubeFrontend) } @@ -227,7 +227,7 @@ let persistInvidiousPrefs; const getPersistInvidiousPrefs = () => persistInvidiousPrefs; function setPersistInvidiousPrefs(val) { persistInvidiousPrefs = val; - browser.storage.sync.set({ persistInvidiousPrefs }) + browser.storage.local.set({ persistInvidiousPrefs }) console.log("persistInvidiousPrefs: ", persistInvidiousPrefs) } @@ -235,7 +235,7 @@ let alwaysusePreferred; const getAlwaysusePreferred = () => alwaysusePreferred; function setAlwaysusePreferred(val) { alwaysusePreferred = val; - browser.storage.sync.set({ alwaysusePreferred }) + browser.storage.local.set({ alwaysusePreferred }) console.log("alwaysusePreferred: ", alwaysusePreferred) } @@ -476,7 +476,7 @@ async function init() { return new Promise((resolve) => { fetch('/instances/data.json').then(response => response.text()).then(data => { let dataJson = JSON.parse(data); - browser.storage.sync.get( + browser.storage.local.get( [ "invidiousAlwaysProxy", "invidiousVideoQuality", diff --git a/src/assets/javascripts/remove-twitter-sw.js b/src/assets/javascripts/remove-twitter-sw.js index 13e8ee0b..2a4bb46a 100644 --- a/src/assets/javascripts/remove-twitter-sw.js +++ b/src/assets/javascripts/remove-twitter-sw.js @@ -34,7 +34,7 @@ Promise.all([ return `${nitterInstance}${url.pathname}${url.search}`; } - browser.storage.sync.get( + browser.storage.local.get( [ "nitterInstance", "disableTwitter", @@ -44,7 +44,7 @@ Promise.all([ ], (result) => { redirectBypassFlag = result.redirectBypassFlag; - browser.storage.sync.set({ redirectBypassFlag: false }); + browser.storage.local.set({ redirectBypassFlag: false }); if (!result.removeTwitterSW) { disableTwitter = result.disableTwitter; nitterInstance = result.nitterInstance ?? commonHelper.default.getRandomInstance(twitterHelper.default.redirects); diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js index e6642bab..7fa85a3a 100644 --- a/src/pages/options/general/general.js +++ b/src/pages/options/general/general.js @@ -7,7 +7,7 @@ import exceptionsHelper from "../../../assets/javascripts/helpers/exceptions.js" let themeElement = document.getElementById("theme"); -browser.storage.sync.get( +browser.storage.local.get( ["theme"], (result) => { themeElement.value = result.theme || ""; @@ -17,7 +17,7 @@ browser.storage.sync.get( themeElement.addEventListener("change", (event) => { const value = event.target.options[theme.selectedIndex].value; - browser.storage.sync.set({ theme: value }); + browser.storage.local.set({ theme: value }); }); document.querySelector("#update-instances").addEventListener("click", () => { diff --git a/src/pages/options/init.js b/src/pages/options/init.js index cabef5b2..6b196bfa 100644 --- a/src/pages/options/init.js +++ b/src/pages/options/init.js @@ -1,7 +1,7 @@ window.browser = window.browser || window.chrome; function changeTheme() { - browser.storage.sync.get("theme", (result) => { + browser.storage.local.get("theme", (result) => { switch (result.theme) { case "dark-theme": document.body.classList.add("dark-theme");