Merge branch 'resilient-user-view' into 'develop'

[akkoma] / lib / pleroma / upload.ex

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 77cba2cd2fff9bdf64c57a5dfe75a3f565559786..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
@@ -214,4 +218,6 @@ defmodule Pleroma.Upload do
     [base_url, "media", path]
     |> Path.join()
   end
+
+  defp url_from_spec(_base_url, {:url, url}), do: url
 end