move user disable into deactivation

This commit is contained in:
Egor Kislitsyn 2019-04-11 17:22:42 +07:00
commit db4badc6aa
12 changed files with 36 additions and 83 deletions

View file

@ -358,7 +358,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.disable_async(user)
User.deactivate_async(user)
json(conn, %{status: "success"})
{:error, msg} ->

View file

@ -235,7 +235,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
nil ->
{:error, "No user with such user_id"}
%User{info: %{disabled: true}} ->
%User{info: %{deactivated: true}} ->
{:error, "User has been disabled"}
user ->