devol
/
libredirect
mirror of https://codeberg.org/LibRedirect/libredirect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small fix

This commit is contained in:
ManeraKai 2022-10-02 18:23:17 +03:00
parent e8a67e9172
commit 84e863c477
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/assets/javascripts/services.js
View File

@ -376,32 +376,41 @@ function redirect(url, type, initiator) {
} }
} }
async function computeService(url, returnFrontend) { function computeService(url, returnFrontend) {
fetch("/config/config.json") return new Promise(resolve => {
.then(response => response.text()) fetch("/config/config.json")
.then(configData => { .then(response => response.text())
const config = JSON.parse(configData) .then(configData => {
browser.storage.local.get(["redirects", "options"], r => { const config = JSON.parse(configData)
const redirects = r.redirects browser.storage.local.get(["redirects", "options"], r => {
const options = r.options const redirects = r.redirects
for (const service in config.services) { const options = r.options
if (regexArray(service, url, config)) { for (const service in config.services) {
if (returnFrontend) return [service, null] if (regexArray(service, url, config)) {
else return service if (returnFrontend) {
} else { resolve([service, null])
for (const frontend in config.services[service].frontends) { } else {
if (all(service, frontend, options, config, redirects).includes(utils.protocolHost(url))) { resolve(service)
if (returnFrontend) { }
return [service, frontend] return
} else return service } else {
for (const frontend in config.services[service].frontends) {
if (all(service, frontend, options, config, redirects).includes(utils.protocolHost(url))) {
if (returnFrontend) {
resolve([service, frontend])
} else {
resolve(service)
}
return
}
} }
} }
} }
} // if (returnFrontend) return [null, null]
// if (returnFrontend) return [null, null] // else return null
// else return null })
}) })
}) })
} }
async function switchInstance(url) { async function switchInstance(url) {

6
src/pages/popup/popup.js
View File

@ -58,7 +58,7 @@ const currentSiteIsFrontend = document.getElementById("current_site_divider")
browser.storage.local.get("options", r => { browser.storage.local.get("options", r => {
browser.tabs.query({ active: true, currentWindow: true }, async tabs => { browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
for (const service in config.services) { for (const service in config.services) {
if (!r.options.popupServices.includes(service)) allSites.getElementsByClassName(service)[0].classList.add("hide") if (!r.options.popupServices.includes(service)) allSites.getElementsByClassName(service)[0].classList.add("hide")
else allSites.getElementsByClassName(service)[0].classList.remove("hide") else allSites.getElementsByClassName(service)[0].classList.remove("hide")
currSite.getElementsByClassName(service)[0].classList.add("hide") currSite.getElementsByClassName(service)[0].classList.add("hide")
@ -68,7 +68,7 @@ browser.storage.local.get("options", r => {
divs[service].toggle.all.checked = r.options[service].enabled divs[service].toggle.all.checked = r.options[service].enabled
divs[service].toggle.current.checked = r.options[service].enabled divs[service].toggle.current.checked = r.options[service].enabled
} }
let url let url
try { try {
url = new URL(tabs[0].url) url = new URL(tabs[0].url)
@ -77,7 +77,7 @@ browser.storage.local.get("options", r => {
document.getElementById("unify_div").style.display = "none" document.getElementById("unify_div").style.display = "none"
return return
} }
let service = await serviceHelper.computeService(url, true) let service = await serviceHelper.computeService(url, true)
let frontend let frontend
if (service) { if (service) {