diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2020-01-17 20:20:37 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-01-17 20:20:37 +0300 |
commit | 81133702d4246e5e5c17ea4d4119747dc880edd6 (patch) | |
tree | d5e2ce4c9449ee6cd5f077e399bea10135b06218 | |
parent | 0709757e47a546225163482474a46e8bc3d09837 (diff) | |
download | pleroma-81133702d4246e5e5c17ea4d4119747dc880edd6.tar.gz |
Delete attachments after object and cache cleanup
-rw-r--r-- | lib/pleroma/object.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 6c56a9c62..499339982 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -180,10 +180,10 @@ defmodule Pleroma.Object do def delete(%Object{data: %{"id" => id}} = object) do with {:ok, _obj} = swap_object_with_tombstone(object), - :ok <- delete_attachments(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) do + {:ok, _} <- Cachex.del(:web_resp_cache, URI.parse(id).path), + :ok <- delete_attachments(object) do {:ok, object, deleted_activity} end end |