Merge branch 'feature/configurable-blocks' into 'develop'

Add more configurability to how blocks work

See merge request !203

CONFIGURATION.md

@@ -13,6 +13,23 @@ Instead, overload the settings by editing the following files:
 * `dev.secret.exs`: custom additional configuration for `MIX_ENV=dev`
 * `prod.secret.exs`: custom additional configuration for `MIX_ENV=prod`
 
+## Block functionality
+
+    config :pleroma, :activitypub,
+      accept_blocks: true,
+      unfollow_blocked: true,
+      outgoing_blocks: true
+
+    config :pleroma, :user, deny_follow_blocked: true
+
+* `accept_blocks`: whether to accept incoming block activities from
+   other instances
+* `unfollow_blocked`: whether blocks result in people getting
+   unfollowed
+* `outgoing_blocks`: whether to federate blocks to other instances
+* `deny_follow_blocked`: whether to disallow following an account that
+   has blocked the user in question
+
 ## Message Rewrite Filters (MRFs)
 
 Modify incoming and outgoing posts.

config/config.exs

@@ -58,7 +58,12 @@ config :pleroma, :instance,
   public: true,
   quarantined_instances: []
 
-config :pleroma, :activitypub, accept_blocks: true
+config :pleroma, :activitypub,
+  accept_blocks: true,
+  unfollow_blocked: true,
+  outgoing_blocks: true
+
+config :pleroma, :user, deny_follow_blocked: true
 
 config :pleroma, :mrf_rejectnonpublic,
   allow_followersonly: false,

lib/pleroma/user.ex

@@ -169,6 +169,9 @@ defmodule Pleroma.User do
   end
 
   def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do
+    user_config = Application.get_env(:pleroma, :user)
+    deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
+
     user_info = user_info(followed)
 
     should_direct_follow =
@@ -178,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
-        User.blocks?(follower, followed) == true or User.blocks?(followed, follower) == true ->
+        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
@@ -206,13 +210,16 @@ defmodule Pleroma.User do
   end
 
   def follow(%User{} = follower, %User{info: info} = followed) do
+    user_config = Application.get_env(:pleroma, :user)
+    deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
+
     ap_followers = followed.follower_address
 
     cond do
       following?(follower, followed) or info["deactivated"] ->
         {:error, "Could not follow user: #{followed.nickname} is already on your list."}
 
-      blocks?(followed, follower) ->
+      deny_follow_blocked and blocks?(followed, follower) ->
         {:error, "Could not follow user: #{followed.nickname} blocked you."}
 
       true ->

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -251,16 +251,25 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def block(blocker, blocked, activity_id \\ nil, local \\ true) do
-    follow_activity = fetch_latest_follow(blocker, blocked)
+    ap_config = Application.get_env(:pleroma, :activitypub)
+    unfollow_blocked = Keyword.get(ap_config, :unfollow_blocked)
+    outgoing_blocks = Keyword.get(ap_config, :outgoing_blocks)
 
-    if follow_activity do
-      unfollow(blocker, blocked, nil, local)
+    with true <- unfollow_blocked do
+      follow_activity = fetch_latest_follow(blocker, blocked)
+
+      if follow_activity do
+        unfollow(blocker, blocked, nil, local)
+      end
     end
 
-    with block_data <- make_block_data(blocker, blocked, activity_id),
+    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
   end