diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2020-01-31 01:20:37 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-01-31 01:20:37 +0300 |
commit | 8057157ee3172c370200f328373f0a7e32092b91 (patch) | |
tree | a985d42be30ca2f7c6e5feccf1f9b42f757062c6 /lib/pleroma/object.ex | |
parent | c27d1d65bfd60effdb45359697141c136e156177 (diff) | |
download | pleroma-8057157ee3172c370200f328373f0a7e32092b91.tar.gz |
Make attachments cleanup optional
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r-- | lib/pleroma/object.ex | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 38e372f6d..52556bf31 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -184,11 +184,14 @@ defmodule Pleroma.Object do with {:ok, _obj} = swap_object_with_tombstone(object), deleted_activity = Activity.delete_all_by_object_ap_id(id), {:ok, true} <- Cachex.del(:object_cache, "object:#{id}"), - {:ok, _} <- Cachex.del(:web_resp_cache, URI.parse(id).path), - {:ok, _} <- - Pleroma.Workers.AttachmentsCleanupWorker.enqueue("cleanup_attachments", %{ - "object" => object - }) do + {:ok, _} <- Cachex.del(:web_resp_cache, URI.parse(id).path) do + with true <- Pleroma.Config.get([:instance, :cleanup_attachments]) do + {:ok, _} = + Pleroma.Workers.AttachmentsCleanupWorker.enqueue("cleanup_attachments", %{ + "object" => object + }) + end + {:ok, object, deleted_activity} end end |