|
|
@ -255,12 +255,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
with true <- outgoing_blocks do
|
|
|
|
with true <- outgoing_blocks,
|
|
|
|
with block_data <- make_block_data(blocker, blocked, activity_id),
|
|
|
|
block_data <- make_block_data(blocker, blocked, activity_id),
|
|
|
|
{:ok, activity} <- insert(block_data, local),
|
|
|
|
{:ok, activity} <- insert(block_data, local),
|
|
|
|
:ok <- maybe_federate(activity) do
|
|
|
|
:ok <- maybe_federate(activity) do
|
|
|
|
{:ok, activity}
|
|
|
|
{:ok, activity}
|
|
|
|
end
|
|
|
|
|
|
|
|
else
|
|
|
|
else
|
|
|
|
_e -> {:ok, nil}
|
|
|
|
_e -> {:ok, nil}
|
|
|
|
end
|
|
|
|
end
|
|
|
|