From 4f3a6cba457f497f76739e356185995cbe1cb1cc Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Thu, 20 Mar 2025 07:10:17 -0400
Subject: [PATCH] [F] Fix regex

---
 AquaNet/src/pages/Transfer/Transfer.svelte                  | 1 -
 AquaNet/src/pages/Transfer/TransferServer.svelte            | 2 +-
 src/main/java/icu/samnyan/aqua/net/transfer/AllNetClient.kt | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/AquaNet/src/pages/Transfer/Transfer.svelte b/AquaNet/src/pages/Transfer/Transfer.svelte
index 325f8e0e..29b7d8b5 100644
--- a/AquaNet/src/pages/Transfer/Transfer.svelte
+++ b/AquaNet/src/pages/Transfer/Transfer.svelte
@@ -4,7 +4,6 @@
   import TransferServer from "./TransferServer.svelte";
   import { DATA_HOST } from "../../libs/config";
   import type { ConfirmProps } from "../../libs/generalTypes";
-  import ActionCard from "../../components/ActionCard.svelte";
   import StatusOverlays from "../../components/StatusOverlays.svelte";
 
 
diff --git a/AquaNet/src/pages/Transfer/TransferServer.svelte b/AquaNet/src/pages/Transfer/TransferServer.svelte
index 80418aea..cef20607 100644
--- a/AquaNet/src/pages/Transfer/TransferServer.svelte
+++ b/AquaNet/src/pages/Transfer/TransferServer.svelte
@@ -90,7 +90,7 @@
     <InputTextShort desc="Server Address" placeholder="e.g. http://aquadx.hydev.org"
       bind:value={src.dns} on:change validate={v => /^https?:\/\/[a-z0-9.-]+(:\d+)?$/i.test(v)} disabled={tested} />
     <InputTextShort desc="Keychip ID" placeholder="e.g. A0299792458"
-      bind:value={src.keychip} on:change validate={v => /^[A-Z0-9]{11}$/.test(v)} disabled={tested} />
+      bind:value={src.keychip} on:change validate={v => /^([A-Z0-9]{11}|[A-Z0-9]{4}-[A-Z0-9]{11})$/.test(v)} disabled={tested} />
   </div>
 
   <!-- Second input line -->
diff --git a/src/main/java/icu/samnyan/aqua/net/transfer/AllNetClient.kt b/src/main/java/icu/samnyan/aqua/net/transfer/AllNetClient.kt
index 034429f4..9aca3f70 100644
--- a/src/main/java/icu/samnyan/aqua/net/transfer/AllNetClient.kt
+++ b/src/main/java/icu/samnyan/aqua/net/transfer/AllNetClient.kt
@@ -21,7 +21,7 @@ class AllNetClient(val dns: String, val keychip: String, val game: String, val v
     val keychipShort by lazy {
         // A123-45678901337 -> A1234567890
         if (keychip.length == 11) keychip
-        else keychip.substring(0, 4) + keychip.substring(5, 11)
+        else keychip.substring(0, 4) + keychip.substring(5, 12)
     }
     val aime by lazy { AimeDbClient(game, keychipShort, dns.substringAfter("://")) }