projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
[akkoma]
/
lib
/
pleroma
/
workers
/
attachments_cleanup_worker.ex
diff --git
a/lib/pleroma/workers/attachments_cleanup_worker.ex
b/lib/pleroma/workers/attachments_cleanup_worker.ex
index ce6998a548451b9228e6a42126ff79563a9ce532..2cbc6b64d3bc427e7af1fb17e5e6cf6de9f190ad 100644
(file)
--- 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
_ -> ""
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}")
file_path = String.trim_leading(href, "#{base_url}/#{prefix}")