moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/custom_media_url' into 'develop' 

[Pleroma.Uploaders.Local]: Add configuration for custom url path

See merge request pleroma/pleroma!318
This commit is contained in:
kaniini 2018-09-07 23:49:36 +00:00
parent 14a762a213 754deb26dd
commit 3e4f39116b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.exs
View File

@ -14,7 +14,9 @@
uploader: Pleroma.Uploaders.Local, uploader: Pleroma.Uploaders.Local,
strip_exif: false strip_exif: false
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" config :pleroma, Pleroma.Uploaders.Local,
uploads: "uploads",
uploads_url: "{{base_url}}/media/{{file}}"
config :pleroma, Pleroma.Uploaders.S3, config :pleroma, Pleroma.Uploaders.S3,
bucket: nil, bucket: nil,

6
lib/pleroma/uploaders/local.ex
View File

@ -42,6 +42,10 @@ defp get_url(name, uuid, should_dedupe) do
end end
defp url_for(file) do defp url_for(file) do
"#{Web.base_url()}/media/#{file}" settings = Application.get_env(:pleroma, Pleroma.Uploaders.Local)
Keyword.get(settings, :uploads_url)
|> String.replace("{{file}}", file)
|> String.replace("{{base_url}}", Web.base_url())
end end
end end