diff options
| author | lain <lain@soykaf.club> | 2020-05-05 18:00:37 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-05 18:02:24 +0200 |
| commit | 92caae592338a3ca307686e7644f2de18bb57ce5 (patch) | |
| tree | fff0ee1670ea7c396ffbcd350ccc68ed8408402d /lib/pleroma/web/common_api | |
| parent | a3bb2e5474ee068bf375b24df8906e51654c9699 (diff) | |
| download | pleroma-92caae592338a3ca307686e7644f2de18bb57ce5.tar.gz | |
Undoing: Move undoing blocks to the pipeline everywhere.
Diffstat (limited to 'lib/pleroma/web/common_api')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index fc8246871..2a1eb7f37 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -24,6 +24,14 @@ defmodule Pleroma.Web.CommonAPI do require Pleroma.Constants require Logger + def unblock(blocker, blocked) do + with %Activity{} = 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} + end + end + def follow(follower, followed) do timeout = Pleroma.Config.get([:activitypub, :follow_handshake_timeout]) |