From 6b99ab9e43ecca112f2ad94679f2588bfcbbcc09 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Mon, 7 Apr 2025 23:57:03 -0400 Subject: [PATCH] [+] Blacklist --- AquaNet/src/libs/i18n/en_ref.ts | 1 + AquaNet/src/libs/i18n/zh.ts | 1 + .../src/pages/Transfer/TransferServer.svelte | 24 +++++++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/AquaNet/src/libs/i18n/en_ref.ts b/AquaNet/src/libs/i18n/en_ref.ts index eceb98e0..39423879 100644 --- a/AquaNet/src/libs/i18n/en_ref.ts +++ b/AquaNet/src/libs/i18n/en_ref.ts @@ -270,6 +270,7 @@ export const EN_REF_AQUATRANS = { 'trans.btn.test': 'Test Connection', 'trans.btn.export': 'Export Data', 'trans.btn.import': 'Import Data', + 'trans.blacklist': "Your server's rules doesn't allow using this tool. You might get banned if you try (idk, ask them if you want to know why)", } export const EN_REF = { ...EN_REF_USER, ...EN_REF_Welcome, ...EN_REF_GENERAL, diff --git a/AquaNet/src/libs/i18n/zh.ts b/AquaNet/src/libs/i18n/zh.ts index 4a0de7ba..715d5b05 100644 --- a/AquaNet/src/libs/i18n/zh.ts +++ b/AquaNet/src/libs/i18n/zh.ts @@ -277,6 +277,7 @@ export const zhAquaTrans: typeof EN_REF_AQUATRANS = { 'trans.btn.test': '测试连接', 'trans.btn.export': '导出数据', 'trans.btn.import': '导入数据', + 'trans.blacklist': "这个服务器的服主把这个导出工具 ban 了,所以不能从这里导出", } diff --git a/AquaNet/src/pages/Transfer/TransferServer.svelte b/AquaNet/src/pages/Transfer/TransferServer.svelte index 45981d77..9e0d6b7d 100644 --- a/AquaNet/src/pages/Transfer/TransferServer.svelte +++ b/AquaNet/src/pages/Transfer/TransferServer.svelte @@ -4,6 +4,9 @@ import { TRANSFER } from "../../libs/sdk"; import { download, selectJsonFile } from "../../libs/ui"; import InputTextShort from "./InputTextShort.svelte"; + import { createEventDispatcher } from 'svelte'; + + const dispatch = createEventDispatcher() export let src: AllNetSrc export let gameInfo: AllNetGame @@ -12,8 +15,10 @@ export let tested: boolean = false let [loading, error] = [false, ""] + const blacklist = ['amime.missless.net'] + function testConnection() { - if (loading) return + if (loading || isBlacklist) return // Preliminiary checks if (!src.dns || !src.keychip || !src.card || !gameInfo.game || !gameInfo.version) { @@ -78,6 +83,8 @@ messages = [t('trans.success.import')] }).catch(err => error = err.message).finally(() => loading = false) } + + $: isBlacklist = !!blacklist.filter(x => src.dns.includes(x)) @@ -85,6 +92,10 @@

{t(`trans.${isSrc ? "source" : "target"}.title`)}

+ {#if !isSrc && isBlacklist} +
{t('trans.blacklist')}
+ {/if} + {#if error}
{error}
{/if} @@ -92,9 +103,11 @@
/^https?:\/\/[a-z0-9.-]+(:\d+)?$/i.test(v)} disabled={tested} /> + bind:value={src.dns} on:change disabled={tested} + validate={v => /^https?:\/\/[a-z0-9.-]+(:\d+)?$/i.test(v)} /> /^([A-Z0-9]{11}|[A-Z0-9]{4}-[A-Z0-9]{11})$/.test(v)} disabled={tested} /> + bind:value={src.keychip} on:change disabled={tested} + validate={v => /^([A-Z0-9]{11}|[A-Z0-9]{4}-[A-Z0-9]{11})$/.test(v)} />
@@ -106,7 +119,10 @@ bind:value={gameInfo.version} on:change disabled={tested} />
+ bind:value={src.card} disabled={tested} on:change={value => { + src.card = src.card.replaceAll(' ', '') + dispatch('change', { value }); + }} />