projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Isolate OAuth.Token.CleanWorker
[akkoma]
/
lib
/
pleroma
/
upload.ex
diff --git
a/lib/pleroma/upload.ex
b/lib/pleroma/upload.ex
index f7233493024259489c44a78826985442f111a19c..9f0adde5b1da66ad07b8b812774784e698f829a0 100644
(file)
--- a/
lib/pleroma/upload.ex
+++ b/
lib/pleroma/upload.ex
@@
-4,7
+4,7
@@
defmodule Pleroma.Upload do
@moduledoc """
defmodule Pleroma.Upload do
@moduledoc """
- # Upload
+ Manage user uploads
Options:
* `:type`: presets for activity type (defaults to Document) and size limits from app configuration
Options:
* `:type`: presets for activity type (defaults to Document) and size limits from app configuration
@@
-228,7
+228,14
@@
defmodule Pleroma.Upload do
""
end
""
end
- [base_url, "media", path]
+ prefix =
+ if is_nil(Pleroma.Config.get([__MODULE__, :base_url])) do
+ "media"
+ else
+ ""
+ end
+
+ [base_url, prefix, path]
|> Path.join()
end
|> Path.join()
end