Add test for custom base_url when deleting an attachment

[akkoma] / lib / pleroma / workers / attachments_cleanup_worker.ex

diff --git a/lib/pleroma/workers/attachments_cleanup_worker.ex b/lib/pleroma/workers/attachments_cleanup_worker.ex
index 23720ec56559fa990293d0b9a90af6cd7936486a..2cbc6b64d3bc427e7af1fb17e5e6cf6de9f190ad 100644 (file)
--- a/lib/pleroma/workers/attachments_cleanup_worker.ex
+++ b/lib/pleroma/workers/attachments_cleanup_worker.ex
@@ -15,7 +15,7 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
         %{
           "op" => "cleanup_attachments",
           "object" => %{"data" => %{"attachment" => [_ | _] = attachments, "actor" => actor}}
-        } = data,
+        },
         _job
       ) do
     hrefs =
@@ -73,7 +73,11 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
               _ -> ""
             end
 
-          base_url = Pleroma.Config.get([__MODULE__, :base_url], Pleroma.Web.base_url())
+          base_url =
+            String.trim_trailing(
+              Pleroma.Config.get([Pleroma.Upload, :base_url], Pleroma.Web.base_url()),
+              "/"
+            )
 
           file_path = String.trim_leading(href, "#{base_url}/#{prefix}")