Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(admin): route the bulk user deletion action correctly (#2545)

Hampusa2d6477b4218
diff --git a/fluxer_admin/src/routes/message_actions.rs b/fluxer_admin/src/routes/message_actions.rs
index da9a06e9f..e28b9b916 100644
--- a/fluxer_admin/src/routes/message_actions.rs
+++ b/fluxer_admin/src/routes/message_actions.rs
@@ -251,7 +251,7 @@ pub(crate) async fn bulk_actions_post(
.bulk_add_guild_members(&guild_id, &user_ids, audit_log_reason.as_deref())
.await
}
- "bulk-schedule-user-deletion" => {
+ "bulk-schedule-user-deletion" | "bulk_delete_users" => {
let user_ids = form.list_values_any(&["user_ids[]", "user_ids"]);
let reason_code = form.parse_u32("reason_code").unwrap_or(2);
let days = form.parse_u32("days_until_deletion").unwrap_or(14);
@@ -272,12 +272,6 @@ pub(crate) async fn bulk_actions_post(
.bulk_delete_user_messages(&user_ids, audit_log_reason.as_deref())
.await
}
- "bulk_delete_users" => {
- let user_ids = form.list_values_any(&["user_ids[]", "user_ids"]);
- client
- .bulk_schedule_user_deletion(&user_ids, 0, 30, None, audit_log_reason.as_deref())
- .await
- }
_ => {
return flash::redirect_with_flash(
&format!("{base}/bulk-actions"),
@@ -302,7 +296,7 @@ pub(crate) async fn bulk_actions_post(
tracing::warn!(%error, action, "admin API request failed: submit bulk action");
flash::redirect_with_flash(
&format!("{base}/bulk-actions"),
- FlashData::error("Failed to submit bulk action"),
+ FlashData::error(format!("Failed to submit bulk action: {error}")),
config.secure_cookies(),
)
}