pleroma

commit: 9e9b1bd5ea31352025dfe2f8138eedd1092a325e
parent: 79b1e4465f5c1ffd17a676d1eb1fc537143f7785
Author: kaniini <nenolod@gmail.com>
Date:   Thu, 25 Oct 2018 04:38:46 +0000

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
Diffstat:
M
lib/pleroma/web/activity_pub/transmogrifier.ex
2
++

1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -37,6 +37,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   @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))