hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix compile warnings

Browse source
This commit is contained in:
Maksim Pechnikov 2018-12-09 12:12:48 +03:00
commit 074fa790ba
53 changed files with 203 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/pleroma/upload.ex
View file

@ -128,19 +128,18 @@ defmodule Pleroma.Upload do
opts
end
opts =
if Pleroma.Config.get([:instance, :dedupe_media]) == true &&
!Enum.member?(opts.filters, Pleroma.Upload.Filter.Dedupe) do
Logger.warn("""
Pleroma: configuration `:instance, :dedupe_media` is deprecated, please instead set:
if Pleroma.Config.get([:instance, :dedupe_media]) == true &&
!Enum.member?(opts.filters, Pleroma.Upload.Filter.Dedupe) do
Logger.warn("""
Pleroma: configuration `:instance, :dedupe_media` is deprecated, please instead set:
:pleroma, Pleroma.Upload, [filters: [Pleroma.Upload.Filter.Dedupe]]
""")
:pleroma, Pleroma.Upload, [filters: [Pleroma.Upload.Filter.Dedupe]]
""")
Map.put(opts, :filters, opts.filters ++ [Pleroma.Upload.Filter.Dedupe])
else
opts
end
Map.put(opts, :filters, opts.filters ++ [Pleroma.Upload.Filter.Dedupe])
else
opts
end
end
defp prepare_upload(%Plug.Upload{} = file, opts) do
@ -215,8 +214,4 @@ defmodule Pleroma.Upload do
[base_url, "media", path]
|> Path.join()
end
defp url_from_spec({:url, url}) do
url
end
end