Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-12 09:37:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[O] Use user{id} instead

Browse Source
This commit is contained in:
Azalea
2024-03-01 00:42:39 -05:00
parent ed1b7f477b
commit acf117e43b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
View File

@@ -115,7 +115,7 @@ class AquaUserServices(
userRepo.findByUsernameIgnoreCase(username)?.let(callback) ?: (404 - "User not found") userRepo.findByUsernameIgnoreCase(username)?.let(callback) ?: (404 - "User not found")
fun <T> cardByName(username: Str, callback: (Card) -> T) = fun <T> cardByName(username: Str, callback: (Card) -> T) =
if (username.startsWith("card")) username.substring(4).toLongOrNull() if (username.startsWith("user")) username.substring(4).toLongOrNull()
?.let { cardRepo.findById(it).getOrNull() } ?.let { cardRepo.findById(it).getOrNull() }
?.let(callback) ?: (404 - "Card not found") ?.let(callback) ?: (404 - "Card not found")
else byName(username) { callback(it.ghostCard) } else byName(username) { callback(it.ghostCard) }
@@ -127,8 +127,8 @@ class AquaUserServices(
if (contains(" ")) 400 - "Username cannot contain spaces" if (contains(" ")) 400 - "Username cannot contain spaces"
// card{id} is a reserved format // card{id} is a reserved format
if (startsWith("card") && substring(4).toLongOrNull() != null) if (startsWith("user") && substring(4).toLongOrNull() != null)
400 - "Username cannot be 'card' + a number. This format is reserved for card IDs." 400 - "Username cannot be 'user' + a number. This format is reserved for user IDs."
// Check if username is within A-Za-z0-9_-~. // Check if username is within A-Za-z0-9_-~.
find { !it.isLetterOrDigit() && it != '_' && it != '-' && it != '~' && it != '.' }?.let { find { !it.isLetterOrDigit() && it != '_' && it != '-' && it != '~' && it != '.' }?.let {