3 files changed, 8 insertions, 7 deletions
diff --git a/lib/pleroma/web/media_proxy/invalidation.ex b/lib/pleroma/web/media_proxy/invalidation.ex
index 537cb76d6..fac731c5c 100644
--- a/lib/pleroma/web/media_proxy/invalidation.ex
+++ b/lib/pleroma/web/media_proxy/invalidation.ex
@@ -31,7 +31,6 @@ defmodule Pleroma.Web.MediaProxy.Invalidation do
   def prepare_urls(urls) do
     urls
     |> List.wrap()
-    |> Enum.filter(&MediaProxy.is_url_proxiable?(&1))
     |> Enum.map(&MediaProxy.url(&1))
   end
 end
diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex
index e5f1d242e..59ca217ab 100644
--- a/lib/pleroma/web/media_proxy/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy.ex
@@ -30,11 +30,7 @@ defmodule Pleroma.Web.MediaProxy do
   end
 
   def put_in_deleted_urls(url) when is_binary(url) do
-    if is_url_proxiable?(url) do
-      Cachex.put(:deleted_urls_cache, url(url), true)
-    else
-      true
-    end
+    Cachex.put(:deleted_urls_cache, url(url), true)
   end
 
   def url(url) when is_nil(url) or url == "", do: nil
@@ -48,6 +44,7 @@ defmodule Pleroma.Web.MediaProxy do
     end
   end
 
+  @spec is_url_proxiable?(String.t()) :: boolean()
   def is_url_proxiable?(url) do
     if local?(url) or whitelisted?(url) do
       false
diff --git a/lib/pleroma/workers/attachments_cleanup_worker.ex b/lib/pleroma/workers/attachments_cleanup_worker.ex
index 170bca976..4a7b67080 100644
--- a/lib/pleroma/workers/attachments_cleanup_worker.ex
+++ b/lib/pleroma/workers/attachments_cleanup_worker.ex
@@ -78,7 +78,12 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
   defp cache_purge(true, [_ | _] = urls), do: MediaProxy.Invalidation.purge(urls)
   defp cache_purge(_, _), do: :ok
 
-  defp lock_attachments(true, urls), do: MediaProxy.put_in_deleted_urls(urls)
+  defp lock_attachments(true, [_ | _] = urls) do
+    urls
+    |> Enum.filter(&MediaProxy.is_url_proxiable?(&1))
+    |> MediaProxy.put_in_deleted_urls()
+  end
+
   defp lock_attachments(_, _), do: :ok
 
   # we should delete 1 object for any given attachment, but don't delete