hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make move_account endpoint process non-existent users properly

Browse source 
Ref: emit-move
This commit is contained in:
Tusooa Zhu 2021-09-22 16:26:22 -04:00
commit eb383ef8d3
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
4 changed files with 50 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,12 +173,14 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
def move_account(%{assigns: %{user: user}, body_params: body_params} = conn, %{}) do
case CommonAPI.Utils.confirm_current_password(user, body_params.password) do
{:ok, user} ->
with {:ok, target_user} <- find_user_by_nickname(body_params.target_account),
with {:ok, target_user} <- find_or_fetch_user_by_nickname(body_params.target_account),
{:ok, _user} <- ActivityPub.move(user, target_user) do
json(conn, %{status: "success"})
else
{:not_found} ->
json(conn, %{error: "Target account not found."})
{:not_found, _} ->
conn
|> put_status(404)
|> json(%{error: "Target account not found."})
{:error, error} ->
json(conn, %{error: error})
@ -233,6 +235,21 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
end
end
defp find_or_fetch_user_by_nickname(nickname) do
user = User.get_by_nickname(nickname)
if user != nil and user.local do
{:ok, user}
else
with {:ok, user} <- User.fetch_by_nickname(nickname) do
{:ok, user}
else
_ ->
{:not_found, nil}
end
end
end
def captcha(conn, _params) do
json(conn, Pleroma.Captcha.new())
end