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

Fixed PeerTube redirections https://github.com/libredirect/libredirect/issues/545

This commit is contained in:
ManeraKai 2022-12-08 12:47:07 +03:00
parent 79a768d742
commit ee4ee90e1a
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,9 @@ function all(service, frontend, options, config, redirects) {
function regexArray(service, url, config, frontend) {
if (config.services[service].targets == "datajson") {
if (targets[service].startsWith(utils.protocolHost(url))) return true
for (const instance of targets[service]) {
if (instance.startsWith(utils.protocolHost(url))) return true
}
} else {
const targetList = config.services[service].targets
if (frontend && config.services[service].frontends[frontend].excludeTargets)
@ -443,8 +445,10 @@ function redirect(url, type, initiator, forceRedirection) {
else return `${randomInstance}${url.pathname}${url.search}&teddit_proxy=${url.hostname}`
}
return `${randomInstance}${url.pathname}${url.search}`
case "simpleertube":
return `${randomInstance}/${url.hostname}${url.pathname}${url.search}`
default:
return `${randomInstance}${url.pathname}${url.search}`
return `${randomInstance}${url.pathname}${url.search} `
}
}
@ -506,7 +510,7 @@ function switchInstance(url) {
return
}
const randomInstance = utils.getRandomInstance(instancesList)
const oldUrl = `${oldInstance}${url.pathname}${url.search}`
const oldUrl = `${oldInstance}${url.pathname}${url.search} `
// This is to make instance switching work when the instance depends on the pathname, eg https://darmarit.org/searx
// Doesn't work because of .includes array method, not a top priotiry atm
resolve(oldUrl.replace(oldInstance, randomInstance))