Skip to content

Fix the user deactivation/reactivation jobs #4813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2025
Merged

Fix the user deactivation/reactivation jobs #4813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions crates/tasks/src/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,9 @@ impl RunnableJob for DeactivateUserJob {
// we want the user to be locked out as soon as possible
repo.save().await.map_err(JobError::retry)?;

let mxid = matrix.mxid(&user.username);
info!("Deactivating user {} on homeserver", mxid);
info!("Deactivating user {} on homeserver", user.username);
matrix
.delete_user(&mxid, self.hs_erase())
.delete_user(&user.username, self.hs_erase())
.await
.map_err(JobError::retry)?;

Expand Down Expand Up @@ -123,10 +122,9 @@ impl RunnableJob for ReactivateUserJob {
.context("User not found")
.map_err(JobError::fail)?;

let mxid = matrix.mxid(&user.username);
info!("Reactivating user {} on homeserver", mxid);
info!("Reactivating user {} on homeserver", user.username);
matrix
.reactivate_user(&mxid)
.reactivate_user(&user.username)
.await
.map_err(JobError::retry)?;

Expand Down
Loading