@@ -62,8 +62,7 @@ config :pleroma, :activitypub, | |||||
unfollow_blocked: true, | unfollow_blocked: true, | ||||
outgoing_blocks: true | outgoing_blocks: true | ||||
config :pleroma, :user, | |||||
deny_follow_blocked: true | |||||
config :pleroma, :user, deny_follow_blocked: true | |||||
config :pleroma, :mrf_simple, | config :pleroma, :mrf_simple, | ||||
media_removal: [], | media_removal: [], | ||||
@@ -181,7 +181,8 @@ defmodule Pleroma.User do | |||||
false | false | ||||
# if the users are blocking each other, we shouldn't even be here, but check for it anyway | # 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 | false | ||||
# if OStatus, then there is no three-way handshake to follow | # 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) | @outgoing_blocks Keyword.get(@ap_config, :outgoing_blocks) | ||||
def block(blocker, blocked, activity_id \\ nil, local \\ true) 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) | follow_activity = fetch_latest_follow(blocker, blocked) | ||||
if follow_activity do | if follow_activity do | ||||
unfollow(blocker, blocked, nil, local) | unfollow(blocker, blocked, nil, local) | ||||
end | end | ||||