lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow

This commit is contained in:
Haelwenn (lanodan) Monnier 2018-11-10 14:55:49 +01:00
parent 7fbfd2db96
commit ccd6b1956d
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE

View file

@ -78,7 +78,7 @@ def right_delete(
when right in ["moderator", "admin"] do when right in ["moderator", "admin"] do
if admin_nickname == nickname do if admin_nickname == nickname do
conn conn
|> post_status(403) |> put_status(403)
|> json(%{error: "You can't revoke your own admin status."}) |> json(%{error: "You can't revoke your own admin status."})
else else
user = User.get_by_nickname(nickname) user = User.get_by_nickname(nickname)
@ -102,17 +102,29 @@ def right_delete(conn, _) do
end end
def relay_follow(conn, %{"relay_url" => target}) do def relay_follow(conn, %{"relay_url" => target}) do
:ok = Relay.follow(target) status = Relay.follow(target)
conn if status == :ok do
|> json(target) conn
|> json(target)
else
conn
|> put_status(500)
|> json(target)
end
end end
def relay_unfollow(conn, %{"relay_url" => target}) do def relay_unfollow(conn, %{"relay_url" => target}) do
:ok = Relay.unfollow(target) status = Relay.unfollow(target)
conn if status == :ok do
|> json(target) conn
|> json(target)
else
conn
|> put_status(500)
|> json(target)
end
end end
@shortdoc "Get a account registeration invite token (base64 string)" @shortdoc "Get a account registeration invite token (base64 string)"