mirror of
https://github.com/fluxerapp/fluxer
synced 2026-10-17 13:05:32 +09:00
fix(AdminUserSchemas): use DiscriminatorType for discriminator (#1218)
Co-authored-by: Hampus <[email protected]>
This commit is contained in:
1 parent
4a741d8396
commit
4a93082f0a
10 files changed
+38
-20
No files matched your search
@@ -397,10 +397,13 @@ impl AdminApiClient {
|
||||
&self,
|
||||
user_id: &str,
|
||||
username: &str,
|
||||
discriminator: Option<i32>,
|
||||
discriminator: Option<&str>,
|
||||
) -> ApiResult<AdminUser> {
|
||||
let body = generated_types::ChangeUsernameRequest {
|
||||
discriminator: discriminator.map(generated_types::Int32Type::from),
|
||||
discriminator: discriminator
|
||||
.map(generated_types::DiscriminatorType::try_from)
|
||||
.transpose()
|
||||
.map_err(|e| ApiError::Parse(e.to_string()))?,
|
||||
user_id: snowflake(user_id),
|
||||
username: generated_types::UsernameType::try_from(username)
|
||||
.map_err(|e| ApiError::Parse(e.to_string()))?,
|
||||
|
||||
@@ -205,10 +205,10 @@ pub async fn dispatch(
|
||||
let Some(username) = get("username") else {
|
||||
return DispatchOutcome::error("Username is required");
|
||||
};
|
||||
let discriminator = form.parse_i32("discriminator");
|
||||
let discriminator = get("discriminator");
|
||||
DispatchOutcome::from_result(
|
||||
client
|
||||
.change_username(user_id, &username, discriminator)
|
||||
.change_username(user_id, &username, discriminator.as_deref())
|
||||
.await,
|
||||
"Username changed successfully",
|
||||
"Failed to change username",
|
||||
|
||||
@@ -47,8 +47,8 @@ fn edit_account_card(base: &str, user: &AdminUser, csrf_token: &str) -> Markup {
|
||||
p class="text-sm font-medium text-neutral-700" { "Change Username:" }
|
||||
input type="text" name="username" placeholder="New username"
|
||||
required class=(INPUT_CLS);
|
||||
input type="number" name="discriminator"
|
||||
placeholder="Discriminator (optional)" min="0" max="9999"
|
||||
input type="text" name="discriminator"
|
||||
placeholder="Discriminator (optional)" inputmode="numeric" pattern="[0-9]{1,4}" maxlength="4"
|
||||
class=(INPUT_CLS);
|
||||
(form_actions(html! {
|
||||
(submit_button("Change Username"))
|
||||
|
||||
Reference in new issue
Block a user