devol/libredirect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed infinite loop #38

Browse Source
This commit is contained in:
ManeraKai 2022-02-16 18:54:13 +03:00
parent b157cc8f27
commit 9f91997833
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/assets/javascripts/helpers/medium.js
View File

@ -40,11 +40,10 @@ function setRedirects(val) {
redirects.scribe = val; redirects.scribe = val;
browser.storage.sync.set({ mediumRedirects: redirects }) browser.storage.sync.set({ mediumRedirects: redirects })
console.log("mediumRedirects: ", val) console.log("mediumRedirects: ", val)
for (const item of scribeRedirectsChecks) for (const item of scribeRedirectsChecks) if (!redirects.scribe.normal.includes(item)) {
if (!redirects.scribe.normal.includes(item)) { var index = scribeRedirectsChecks.indexOf(item);
var index = scribeRedirectsChecks.indexOf(item); if (index !== -1) scribeRedirectsChecks.splice(index, 1);
if (index !== -1) scribeRedirectsChecks.splice(index, 1); }
}
setScribeRedirectsChecks(scribeRedirectsChecks); setScribeRedirectsChecks(scribeRedirectsChecks);
} }

26
src/assets/javascripts/helpers/search.js
View File

@ -136,7 +136,7 @@ let redirects = {
}, },
}; };
const getRedirects = () => redirects; const getRedirects = () => redirects;
const getCustomRedirects = function () { const getCustomRedirects = () => {
return { return {
"searx": { "searx": {
"normal": [...searxRedirectsChecks, ...searxCustomRedirects] "normal": [...searxRedirectsChecks, ...searxCustomRedirects]
@ -151,13 +151,9 @@ function setSearxRedirects(val) {
redirects.searx = val; redirects.searx = val;
browser.storage.sync.set({ searchRedirects: redirects }) browser.storage.sync.set({ searchRedirects: redirects })
console.log("searxRedirects:", val) console.log("searxRedirects:", val)
for (const item of searxRedirectsChecks) { for (const item of searxRedirectsChecks) if (!redirects.searx.normal.includes(item)) {
console.log(item) var index = searxRedirectsChecks.indexOf(item);
if (!redirects.searx.normal.includes(item)) { if (index !== -1) searxRedirectsChecks.splice(index, 1);
var index = searxRedirectsChecks.indexOf(item);
if (index !== -1) searxRedirectsChecks.splice(index, 1);
console.log(`Deleted ${item}`);
}
} }
setSearxRedirectsChecks(searxRedirectsChecks); setSearxRedirectsChecks(searxRedirectsChecks);
} }
@ -166,6 +162,11 @@ function setWhoogleRedirects(val) {
redirects.whoogle = val; redirects.whoogle = val;
browser.storage.sync.set({ searchRedirects: redirects }) browser.storage.sync.set({ searchRedirects: redirects })
console.log("whoogleRedirects:", val) console.log("whoogleRedirects:", val)
for (const item of whoogleRedirectsChecks) if (!redirects.whoogle.normal.includes(item)) {
var index = whoogleRedirectsChecks.indexOf(item);
if (index !== -1) whoogleRedirectsChecks.splice(index, 1);
}
setWhoogleRedirectsChecks(whoogleRedirectsChecks);
} }
let whoogleRedirectsChecks; let whoogleRedirectsChecks;
@ -174,12 +175,6 @@ function setWhoogleRedirectsChecks(val) {
whoogleRedirectsChecks = val; whoogleRedirectsChecks = val;
browser.storage.sync.set({ whoogleRedirectsChecks }) browser.storage.sync.set({ whoogleRedirectsChecks })
console.log("whoogleRedirectsChecks: ", val) console.log("whoogleRedirectsChecks: ", val)
for (const item of whoogleRedirectsChecks)
if (!redirects.whoogle.normal.includes(item)) {
var index = whoogleRedirectsChecks.indexOf(item);
if (index !== -1) whoogleRedirectsChecks.splice(index, 1);
}
setWhoogleRedirectsChecks(whoogleRedirectsChecks);
} }
let whoogleCustomRedirects = []; let whoogleCustomRedirects = [];
@ -251,7 +246,6 @@ function redirect(url) {
return `${randomInstance}${path}?${searchQuery}`; return `${randomInstance}${path}?${searchQuery}`;
} }
async function init() { async function init() {
return new Promise((resolve) => { return new Promise((resolve) => {
browser.storage.sync.get( browser.storage.sync.get(
@ -266,7 +260,7 @@ async function init() {
], ],
(result) => { (result) => {
disable = result.disableSearch ?? false; disable = result.disableSearch ?? false;
frontend = result.searchFrontend ?? 'searx'; frontend = result.searchFrontend ?? 'searx';
if (result.searchRedirects) redirects = result.searchRedirects; if (result.searchRedirects) redirects = result.searchRedirects;