Merge branch 'chore/fix-spelling' into 'develop'

[akkoma] / lib / pleroma / helpers / uri_helper.ex

diff --git a/lib/pleroma/helpers/uri_helper.ex b/lib/pleroma/helpers/uri_helper.ex
index 8a79b44c4cc238fa33993b13ebe190fcdfee9a61..69d8c8fe018dfb399764dec2eee25ad16bc8e0ef 100644 (file)
--- a/lib/pleroma/helpers/uri_helper.ex
+++ b/lib/pleroma/helpers/uri_helper.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Helpers.UriHelper do
@@ -24,4 +24,7 @@ defmodule Pleroma.Helpers.UriHelper do
       params
     end
   end
+
+  def maybe_add_base("/" <> uri, base), do: Path.join([base, uri])
+  def maybe_add_base(uri, _base), do: uri
 end