From c2e0a0c8d44f8697160d4597db45c5c4afd0d8a6 Mon Sep 17 00:00:00 2001
From: Karen Konou <konoukaren@gmail.com>
Date: Fri, 15 Feb 2019 14:05:20 +0100
Subject: [PATCH] Readd threshold is not 0 check, optmization?

---
 .../web/activity_pub/mrf/hellthread_policy.ex | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
index 1fd7b9c67..8ab1dd4e5 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -6,20 +6,20 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
   alias Pleroma.User
   @behaviour Pleroma.Web.ActivityPub.MRF
 
-  defp delist_message(message) do
-    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
+  defp delist_message(message, threshold) when threshold > 0 do
     follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
 
     follower_collection? = Enum.member?(message["to"] ++ message["cc"], follower_collection)
 
     message =
       case recipients = get_recipient_count(message) do
-        {:public, _} when follower_collection? and recipients > delist_threshold ->
+        {:public, _}
+        when follower_collection? and recipients > threshold ->
           message
           |> Map.put("to", [follower_collection])
           |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
 
-        {:public, _} when recipients > delist_threshold ->
+        {:public, _} when recipients > threshold ->
           message
           |> Map.put("to", [])
           |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
@@ -31,15 +31,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
     {:ok, message}
   end
 
-  defp reject_message(message) do
-    reject_threshold =
-      Pleroma.Config.get(
-        [:mrf_hellthread, :reject_threshold],
-        Pleroma.Config.get([:mrf_hellthread, :threshold])
-      )
+  defp delist_message(message, _threshold), do: {:ok, message}
 
+  defp reject_message(message, threshold) when threshold > 0 do
     with {_, recipients} <- get_recipient_count(message) do
-      if recipients > reject_threshold and reject_threshold > 0 do
+      if recipients > threshold do
         {:reject, nil}
       else
         {:ok, message}
@@ -47,6 +43,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
     end
   end
 
+  defp reject_message(message, _threshold), do: {:ok, message}
+
   defp get_recipient_count(message) do
     recipients = (message["to"] || []) ++ (message["cc"] || [])
     follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
@@ -69,8 +67,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
 
   @impl true
   def filter(%{"type" => "Create"} = message) do
-    with {:ok, message} <- reject_message(message),
-         {:ok, message} <- delist_message(message) do
+    reject_threshold =
+      Pleroma.Config.get(
+        [:mrf_hellthread, :reject_threshold],
+        Pleroma.Config.get([:mrf_hellthread, :threshold])
+      )
+
+    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
+
+    with {:ok, message} <- reject_message(message, reject_threshold),
+         {:ok, message} <- delist_message(message, delist_threshold) do
       {:ok, message}
     else
       _e -> {:reject, nil}