From 3fd27954122655f7a18bb75f35ad129024796010 Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Wed, 3 Jun 2020 14:56:54 +0300
Subject: [PATCH] fix purge script

---
 installation/nginx-cache-purge.sh.example         | 5 +++--
 lib/pleroma/web/activity_pub/activity_pub.ex      | 2 +-
 lib/pleroma/workers/attachments_cleanup_worker.ex | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/installation/nginx-cache-purge.sh.example b/installation/nginx-cache-purge.sh.example
index b2915321c..83a3a6df2 100755
--- a/installation/nginx-cache-purge.sh.example
+++ b/installation/nginx-cache-purge.sh.example
@@ -13,7 +13,7 @@ CACHE_DIRECTORY="/tmp/pleroma-media-cache"
 ## $3 - (optional) the number of parallel processes to run for grep.
 get_cache_files() {
     local max_parallel=${3-16}
-    find $2 -maxdepth 2 -type d | xargs -P $max_parallel -n 1 grep -E Rl "^KEY:.*$1" | sort -u
+    find $2 -maxdepth 2 -type d | xargs -P $max_parallel -n 1 grep -E -Rl "^KEY:.*$1" | sort -u
 }
 
 ## Removes an item from the given cache zone.
@@ -33,8 +33,9 @@ purge() {
   do
     echo "$SCRIPTNAME delete \`$url\` from cache ($CACHE_DIRECTORY)"
     purge_item $url $CACHE_DIRECTORY
+    echo "\n"
   done
 
 }
 
-purge $1
+purge $@
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 6e407103f..c49972e8d 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -302,7 +302,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
          :ok <- maybe_federate(activity) do
       {:ok, activity}
     else
-      {type, true, activity} when type in [:fake, :quick_insert] ->
+      {error, true, activity} when error in [:fake, :quick_insert] ->
         {:ok, activity}
 
       {:error, message} ->
diff --git a/lib/pleroma/workers/attachments_cleanup_worker.ex b/lib/pleroma/workers/attachments_cleanup_worker.ex
index e2a37a942..170bca976 100644
--- a/lib/pleroma/workers/attachments_cleanup_worker.ex
+++ b/lib/pleroma/workers/attachments_cleanup_worker.ex
@@ -75,7 +75,7 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
 
   defp delete_objects(_), do: :ok
 
-  defp cache_purge(true, urls), do: MediaProxy.Invalidation.purge(urls)
+  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)