dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-28 05:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixreset' into 'next'

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

See merge request famedly/conduit!458
This commit is contained in:
Timo Kösters 2023-02-11 11:49:54 +00:00
parent 4223288cdf fc0aff20cf
commit cdcf4a017d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/service/admin/mod.rs
View file

@ -556,7 +556,6 @@ impl Service {
// Check if the specified user is valid // Check if the specified user is valid
if !services().users.exists(&user_id)? if !services().users.exists(&user_id)?
|| services().users.is_deactivated(&user_id)?
|| user_id || user_id
== UserId::parse_with_server_name( == UserId::parse_with_server_name(
"conduit", "conduit",
@ -565,7 +564,7 @@ impl Service {
.expect("conduit user exists") .expect("conduit user exists")
{ {
return Ok(RoomMessageEventContent::text_plain( return Ok(RoomMessageEventContent::text_plain(
"The specified user does not exist or is deactivated!", "The specified user does not exist!",
)); ));
} }
@ -600,12 +599,12 @@ impl Service {
}; };
if user_id.is_historical() { if user_id.is_historical() {
return Ok(RoomMessageEventContent::text_plain(format!( 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)? { if services().users.exists(&user_id)? {
return Ok(RoomMessageEventContent::text_plain(format!( return Ok(RoomMessageEventContent::text_plain(format!(
"userid {user_id} already exists" "Userid {user_id} already exists"
))); )));
} }
// Create user // Create user