projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More places we should be using Upload.base_url
[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 58226b395ef21501284bbe162dae307028ca4933..69758e8c178ded88b29b7f0e753d62ddb50a75e2 100644
(file)
--- a/
lib/pleroma/workers/attachments_cleanup_worker.ex
+++ b/
lib/pleroma/workers/attachments_cleanup_worker.ex
@@
-32,21
+32,15
@@
defmodule Pleroma.Workers.AttachmentsCleanupWorker do
defp do_clean({object_ids, attachment_urls}) do
uploader = Pleroma.Config.get([Pleroma.Upload, :uploader])
defp do_clean({object_ids, attachment_urls}) do
uploader = Pleroma.Config.get([Pleroma.Upload, :uploader])
- prefix =
- case Pleroma.Config.get([Pleroma.Upload, :base_url]) do
- nil -> "media"
- _ -> ""
- end
-
base_url =
String.trim_trailing(
base_url =
String.trim_trailing(
- Pleroma.
Config.get([Pleroma.Upload, :base_url], Pleroma.Web.base_url()
),
+ Pleroma.
Upload.base_url(
),
"/"
)
Enum.each(attachment_urls, fn href ->
href
"/"
)
Enum.each(attachment_urls, fn href ->
href
- |> String.trim_leading("#{base_url}
/#{prefix}
")
+ |> String.trim_leading("#{base_url}")
|> uploader.delete_file()
end)
|> uploader.delete_file()
end)