From f56733ca03e46d3bf154b947db53c83f80b8057d Mon Sep 17 00:00:00 2001 From: BobIsMyManager Date: Sat, 9 Apr 2022 09:19:13 +0000 Subject: Automatic send instance fetching (#174) --- src/assets/javascripts/helpers/common.js | 4 ++++ src/assets/javascripts/helpers/general.js | 2 +- src/assets/javascripts/helpers/sendTargets.js | 22 ++++------------------ 3 files changed, 9 insertions(+), 19 deletions(-) (limited to 'src/assets') diff --git a/src/assets/javascripts/helpers/common.js b/src/assets/javascripts/helpers/common.js index 678b9dd5..50180497 100644 --- a/src/assets/javascripts/helpers/common.js +++ b/src/assets/javascripts/helpers/common.js @@ -8,6 +8,7 @@ import searchHelper from "./search.js"; import translateHelper from "./translate/translate.js"; import wikipediaHelper from "./wikipedia.js"; import localise from '../localise.js' +import sendTargetsHelper from "./sendTargets.js"; function getRandomInstance(instances) { return instances[~~(instances.length * Math.random())]; @@ -22,6 +23,7 @@ async function wholeInit() { await searchHelper.init(); await wikipediaHelper.init(); await mediumHelper.init(); + await sendTargetsHelper.init(); } async function updateInstances() { @@ -55,6 +57,8 @@ async function updateInstances() { mediumHelper.setRedirects(instances.scribe); + sendTargetsHelper.setRedirects(instances.send); + console.info("Successfully updated Instances"); return true; } diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js index 67c8b57b..1ee6bcf5 100644 --- a/src/assets/javascripts/helpers/general.js +++ b/src/assets/javascripts/helpers/general.js @@ -147,4 +147,4 @@ export default { isException, init, -} \ No newline at end of file +} diff --git a/src/assets/javascripts/helpers/sendTargets.js b/src/assets/javascripts/helpers/sendTargets.js index 8cfca7bb..5b6d4201 100644 --- a/src/assets/javascripts/helpers/sendTargets.js +++ b/src/assets/javascripts/helpers/sendTargets.js @@ -10,23 +10,7 @@ const targets = [ let redirects = { "send": { - "normal": [ - "https://send.silkky.cloud", - "https://send.turingpoint.de", - "https://send.ephemeral.land", - "https://send.monks.tools", - "https://send.jeugdhulp.be", - "https://send.aurorabilisim.com", - "https://nhanh.cloud", - "https://send.datahoarder.dev", - "https://send.navennec.net", - "https://fileupload.ggc-project.de", - "https://drop.chapril.org", - "https://files.psu.ru", - "https://send.portailpro.net", - "https://bytefile.de", - "https://transfer.acted.org ", - ], + "normal": [], "tor": [] } } @@ -35,7 +19,8 @@ const getRedirects = () => redirects; const getCustomRedirects = function () { return { "send": { - "normal": [...sendNormalRedirectsChecks, ...sendNormalCustomRedirects] + "normal": [...sendNormalRedirectsChecks, ...sendNormalCustomRedirects], + "tor": [...sendTorRedirectsChecks, ...sendTorCustomRedirects] }, }; }; @@ -173,6 +158,7 @@ async function init() { protocol = r.sendTargetsProtocol ?? "normal"; + //redirects.send = dataJson.send; if (r.sendTargetsRedirects) redirects = r.sendTargetsRedirects; sendNormalRedirectsChecks = r.sendNormalRedirectsChecks ?? [...redirects.send.normal]; -- cgit 1.4.1