Skip to content
Snippets Groups Projects
Unverified Commit fc0aff20 authored by Timo Kösters's avatar Timo Kösters
Browse files

fix: allow reactivation of users using reset-password admin command

parent a4f18f99
No related branches found
No related tags found
No related merge requests found
......@@ -556,7 +556,6 @@ async fn process_admin_command(
// Check if the specified user is valid
if !services().users.exists(&user_id)?
|| services().users.is_deactivated(&user_id)?
|| user_id
== UserId::parse_with_server_name(
"conduit",
......@@ -565,7 +564,7 @@ async fn process_admin_command(
.expect("conduit user exists")
{
return Ok(RoomMessageEventContent::text_plain(
"The specified user does not exist or is deactivated!",
"The specified user does not exist!",
));
}
......@@ -600,12 +599,12 @@ async fn process_admin_command(
};
if user_id.is_historical() {
return Ok(RoomMessageEventContent::text_plain(format!(
"userid {user_id} is not allowed due to historical"
"Userid {user_id} is not allowed due to historical"
)));
}
if services().users.exists(&user_id)? {
return Ok(RoomMessageEventContent::text_plain(format!(
"userid {user_id} already exists"
"Userid {user_id} already exists"
)));
}
// Create user
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment