Fix base_url string trimming

2020-01-28 17:07:46 +03:00 · 2020-01-28 17:07:46 +03:00 · 804a702f97
parent dea968463d
commit 804a702f97
1 changed files with 5 additions and 1 deletions
--- 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}")