formatting
This commit is contained in:
parent
8903f1ad4d
commit
4f9ecfc77a
3 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue