diff --git a/AquaNet/src/libs/generalTypes.ts b/AquaNet/src/libs/generalTypes.ts index eb613cce..82712772 100644 --- a/AquaNet/src/libs/generalTypes.ts +++ b/AquaNet/src/libs/generalTypes.ts @@ -8,7 +8,7 @@ export interface Card { luid: string registerTime: string accessTime: string - bound: boolean + linked: boolean ghost: boolean } diff --git a/AquaNet/src/libs/sdk.ts b/AquaNet/src/libs/sdk.ts index 49634254..f7ae7271 100644 --- a/AquaNet/src/libs/sdk.ts +++ b/AquaNet/src/libs/sdk.ts @@ -95,5 +95,5 @@ export const CARD = { summary: (cardId: string): Promise<{card: Card, summary: CardSummary}> => post('/api/v2/card/summary', { cardId }), link: (props: { cardId: string, migrate: string }) => - post('/api/v2/card/bind', props), + post('/api/v2/card/link', props), } \ No newline at end of file diff --git a/AquaNet/src/pages/Home.svelte b/AquaNet/src/pages/Home.svelte index fb06da69..341c0ba9 100644 --- a/AquaNet/src/pages/Home.svelte +++ b/AquaNet/src/pages/Home.svelte @@ -1,9 +1,9 @@

Welcome to AquaDX!

- +
\ No newline at end of file diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte index 274afae3..ca77afa4 100644 --- a/AquaNet/src/pages/Home/LinkCard.svelte +++ b/AquaNet/src/pages/Home/LinkCard.svelte @@ -72,7 +72,7 @@ const summary = card.summary // Check if it's already linked - if (card.card.bound) { + if (card.card.linked) { setError("This card is already linked to another account", type) state = "ready" return diff --git a/src/main/java/icu/samnyan/aqua/net/CardController.kt b/src/main/java/icu/samnyan/aqua/net/CardController.kt index 1fbaadfc..73d7c04e 100644 --- a/src/main/java/icu/samnyan/aqua/net/CardController.kt +++ b/src/main/java/icu/samnyan/aqua/net/CardController.kt @@ -42,8 +42,8 @@ class CardController( * @param cardId Card ID * @param migrate Things to migrate, stored as a comma-separated list of game IDs (e.g. "maimai2,chusan") */ - @API("/bind") - suspend fun bind(@RP token: Str, @RP cardId: Str, @RP migrate: Str) = jwt.auth(token) { u -> + @API("/link") + suspend fun link(@RP token: Str, @RP cardId: Str, @RP migrate: Str) = jwt.auth(token) { u -> // Check if the user's card limit is reached if (u.cards.size >= props.linkCardLimit) 400 - "Card limit reached" diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt b/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt index 63b2417f..f251da48 100644 --- a/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt +++ b/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt @@ -48,5 +48,5 @@ class Card( private val serialVersionUID = 1L } - val isBound get() = aquaUser != null + val isLinked get() = aquaUser != null }