aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorsquidboi <squidboi@waifu.club>2018-06-24 23:05:44 -0700
committersquidboi <squidboi@waifu.club>2018-06-24 23:05:44 -0700
commitea214b8ba65c0911aed6d2b019465272fc77fbc4 (patch)
tree102444a495070fba13548aae062387831fe45d10 /lib
parentc4038ede0729e1998511fa0a21860d7061e31454 (diff)
downloadpleroma-ea214b8ba65c0911aed6d2b019465272fc77fbc4.tar.gz
combined outgoing_blocks with statement
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 513b53b30..e3ce5aa04 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -255,12 +255,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
end
- 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
- {:ok, activity}
- end
+ with true <- outgoing_blocks,
+ block_data <- make_block_data(blocker, blocked, activity_id),
+ {:ok, activity} <- insert(block_data, local),
+ :ok <- maybe_federate(activity) do
+ {:ok, activity}
else
_e -> {:ok, nil}
end