hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More places we should be using Upload.base_url

Browse source
This commit is contained in:
Mark Felder 2021-01-08 17:05:55 -06:00
commit 86dcfb4eb9
3 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/workers/attachments_cleanup_worker.ex
View file

@ -32,21 +32,15 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
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(
Pleroma.Config.get([Pleroma.Upload, :base_url], Pleroma.Web.base_url()),
Pleroma.Upload.base_url(),
"/"
)
Enum.each(attachment_urls, fn href ->
href
|> String.trim_leading("#{base_url}/#{prefix}")
|> String.trim_leading("#{base_url}")
|> uploader.delete_file()
end)