diff options
| author | lain <lain@soykaf.club> | 2020-05-07 18:53:34 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-07 18:53:34 +0200 |
| commit | ef55d240540ed9fbac76248c60bdb23f82c3f36e (patch) | |
| tree | e65130d12a256026edb1a4768fc97e2271173248 /lib/pleroma/web/mastodon_api/controllers/account_controller.ex | |
| parent | 7ac0cffb34567dd72877e13968a10d206f643ad8 (diff) | |
| parent | bef08b85e5e1e25b65851938d6152bf0c170af03 (diff) | |
| download | pleroma-ef55d240540ed9fbac76248c60bdb23f82c3f36e.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/account_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index 8458cbdd5..b9ed2d7b2 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -356,8 +356,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do @doc "POST /api/v1/accounts/:id/unblock" def unblock(%{assigns: %{user: blocker, account: blocked}} = conn, _params) do - with {:ok, _user_block} <- User.unblock(blocker, blocked), - {:ok, _activity} <- ActivityPub.unblock(blocker, blocked) do + with {:ok, _activity} <- CommonAPI.unblock(blocker, blocked) do render(conn, "relationship.json", user: blocker, target: blocked) else {:error, message} -> json_response(conn, :forbidden, %{error: message}) |