made toggleable, added docs

diff --git a/docs/config.md b/docs/config.md
index c14746d932fb9c573560363d2c73ecd5769e7766..a1fd8e3f4b65af96b2ac96fb91ae2ca92475bea9 100644 (file)
--- a/docs/config.md
+++ b/docs/config.md
@@ -148,7 +148,8 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i
 * `allow_direct`: whether to allow direct messages
 
 ## :mrf_hellthread
-* `threshold`: Number of mentioned users after which the message gets discarded as spam
+* `delist_threshold`: Number of mentioned users after which the message gets delisted. Set to 0 to disable.
+* `reject_threshold`: Number of mentioned users after which the messaged gets rejected. Set to 0 to disable.
 
 ## :media_proxy
 * `enabled`: Enables proxying of remote media to the instance’s proxy

diff --git a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
index 0b9caeb11641bfd823db6857894be9825dd90bcd..53588b264d7c0e9e995f5c639fabc22be883d474 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -13,10 +13,10 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
     recipients = (object["to"] || []) ++ (object["cc"] || [])
 
     cond do
-      length(recipients) > reject_threshold ->
+      length(recipients) > reject_threshold and reject_threshold != 0 ->
         {:reject, nil}
 
-      length(recipients) > delist_threshold ->
+      length(recipients) > delist_threshold and delist_threshold != 0 ->
         if Enum.member?(object["to"], "https://www.w3.org/ns/activitystreams#Public") or
              Enum.member?(object["cc"], "https://www.w3.org/ns/activitystreams#Public") do
           object