projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chore/fix-changelog' 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 c6a033e9cf6512286fe43ebc81bf5c5837541f7e..3c5820a866ab93fc83cc5abd0d39d53199cd2564 100644
(file)
--- a/
lib/pleroma/workers/attachments_cleanup_worker.ex
+++ b/
lib/pleroma/workers/attachments_cleanup_worker.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.AttachmentsCleanupWorker do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.AttachmentsCleanupWorker do
@@
-8,8
+8,6
@@
defmodule Pleroma.Workers.AttachmentsCleanupWorker do
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.Object
alias Pleroma.Repo
- require Logger
-
use Pleroma.Workers.WorkerHelper, queue: "attachments_cleanup"
@impl Oban.Worker
use Pleroma.Workers.WorkerHelper, queue: "attachments_cleanup"
@impl Oban.Worker
@@
-75,11
+73,14
@@
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}")
- Logger.warn("Deleting file #{file_path} (orig: #{href}, base_url: #{base_url})")
uploader.delete_file(file_path)
end
uploader.delete_file(file_path)
end