From 878a543818827bafebab377d65e04c89d9ef791f Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Tue, 20 Feb 2024 16:12:08 -0500 Subject: [PATCH] [F] Fix infinite recursion on serializing user card --- .../java/icu/samnyan/aqua/net/UserRegistrar.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt index b511f98c..e803321d 100644 --- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt +++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt @@ -133,7 +133,19 @@ class UserRegistrar( } @API("/me") - suspend fun getUser(@RP token: Str) = jwt.auth(token) + suspend fun getUser(@RP token: Str) = jwt.auth(token) { u -> + mapOf( + "username" to u.username, + "email" to u.email, + "lastLogin" to u.lastLogin, + "regTime" to u.regTime, + "profileLocation" to u.profileLocation, + "profileBio" to u.profileBio, + "emailConfirmed" to u.emailConfirmed, + "ghostCard" to u.ghostCard.luid, + "cards" to u.cards.map { it.luid }, + ) + } @API("/setting") suspend fun setting(@RP token: Str, @RP key: Str, @RP value: Str) = jwt.auth(token) { u ->