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

Changes:

Browse Source 
Fixed instance updating

Made the instance updater remove frontends & networks not in the current version

Fixed CI linter
This commit is contained in:
Hygna 2022-10-23 11:33:18 +01:00
parent 1dfd4f8764
commit eb3794cdcb
No known key found for this signature in database
4 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.woodpecker.yml
View File

@ -26,7 +26,7 @@ pipeline:
event: [push, pull_request]
path:
exclude: ["src/instances/**"]
include: ["src/"]
include: ["src/**"]
commands:
- npm i
- npx web-ext lint --source-dir ./src/

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

@ -566,38 +566,58 @@ function unifyPreferences(url, tabId) {
})
}
async function setRedirects(redirects) {
fetch("/config/config.json")
.then(response => response.text())
.then(configData => {
//browser.storage.local.get(["options", "blacklists"], async r => {
//const options = r.options
const config = JSON.parse(configData)
let targets = {}
for (const service in config.services) {
if (config.services[service].targets == "datajson") {
targets[service] = redirects[service]
}
/*
for (const frontend in config.services[service].frontends) {
if (config.services[service].frontends[frontend].instanceList) {
for (const network in config.networks) {
options[frontend][network].enabled = redirects[frontend][network]
}
for (const blacklist in r.blacklists) {
for (const instance of blacklist) {
let i = options[frontend].clearnet.enabled.indexOf(instance)
if (i > -1) options[frontend].clearnet.enabled.splice(i, 1)
function setRedirects(passedRedirects) {
return new Promise(resolve => {
fetch("/config/config.json")
.then(response => response.text())
.then(configData => {
browser.storage.local.get(/* [ */ "options" /* , "blacklists"] */, async r => {
let redirects = passedRedirects
let options = r.options
const config = JSON.parse(configData)
let targets = {}
for (const service in config.services) {
if (config.services[service].targets == "datajson") {
targets[service] = redirects[service]
delete redirects[service]
}
for (const frontend in config.services[service].frontends) {
if (config.services[service].frontends[frontend].instanceList) {
for (const network in config.networks) {
for (const instance of options[frontend][network].enabled) {
let i = redirects[frontend][network].indexOf(instance)
if (i < 0) options[frontend][network].enabled.splice(i, 1)
}
}
}
}
/*
for (const frontend in config.services[service].frontends) {
if (config.services[service].frontends[frontend].instanceList) {
for (const network in config.networks) {
options[frontend][network].enabled = redirects[frontend][network]
}
for (const blacklist in r.blacklists) {
for (const instance of blacklist) {
let i = options[frontend].clearnet.enabled.indexOf(instance)
if (i > -1) options[frontend].clearnet.enabled.splice(i, 1)
}
}
}
}
*/
// The above will be implemented with https://github.com/libredirect/libredirect/issues/334
}
*/
// The above will be implemented with https://github.com/libredirect/libredirect/issues/334
}
browser.storage.local.set({ redirects, targets /*, options*/ })
//})
})
for (const frontend in redirects) {
let exists = false
for (const service in config.services) if (config.services[service].frontends[frontend]) exists = true
if (!exists) delete redirects[frontend]
else for (const network in redirects[frontend]) if (!config.networks[network]) delete redirects[frontend][network]
}
browser.storage.local.set({ redirects, targets, options }, () => resolve())
})
})
})
}
function initDefaults() {
@ -617,7 +637,10 @@ function initDefaults() {
const latency = {}
for (const service in config.services) {
options[service] = {}
if (config.services[service].targets == "datajson") targets[service] = redirects[service]
if (config.services[service].targets == "datajson") {
targets[service] = redirects[service]
delete redirects[service]
}
for (const defaultOption in config.services[service].options) options[service][defaultOption] = config.services[service].options[defaultOption]
for (const frontend in config.services[service].frontends) {
if (config.services[service].frontends[frontend].instanceList) {
@ -729,7 +752,10 @@ function processUpdate() {
let config = JSON.parse(configData)
for (const service in config.services) {
if (!options[service]) options[service] = {}
if (config.services[service].targets == "datajson") targets[service] = redirects[service]
if (config.services[service].targets == "datajson") {
targets[service] = redirects[service]
delete redirects[service]
}
for (const defaultOption in config.services[service].options) {
if (options[service][defaultOption] === undefined) {
options[service][defaultOption] = config.services[service].options[defaultOption]

1
src/assets/javascripts/utils.js
View File

@ -47,7 +47,6 @@ function updateInstances() {
const instances = JSON.parse(http.responseText)
await servicesHelper.setRedirects(instances)
await servicesHelper.processEnabledInstanceList()
console.info("Successfully updated Instances")
resolve(true)

2
src/config/config.json
View File

@ -253,7 +253,7 @@
"instanceList": true
}
},
"targets": ["^https?:\\/{2}(www\\.|old\\.|np\\.|new\\.|amp\\.|)reddit\\.com(?=\\/u(ser)?\\/|\\/r\\/|\\/?$)", "^https?:\\/{2}(i\\.|(external-)?preview\\.|)redd\\.it"],
"targets": ["^https?:\\/{2}(www\\.|old\\.|np\\.|new\\.|amp\\.|)reddit\\.com(?=\\/u(ser)?\\/|\\/r\\/|\\/?$)", "^https?:\\/{2}(i|(external-)?preview)\\.redd\\.it"],
"name": "Reddit",
"options": {
"enabled": true,