pleroma

commit: 2012800ed1618eeafddaaaaa05df4d3e10a2afff
parent 69c560cfba1400010c938b2e79d821285ce1d697
Author: feld <feld@feld.me>
Date:   Tue,  2 Feb 2021 17:08:33 +0000

Merge branch 'fix/attachment-cleanup' into 'develop'

Only run attachment cleanup if enabled

See merge request pleroma/pleroma!3288
Diffstat:
M
lib/pleroma/workers/attachments_cleanup_worker.ex
14
++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/pleroma/workers/attachments_cleanup_worker.ex b/lib/pleroma/workers/attachments_cleanup_worker.ex
@@ -17,12 +17,14 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
           "object" => %{"data" => %{"attachment" => [_ | _] = attachments, "actor" => actor}}
         }
       }) do
-    attachments
-    |> Enum.flat_map(fn item -> Enum.map(item["url"], & &1["href"]) end)
-    |> fetch_objects
-    |> prepare_objects(actor, Enum.map(attachments, & &1["name"]))
-    |> filter_objects
-    |> do_clean
+    if Pleroma.Config.get([:instance, :cleanup_attachments], false) do
+      attachments
+      |> Enum.flat_map(fn item -> Enum.map(item["url"], & &1["href"]) end)
+      |> fetch_objects
+      |> prepare_objects(actor, Enum.map(attachments, & &1["name"]))
+      |> filter_objects
+      |> do_clean
+    end
 
     {:ok, :success}
   end