Moved account deletion stuff to somewhere that hopefully makes more sense

This commit is contained in:
Syldexia 2018-05-13 14:24:15 +01:00
commit 5bfb7b4ce6
5 changed files with 25 additions and 38 deletions

View file

@ -4,6 +4,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
alias Pleroma.Web
alias Pleroma.Web.OStatus
alias Pleroma.Web.WebFinger
alias Pleroma.Web.CommonAPI
alias Comeonin.Pbkdf2
alias Pleroma.Formatter
alias Pleroma.Web.ActivityPub.ActivityPub
@ -195,4 +196,17 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
json(conn, "job started")
end
def delete_account(%{assigns: %{user: user}} = conn, params) do
case CommonAPI.Utils.confirm_current_password(user, params) do
{:ok, user} ->
case User.delete(user) do
:ok -> json(conn, %{status: "success"})
:error -> json(conn, %{error: "Unable to delete user."})
end
{:error, msg} ->
json(conn, %{error: msg})
end
end
end

View file

@ -364,19 +364,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end
end
def delete_account(%{assigns: %{user: user}} = conn, params) do
case CommonAPI.Utils.confirm_current_password(user, params) do
{:ok, user} ->
case User.delete(user) do
:ok -> json(conn, %{status: "success"})
:error -> error_json(conn, "Unable to delete user.")
end
{:error, msg} ->
forbidden_json_reply(conn, msg)
end
end
def search(%{assigns: %{user: user}} = conn, %{"q" => _query} = params) do
activities = TwitterAPI.search(user, params)