diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-16 16:14:50 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-16 16:14:50 +0300 |
| commit | 978ccf8f974e7ee398faa3e5bfb7c081144e9325 (patch) | |
| tree | 3905077d0fca58062ed206dbc383b03ae4a13553 /lib/pleroma/web/common_api/common_api.ex | |
| parent | e4b12494d77e7a6920a408d62d5b8fe0f886a14d (diff) | |
| parent | 3bc1138dd9beec03d2336fa1ad45dd23816f5285 (diff) | |
| download | pleroma-978ccf8f974e7ee398faa3e5bfb7c081144e9325.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 601caeb46..7c94f16b6 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -25,10 +25,21 @@ defmodule Pleroma.Web.CommonAPI do require Logger def unblock(blocker, blocked) do - with %Activity{} = block <- Utils.fetch_latest_block(blocker, blocked), + with {_, %Activity{} = block} <- {:fetch_block, Utils.fetch_latest_block(blocker, blocked)}, {:ok, unblock_data, _} <- Builder.undo(blocker, block), {:ok, unblock, _} <- Pipeline.common_pipeline(unblock_data, local: true) do {:ok, unblock} + else + {:fetch_block, nil} -> + if User.blocks?(blocker, blocked) do + User.unblock(blocker, blocked) + {:ok, :no_activity} + else + {:error, :not_blocking} + end + + e -> + e end end |