Merge branch 'bugfix/ap-uri-user-search' into 'develop'

transmogrifier: do not try to contain origin of something which doesn't have one

Closes #340

See merge request pleroma/pleroma!389
This commit is contained in:
kaniini 2018-10-25 04:38:46 +00:00
commit 9e9b1bd5ea

View file

@ -37,6 +37,8 @@ def get_actor(%{"actor" => nil, "attributedTo" => actor}) when not is_nil(actor)
@doc """
Checks that an imported AP object's actor matches the domain it came from.
"""
def contain_origin(id, %{"actor" => nil}), do: :error
def contain_origin(id, %{"actor" => actor} = params) do
id_uri = URI.parse(id)
actor_uri = URI.parse(get_actor(params))