Formatting and add tests for blocks/unblocks

This commit is contained in:
Francis Dinh 2018-05-19 21:23:52 -04:00
commit 1e43de0f86
6 changed files with 127 additions and 11 deletions

View file

@ -266,7 +266,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
handle_incoming(data)
end
def handle_incoming(%{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data) do
def handle_incoming(
%{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data
) do
with %User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
%User{} = blocker = User.get_or_fetch_by_ap_id(blocker),
{:ok, activity} <- ActivityPub.block(blocker, blocked, false) do
@ -277,6 +279,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
e -> :error
end
end
# TODO
# Accept
# Undo for non-Announce

View file

@ -357,6 +357,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
"object" => block_activity.data
}
end
#### Create-related helpers
def make_create_data(params, additional) do