Commit 4f9ecfc7 authored by squidboi's avatar squidboi

formatting

parent 8903f1ad
......@@ -62,8 +62,7 @@ config :pleroma, :activitypub,
unfollow_blocked: true,
outgoing_blocks: true
config :pleroma, :user,
deny_follow_blocked: true
config :pleroma, :user, deny_follow_blocked: true
config :pleroma, :mrf_simple,
media_removal: [],
......
......@@ -181,7 +181,8 @@ defmodule Pleroma.User do
false
# if the users are blocking each other, we shouldn't even be here, but check for it anyway
@deny_follow_blocked and (User.blocks?(follower, followed) or User.blocks?(followed, follower)) ->
@deny_follow_blocked and
(User.blocks?(follower, followed) or User.blocks?(followed, follower)) ->
false
# if OStatus, then there is no three-way handshake to follow
......
......@@ -245,9 +245,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
@outgoing_blocks Keyword.get(@ap_config, :outgoing_blocks)
def block(blocker, blocked, activity_id \\ nil, local \\ true) do
with true <- @unfollow_blocked do
follow_activity = fetch_latest_follow(blocker, blocked)
if follow_activity do
unfollow(blocker, blocked, nil, local)
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment