Merge branch 'maintenance/copyright-2019' into 'develop'

[akkoma] / lib / pleroma / upload.ex

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index bf2c60102cedafb8a4d0581faab065fe8f204306..0b1bdeec4733f2117d39b3d63349893f57924dfb 100644 (file)
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Upload do
   @moduledoc """
   # Upload
@@ -128,19 +132,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
@@ -216,7 +219,5 @@ defmodule Pleroma.Upload do
     |> Path.join()
   end
 
-  defp url_from_spec({:url, url}) do
-    url
-  end
+  defp url_from_spec(_base_url, {:url, url}), do: url
 end