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

Merge branch 'fix/attachments-cleanup' into 'develop'

Browse source 
Fix attachments cleanup with custom base_url

See merge request pleroma/pleroma!2154
This commit is contained in:
feld 2020-01-28 14:52:57 +00:00
commit d9cb8acd3e
2 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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}")