summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-01-28 17:07:46 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-01-28 17:07:46 +0300
commit804a702f97e7294feb3d4bdb527a461c40c05d80 (patch)
treed51910a36e23e9ea702559982574ba7407667c63
parentdea968463de1139f0d6b6ff59298b1920f58f2f3 (diff)
Fix base_url string trimming
-rw-r--r--lib/pleroma/workers/attachments_cleanup_worker.ex6
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 c6a033e9c..4f7a1a193 100644
--- a/lib/pleroma/workers/attachments_cleanup_worker.ex
+++ b/lib/pleroma/workers/attachments_cleanup_worker.ex
@@ -75,7 +75,11 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
_ -> ""
end
- base_url = Pleroma.Config.get([Pleroma.Upload, :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}")