Merge branch 'fix/1658-invite-send' into 'develop'

[akkoma] / lib / pleroma / object / containment.ex

diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex
index 25aa32f60743dc21fef01e1184539b3b70a77638..99608b8a5540c68e367158e89590bc0c123ffc1b 100644 (file)
--- a/lib/pleroma/object/containment.ex
+++ b/lib/pleroma/object/containment.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.Object.Containment do
@@ -32,6 +32,18 @@ defmodule Pleroma.Object.Containment do
     get_actor(%{"actor" => actor})
   end
 
+  def get_object(%{"object" => id}) when is_binary(id) do
+    id
+  end
+
+  def get_object(%{"object" => %{"id" => id}}) when is_binary(id) do
+    id
+  end
+
+  def get_object(_) do
+    nil
+  end
+
   # TODO: We explicitly allow 'tag' URIs through, due to references to legacy OStatus
   # objects being present in the test suite environment.  Once these objects are
   # removed, please also remove this.
@@ -39,15 +51,8 @@ defmodule Pleroma.Object.Containment do
     defp compare_uris(_, %URI{scheme: "tag"}), do: :ok
   end
 
-  defp compare_uris(%URI{} = id_uri, %URI{} = other_uri) do
-    if id_uri.host == other_uri.host do
-      :ok
-    else
-      :error
-    end
-  end
-
-  defp compare_uris(_, _), do: :error
+  defp compare_uris(%URI{host: host} = _id_uri, %URI{host: host} = _other_uri), do: :ok
+  defp compare_uris(_id_uri, _other_uri), do: :error
 
   @doc """
   Checks that an imported AP object's actor matches the domain it came from.