diff options
| author | feld <feld@feld.me> | 2020-01-28 14:52:57 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-28 14:52:57 +0000 |
| commit | d9cb8acd3e43f2b3502f2b08ce469483c67789f6 (patch) | |
| tree | d9820c0f25a2d2ab7606de30597a095a194969fc /lib | |
| parent | ffa9e3a2ce7c9fee281aae429052eb6e1d736239 (diff) | |
| parent | d18a2e4e360bd6e630101a7dd2f4ae0902ac43a1 (diff) | |
| download | pleroma-d9cb8acd3e43f2b3502f2b08ce469483c67789f6.tar.gz | |
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/workers/attachments_cleanup_worker.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/workers/attachments_cleanup_worker.ex b/lib/pleroma/workers/attachments_cleanup_worker.ex index a738df90a..2cbc6b64d 100644 --- a/lib/pleroma/workers/attachments_cleanup_worker.ex +++ b/lib/pleroma/workers/attachments_cleanup_worker.ex @@ -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}") |