Delete attachments after object and cache cleanup

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 6c56a9c62f005b41a0a9436eda79fb721058b9b9..499339982b9c1b314a2d4eeded4ed01a8ff64e59 100644 (file)
--- 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