logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 3e4f39116be3ac6954d643ee7b2f4b2c05625e91
parent: 14a762a213db0d00550c1421651ef689249c9c57
Author: kaniini <nenolod@gmail.com>
Date:   Fri,  7 Sep 2018 23:49:36 +0000

Merge branch 'feature/custom_media_url' into 'develop'

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

See merge request pleroma/pleroma!318

Diffstat:

Mconfig/config.exs4+++-
Mlib/pleroma/uploaders/local.ex6+++++-
2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/config.exs b/config/config.exs @@ -14,7 +14,9 @@ config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, 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, bucket: nil, diff --git a/lib/pleroma/uploaders/local.ex b/lib/pleroma/uploaders/local.ex @@ -42,6 +42,10 @@ defmodule Pleroma.Uploaders.Local do end 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