diff options
author | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:02:48 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:02:48 +0300 |
commit | e2fe796c63f9df18d30810ad9daa1e7027da120f (patch) | |
tree | 442579a03ba1b4d034c80113babbd13f20ba69ac /lib/pleroma/upload.ex | |
parent | faf238c1b0b4d814ce3b2e041ed6b18b498233bf (diff) | |
download | pleroma-e2fe796c63f9df18d30810ad9daa1e7027da120f.tar.gz |
Add some tests
Diffstat (limited to 'lib/pleroma/upload.ex')
-rw-r--r-- | lib/pleroma/upload.ex | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index ae461d434..f72334930 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -70,7 +70,7 @@ defmodule Pleroma.Upload do %{ "type" => "Link", "mediaType" => upload.content_type, - "href" => url_from_spec(opts.base_url, url_spec, upload.name) + "href" => url_from_spec(upload, opts.base_url, url_spec) } ], "name" => Map.get(opts, :description) || upload.name @@ -219,12 +219,18 @@ defmodule Pleroma.Upload do tmp_path end - defp url_from_spec(base_url, {:file, path}, name) do - path = URI.encode(path, &char_unescaped?/1) <> "?name=#{URI.encode(name, &char_unescaped?/1)}" + defp url_from_spec(%__MODULE__{name: name}, base_url, {:file, path}) do + path = + URI.encode(path, &char_unescaped?/1) <> + if Pleroma.Config.get([__MODULE__, :link_name], false) do + "?name=#{URI.encode(name, &char_unescaped?/1)}" + else + "" + end [base_url, "media", path] |> Path.join() end - defp url_from_spec(_base_url, {:url, url}, _name), do: url + defp url_from_spec(_upload, _base_url, {:url, url}), do: url end |