diff options
| author | feld <feld@feld.me> | 2021-01-25 16:54:57 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-25 16:54:57 +0000 |
| commit | f1c82fbd426651e6838a9c60578c96a25ae94df4 (patch) | |
| tree | 9b6933bcfaea56aadf855c59f7783b73f6e5fff8 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | 0a6f5f479348eff5f5404d4455fcb8254809812f (diff) | |
| parent | f868dcf3acc0fd687a4a74e74f6e150ef565f787 (diff) | |
| download | pleroma-f1c82fbd426651e6838a9c60578c96a25ae94df4.tar.gz | |
Merge branch 'refactor/deactivated_user_field' into 'develop'
Change user.deactivated field to user.is_active
See merge request pleroma/pleroma!3073
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 1e252f7bb..940a645bb 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -150,7 +150,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do def disable_account(%{assigns: %{user: user}} = conn, params) do case CommonAPI.Utils.confirm_current_password(user, params["password"]) do {:ok, user} -> - User.deactivate_async(user) + User.set_activation_async(user, false) json(conn, %{status: "success"}) {:error, msg} -> |