aboutsummaryrefslogtreecommitdiffstats
path: root/src/assets
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/assets/javascripts/helpers/general.js2
-rw-r--r--src/assets/javascripts/helpers/pixiv.js2
-rw-r--r--src/assets/javascripts/helpers/sendTargets.js30
3 files changed, 32 insertions, 2 deletions
diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js
index 1d99dfdd..cc094bd7 100644
--- a/src/assets/javascripts/helpers/general.js
+++ b/src/assets/javascripts/helpers/general.js
@@ -84,7 +84,6 @@ async function init() {
"translate",
"maps",
"wikipedia",
- "medium",
];
autoRedirect = r.autoRedirect ?? false;
@@ -118,6 +117,7 @@ let allPopupFrontends = [
"maps",
"wikipedia",
"medium",
+ "sendTargets"
];
diff --git a/src/assets/javascripts/helpers/pixiv.js b/src/assets/javascripts/helpers/pixiv.js
index 2fedb455..236afa87 100644
--- a/src/assets/javascripts/helpers/pixiv.js
+++ b/src/assets/javascripts/helpers/pixiv.js
@@ -135,7 +135,7 @@ async function init() {
"pixivProtocol"
],
r => {
- disable = r.disablePixiv ?? false;
+ disable = r.disablePixiv ?? true;
protocol = r.pixivProtocol ?? "normal";
diff --git a/src/assets/javascripts/helpers/sendTargets.js b/src/assets/javascripts/helpers/sendTargets.js
index 3108257a..f5690d52 100644
--- a/src/assets/javascripts/helpers/sendTargets.js
+++ b/src/assets/javascripts/helpers/sendTargets.js
@@ -105,6 +105,34 @@ function setProtocol(val) {
console.log("sendTargetsProtocol: ", val)
}
+function changeInstance(url) {
+ let protocolHost = `${url.protocol}//${url.host}`;
+
+ let sendList = [
+ ...redirects.send.normal,
+ ...redirects.send.tor,
+ ...sendNormalCustomRedirects,
+ ...sendTorCustomRedirects,
+ ];
+
+ if (!sendList.includes(protocolHost)) return;
+
+ if (url.pathname != '/') return;
+
+ let instancesList;
+ if (protocol == 'normal') instancesList = [...sendNormalRedirectsChecks, ...sendNormalCustomRedirects];
+ else if (protocol == 'tor') instancesList = [...sendTorRedirectsChecks, ...sendTorCustomRedirects];
+
+ console.log("instancesList", instancesList);
+ let index = instancesList.indexOf(protocolHost);
+ if (index > -1) instancesList.splice(index, 1);
+
+ if (instancesList.length === 0) return null;
+
+ let randomInstance = commonHelper.getRandomInstance(instancesList);
+ return `${randomInstance}${url.pathname}${url.search}`;
+}
+
function redirect(url, type, initiator) {
if (disable) return null;
@@ -183,6 +211,8 @@ export default {
getSendNormalCustomRedirects,
setSendNormalCustomRedirects,
+ changeInstance,
+
redirect,
init,
};