nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modified deleting an account to run as a task

Browse source
This commit is contained in:
Syldexia 2018-05-19 13:35:49 +01:00
parent 98b36d359a
commit d1366f8d46
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -200,10 +200,8 @@ def follow_import(%{assigns: %{user: user}} = conn, %{"list" => list}) do
def delete_account(%{assigns: %{user: user}} = conn, params) do def delete_account(%{assigns: %{user: user}} = conn, params) do
case CommonAPI.Utils.confirm_current_password(user, params) do case CommonAPI.Utils.confirm_current_password(user, params) do
{:ok, user} -> {:ok, user} ->
case User.delete(user) do Task.start(fn -> User.delete(user) end)
:ok -> json(conn, %{status: "success"}) json(conn, %{status: "success"})
:error -> json(conn, %{error: "Unable to delete user."})
end
{:error, msg} -> {:error, msg} ->
json(conn, %{error: msg}) json(conn, %{error: msg})

2
test/web/twitter_api/twitter_api_controller_test.exs
View file

@ -825,8 +825,6 @@ test "with credentials and valid password", %{conn: conn, user: current_user} do
|> post("/api/pleroma/delete_account", %{"password" => "test"}) |> post("/api/pleroma/delete_account", %{"password" => "test"})
assert json_response(conn, 200) == %{"status" => "success"} assert json_response(conn, 200) == %{"status" => "success"}
fetched_user = Repo.get(User, current_user.id)
assert fetched_user.info == %{"deactivated" => true}
end end
end end
end end