Merge branch 'develop' into 'develop'

Fix HTTP sig tweak on KeyId See merge request pleroma/pleroma!1496
2019-07-28 20:25:35 +00:00 · 2019-07-28 20:25:35 +00:00 · 488c06b6f5
commit 488c06b6f5
parent f78390ffdf 961e778531
1 changed files with 1 additions and 1 deletions
--- a/lib/pleroma/signature.ex
+++ b/lib/pleroma/signature.ex
@ -15,7 +15,7 @@ def key_id_to_actor_id(key_id) do
      |> Map.put(:fragment, nil)

    uri =
-      if String.ends_with?(uri.path, "/publickey") do
+      if not is_nil(uri.path) and String.ends_with?(uri.path, "/publickey") do
        Map.put(uri, :path, String.replace(uri.path, "/publickey", ""))
      else
        uri