Merge branch 'develop' into 'develop'

Fix HTTP sig tweak on KeyId

See merge request pleroma/pleroma!1496
This commit is contained in:
kaniini 2019-07-28 20:25:35 +00:00
commit 488c06b6f5

View file

@ -15,7 +15,7 @@ def key_id_to_actor_id(key_id) do
|> Map.put(:fragment, nil) |> Map.put(:fragment, nil)
uri = 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", "")) Map.put(uri, :path, String.replace(uri.path, "/publickey", ""))
else else
uri uri