diff options
| author | ManeraKai <manerakai@protonmail.com> | 2022-12-27 19:21:45 +0300 |
|---|---|---|
| committer | ManeraKai <manerakai@protonmail.com> | 2022-12-27 19:21:45 +0300 |
| commit | c099e1a75ff58b61a1a8db0a027a18f3250af507 (patch) | |
| tree | 2dfd24b6ae24fe51c173fda09d0d056b10005965 /src/assets/javascripts/services.js | |
| parent | Merge branch 'master' of https://github.com/libredirect/libredirect (diff) | |
| download | libredirect-c099e1a75ff58b61a1a8db0a027a18f3250af507.zip | |
Made networks mixed https://github.com/libredirect/libredirect/issues/486
Diffstat (limited to 'src/assets/javascripts/services.js')
| -rw-r--r-- | src/assets/javascripts/services.js | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index d763bf6a..3b58f711 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -89,8 +89,10 @@ function redirect(url, type, initiator, forceRedirection) { if (initiator && all(service, null, options, config, redirects).includes(initiator.origin)) return "BYPASSTAB" if (config.services[service].frontends[frontend].instanceList) { - let instanceList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom] - if (instanceList.length === 0 && options.networkFallback) instanceList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom] + let instanceList = [] + for (const network in options[frontend]) { + instanceList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom]) + } if (instanceList.length === 0) return randomInstance = utils.getRandomInstance(instanceList) } else if (config.services[service].frontends[frontend].singleInstance) randomInstance = config.services[service].frontends[frontend].singleInstance @@ -489,15 +491,17 @@ function switchInstance(url) { for (const service in config.services) { if (!all(service, null, options, config, redirects).includes(protocolHost)) continue - let instancesList + let instancesList = [] if (Object.keys(config.services[service].frontends).length == 1) { const frontend = Object.keys(config.services[service].frontends)[0] - instancesList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom] - if (instancesList.length === 0 && options.networkFallback) instancesList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom] + for (const network in options[frontend]) { + instancesList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom]) + } } else { const frontend = options[service].frontend - instancesList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom] - if (instancesList.length === 0 && options.networkFallback) instancesList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom] + for (const network in options[frontend]) { + instancesList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom]) + } } let oldInstance |