hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
squidboi 2018-06-08 19:01:14 -07:00
commit 16d896f526
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -246,14 +246,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def block(blocker, blocked, activity_id \\ nil, local \\ true) do
with true <- unfollow_blocked do
with true <- @unfollow_blocked do
follow_activity = fetch_latest_follow(blocker, blocked)
if follow_activity do
unfollow(blocker, blocked, nil, local)
end
end
with true <- outgoing_blocks do
with true <- @outgoing_blocks do
with block_data <- make_block_data(blocker, blocked, activity_id),
{:ok, activity} <- insert(block_data, local),
:ok <- maybe_federate(activity) do