Added Switch Instance to proxiTok & fixed instance fetching for it #326
This commit is contained in:
parent
e7555aa56e
commit
fd844da5e0
|
@ -137,6 +137,32 @@ function reverse(url) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function switchInstance(url) {
|
||||||
|
return new Promise(async resolve => {
|
||||||
|
await init();
|
||||||
|
let protocolHost = utils.protocolHost(url);
|
||||||
|
const all = [
|
||||||
|
...tiktokRedirects.proxiTok.tor,
|
||||||
|
...tiktokRedirects.proxiTok.normal,
|
||||||
|
|
||||||
|
...proxiTokNormalCustomRedirects,
|
||||||
|
...proxiTokTorCustomRedirects,
|
||||||
|
];
|
||||||
|
if (!all.includes(protocolHost)) { resolve(); return; }
|
||||||
|
|
||||||
|
let instancesList;
|
||||||
|
if (tiktokProtocol == 'normal') instancesList = [...proxiTokNormalCustomRedirects, ...proxiTokNormalRedirectsChecks];
|
||||||
|
else if (tiktokProtocol == 'tor') instancesList = [...proxiTokTorCustomRedirects, ...proxiTokTorRedirectsChecks];
|
||||||
|
|
||||||
|
const i = instancesList.indexOf(protocolHost);
|
||||||
|
if (i > -1) instancesList.splice(i, 1);
|
||||||
|
if (instancesList.length === 0) { resolve(); return; }
|
||||||
|
|
||||||
|
const randomInstance = utils.getRandomInstance(instancesList);
|
||||||
|
resolve(`${randomInstance}${url.pathname}${url.search}`);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
function initDefaults() {
|
function initDefaults() {
|
||||||
return new Promise(async resolve => {
|
return new Promise(async resolve => {
|
||||||
fetch('/instances/data.json').then(response => response.text()).then(async data => {
|
fetch('/instances/data.json').then(response => response.text()).then(async data => {
|
||||||
|
@ -163,6 +189,7 @@ export default {
|
||||||
|
|
||||||
redirect,
|
redirect,
|
||||||
reverse,
|
reverse,
|
||||||
|
switchInstance,
|
||||||
|
|
||||||
initProxiTokCookies,
|
initProxiTokCookies,
|
||||||
pasteProxiTokCookies,
|
pasteProxiTokCookies,
|
||||||
|
|
|
@ -443,6 +443,7 @@ function switchInstance(test) {
|
||||||
if (!newUrl) newUrl = await searchHelper.switchInstance(url);
|
if (!newUrl) newUrl = await searchHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await translateHelper.switchInstance(url);
|
if (!newUrl) newUrl = await translateHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await mediumHelper.switchInstance(url);
|
if (!newUrl) newUrl = await mediumHelper.switchInstance(url);
|
||||||
|
if (!newUrl) newUrl = await tiktokHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await sendTargetsHelper.switchInstance(url);
|
if (!newUrl) newUrl = await sendTargetsHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await peertubeHelper.switchInstance(url);
|
if (!newUrl) newUrl = await peertubeHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await lbryHelper.switchInstance(url);
|
if (!newUrl) newUrl = await lbryHelper.switchInstance(url);
|
||||||
|
|
|
@ -11,15 +11,15 @@
|
||||||
"https://tube.cthd.icu",
|
"https://tube.cthd.icu",
|
||||||
"https://yt.artemislena.eu",
|
"https://yt.artemislena.eu",
|
||||||
"https://invidious.flokinet.to",
|
"https://invidious.flokinet.to",
|
||||||
|
"https://invidious.tiekoetter.com",
|
||||||
"https://invidious.lunar.icu",
|
"https://invidious.lunar.icu",
|
||||||
"https://invidious.sethforprivacy.com",
|
"https://invidious.sethforprivacy.com",
|
||||||
"https://invidious.projectsegfau.lt",
|
"https://inv.bp.projectsegfau.lt",
|
||||||
"https://invidious.weblibre.org",
|
"https://invidious.weblibre.org",
|
||||||
"https://invidious.esmailelbob.xyz",
|
"https://invidious.esmailelbob.xyz",
|
||||||
"https://youtube.076.ne.jp",
|
"https://youtube.076.ne.jp",
|
||||||
"https://inv.bp.projectsegfau.lt",
|
"https://invidious.projectsegfau.lt",
|
||||||
"https://invidious.namazso.eu",
|
"https://invidious.namazso.eu"
|
||||||
"https://invidious.tiekoetter.com"
|
|
||||||
],
|
],
|
||||||
"tor": [
|
"tor": [
|
||||||
"http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
|
"http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
|
||||||
|
@ -40,6 +40,7 @@
|
||||||
"https://piped.syncpundit.com",
|
"https://piped.syncpundit.com",
|
||||||
"https://piped.mha.fi",
|
"https://piped.mha.fi",
|
||||||
"https://piped.shimul.me",
|
"https://piped.shimul.me",
|
||||||
|
"https://yt.jae.fi",
|
||||||
"https://piped.mint.lgbt",
|
"https://piped.mint.lgbt",
|
||||||
"https://piped.privacy.com.de"
|
"https://piped.privacy.com.de"
|
||||||
],
|
],
|
||||||
|
@ -50,7 +51,7 @@
|
||||||
"proxiTok": {
|
"proxiTok": {
|
||||||
"normal": [
|
"normal": [
|
||||||
"https://proxitok.herokuapp.com",
|
"https://proxitok.herokuapp.com",
|
||||||
"https://proxitok.pussthecat.org/",
|
"https://proxitok.pussthecat.org",
|
||||||
"https://proxitok.privacydev.net"
|
"https://proxitok.privacydev.net"
|
||||||
],
|
],
|
||||||
"tor": []
|
"tor": []
|
||||||
|
@ -131,7 +132,8 @@
|
||||||
"https://tweet.lambda.dance",
|
"https://tweet.lambda.dance",
|
||||||
"https://nitter.ebnar.xyz",
|
"https://nitter.ebnar.xyz",
|
||||||
"https://nitter.kylrth.com",
|
"https://nitter.kylrth.com",
|
||||||
"https://nitter.oishi-ra.men"
|
"https://nitter.oishi-ra.men",
|
||||||
|
"https://nitter.foss.wtf"
|
||||||
],
|
],
|
||||||
"tor": [
|
"tor": [
|
||||||
"http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
|
"http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
|
||||||
|
@ -368,6 +370,7 @@
|
||||||
],
|
],
|
||||||
"normal": [
|
"normal": [
|
||||||
"https://anon.sx",
|
"https://anon.sx",
|
||||||
|
"https://asowneryt.cloudns.nz",
|
||||||
"https://dynabyte.ca",
|
"https://dynabyte.ca",
|
||||||
"https://jsearch.pw",
|
"https://jsearch.pw",
|
||||||
"https://nibblehole.com",
|
"https://nibblehole.com",
|
||||||
|
@ -386,6 +389,7 @@
|
||||||
"https://searx.josie.lol",
|
"https://searx.josie.lol",
|
||||||
"https://searx.kujonello.cf",
|
"https://searx.kujonello.cf",
|
||||||
"https://searx.mastodontech.de",
|
"https://searx.mastodontech.de",
|
||||||
|
"https://searx.mha.fi",
|
||||||
"https://searx.mxchange.org",
|
"https://searx.mxchange.org",
|
||||||
"https://searx.nakhan.net",
|
"https://searx.nakhan.net",
|
||||||
"https://searx.netzspielplatz.de",
|
"https://searx.netzspielplatz.de",
|
||||||
|
@ -401,7 +405,6 @@
|
||||||
"https://searx.solusar.de",
|
"https://searx.solusar.de",
|
||||||
"https://searx.sp-codes.de",
|
"https://searx.sp-codes.de",
|
||||||
"https://searx.stuehieyr.com",
|
"https://searx.stuehieyr.com",
|
||||||
"https://searx.theanonymouse.xyz",
|
|
||||||
"https://searx.tux.land",
|
"https://searx.tux.land",
|
||||||
"https://searx.tuxcloud.net",
|
"https://searx.tuxcloud.net",
|
||||||
"https://searx.tyil.nl",
|
"https://searx.tyil.nl",
|
||||||
|
@ -431,7 +434,6 @@
|
||||||
],
|
],
|
||||||
"i2p": [],
|
"i2p": [],
|
||||||
"normal": [
|
"normal": [
|
||||||
"https://asowneryt.cloudns.nz",
|
|
||||||
"https://darmarit.org/searx",
|
"https://darmarit.org/searx",
|
||||||
"https://etsi.me",
|
"https://etsi.me",
|
||||||
"https://northboot.xyz",
|
"https://northboot.xyz",
|
||||||
|
@ -449,14 +451,12 @@
|
||||||
"https://search.vojkovic.xyz",
|
"https://search.vojkovic.xyz",
|
||||||
"https://search.zzls.xyz",
|
"https://search.zzls.xyz",
|
||||||
"https://searx.albony.xyz",
|
"https://searx.albony.xyz",
|
||||||
"https://searx.bardia.tech",
|
|
||||||
"https://searx.be",
|
"https://searx.be",
|
||||||
"https://searx.ebnar.xyz",
|
"https://searx.ebnar.xyz",
|
||||||
"https://searx.esmailelbob.xyz",
|
"https://searx.esmailelbob.xyz",
|
||||||
"https://searx.fmac.xyz",
|
"https://searx.fmac.xyz",
|
||||||
"https://searx.gnous.eu",
|
"https://searx.gnous.eu",
|
||||||
"https://searx.loafland.xyz",
|
"https://searx.loafland.xyz",
|
||||||
"https://searx.mha.fi",
|
|
||||||
"https://searx.namejeff.xyz",
|
"https://searx.namejeff.xyz",
|
||||||
"https://searx.orion-hub.fr",
|
"https://searx.orion-hub.fr",
|
||||||
"https://searx.ppeb.me",
|
"https://searx.ppeb.me",
|
||||||
|
@ -464,6 +464,7 @@
|
||||||
"https://searx.prvcy.eu",
|
"https://searx.prvcy.eu",
|
||||||
"https://searx.sev.monster",
|
"https://searx.sev.monster",
|
||||||
"https://searx.tiekoetter.com",
|
"https://searx.tiekoetter.com",
|
||||||
|
"https://searxng.ir",
|
||||||
"https://searxng.zackptg5.com",
|
"https://searxng.zackptg5.com",
|
||||||
"https://serx.ml",
|
"https://serx.ml",
|
||||||
"https://swag.pw",
|
"https://swag.pw",
|
||||||
|
@ -500,19 +501,22 @@
|
||||||
"https://rimgo.lunar.icu",
|
"https://rimgo.lunar.icu",
|
||||||
"https://i.actionsack.com",
|
"https://i.actionsack.com",
|
||||||
"https://rimgo.privacydev.net",
|
"https://rimgo.privacydev.net",
|
||||||
"https://imgur.artemislena.eu"
|
"https://imgur.artemislena.eu",
|
||||||
|
"https://rimgo.vern.cc"
|
||||||
],
|
],
|
||||||
"tor": [
|
"tor": [
|
||||||
"http://l4d4owboqr6xcmd6lf64gbegel62kbudu3x3jnldz2mx6mhn3bsv3zyd.onion",
|
"http://l4d4owboqr6xcmd6lf64gbegel62kbudu3x3jnldz2mx6mhn3bsv3zyd.onion",
|
||||||
"http://jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
|
"http://jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
|
||||||
"http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
|
"http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
|
||||||
"http://be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion"
|
"http://be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion",
|
||||||
|
"http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
|
||||||
],
|
],
|
||||||
"i2p": [
|
"i2p": [
|
||||||
"http://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
|
"http://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"peertube": [
|
"peertube": [
|
||||||
|
"https://watch.thelema.social",
|
||||||
"https://tube.miegl.cz",
|
"https://tube.miegl.cz",
|
||||||
"https://mov.clov.fr",
|
"https://mov.clov.fr",
|
||||||
"https://videomensoif.ynh.fr",
|
"https://videomensoif.ynh.fr",
|
||||||
|
@ -605,7 +609,6 @@
|
||||||
"https://peertube.frontmediatique.fr",
|
"https://peertube.frontmediatique.fr",
|
||||||
"https://peertube.bgzashtita.es",
|
"https://peertube.bgzashtita.es",
|
||||||
"https://tube.genb.de",
|
"https://tube.genb.de",
|
||||||
"https://cosmoscine.org",
|
|
||||||
"https://cliptube.org",
|
"https://cliptube.org",
|
||||||
"https://tube.tr4sk.me",
|
"https://tube.tr4sk.me",
|
||||||
"https://videos.campdarling.com",
|
"https://videos.campdarling.com",
|
||||||
|
@ -629,7 +632,6 @@
|
||||||
"https://pt.k2s.sk",
|
"https://pt.k2s.sk",
|
||||||
"https://gameplay.wtf",
|
"https://gameplay.wtf",
|
||||||
"https://video.cats-home.net",
|
"https://video.cats-home.net",
|
||||||
"https://breeze.tube",
|
|
||||||
"https://peertube.narrativerry.xyz",
|
"https://peertube.narrativerry.xyz",
|
||||||
"https://tube.9minuti.it",
|
"https://tube.9minuti.it",
|
||||||
"https://krdtube.org",
|
"https://krdtube.org",
|
||||||
|
@ -641,8 +643,6 @@
|
||||||
"https://peertube.hackerfraternity.org",
|
"https://peertube.hackerfraternity.org",
|
||||||
"https://openmedia.edunova.it",
|
"https://openmedia.edunova.it",
|
||||||
"https://ocfedtest.hosted.spacebear.ee",
|
"https://ocfedtest.hosted.spacebear.ee",
|
||||||
"https://video.thinkof.name",
|
|
||||||
"https://videos.alexandrebadalo.pt",
|
|
||||||
"https://video.lono.space",
|
"https://video.lono.space",
|
||||||
"https://mirrored.rocks",
|
"https://mirrored.rocks",
|
||||||
"https://videopen.net",
|
"https://videopen.net",
|
||||||
|
@ -1557,6 +1557,9 @@
|
||||||
"https://video.mantlepro.com",
|
"https://video.mantlepro.com",
|
||||||
"https://peertube.musicstudio.pro",
|
"https://peertube.musicstudio.pro",
|
||||||
"https://peertube.we-keys.fr",
|
"https://peertube.we-keys.fr",
|
||||||
"https://artitube.artifaille.fr"
|
"https://artitube.artifaille.fr",
|
||||||
|
"https://peertube.fr",
|
||||||
|
"https://peertube.amicale.net",
|
||||||
|
"https://aperi.tube"
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -109,7 +109,7 @@ def proxitok():
|
||||||
proxiTokList['normal'] = []
|
proxiTokList['normal'] = []
|
||||||
proxiTokList['tor'] = []
|
proxiTokList['tor'] = []
|
||||||
for item in tmp:
|
for item in tmp:
|
||||||
proxiTokList['normal'].append(item)
|
proxiTokList['normal'].append(re.sub(r'/$', '', item))
|
||||||
mightyList['proxiTok'] = proxiTokList
|
mightyList['proxiTok'] = proxiTokList
|
||||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'ProxiTok')
|
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'ProxiTok')
|
||||||
|
|
||||||
|
@ -383,7 +383,7 @@ for k1, v1 in mightyList.items():
|
||||||
for k2, v2 in mightyList[k1].items():
|
for k2, v2 in mightyList[k1].items():
|
||||||
for instance in mightyList[k1][k2]:
|
for instance in mightyList[k1][k2]:
|
||||||
if (not isValid(instance)):
|
if (not isValid(instance)):
|
||||||
mightyList[k1][k2].pop(instance)
|
mightyList[k1][k2].remove(instance)
|
||||||
print("removed " + instance)
|
print("removed " + instance)
|
||||||
else:
|
else:
|
||||||
if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance):
|
if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance):
|
||||||
|
|
|
@ -174,6 +174,7 @@ async function redirectOfflineInstance(url, tabId) {
|
||||||
if (!newUrl) newUrl = await searchHelper.switchInstance(url);
|
if (!newUrl) newUrl = await searchHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await translateHelper.switchInstance(url);
|
if (!newUrl) newUrl = await translateHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await mediumHelper.switchInstance(url);
|
if (!newUrl) newUrl = await mediumHelper.switchInstance(url);
|
||||||
|
if (!newUrl) newUrl = await tiktokHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await imgurHelper.switchInstance(url);
|
if (!newUrl) newUrl = await imgurHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await wikipediaHelper.switchInstance(url);
|
if (!newUrl) newUrl = await wikipediaHelper.switchInstance(url);
|
||||||
if (!newUrl) newUrl = await peertubeHelper.switchInstance(url);
|
if (!newUrl) newUrl = await peertubeHelper.switchInstance(url);
|
||||||
|
|
Loading…
Reference in New Issue