From bf2107743ffcd3b7b9c32c49242f1dfd89dcfdb6 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 18 Oct 2019 03:26:50 +0000
Subject: [PATCH] object: containment: don't try to contain ostatus objects

---
 lib/pleroma/object/containment.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex
index f077a9f32..cd8623821 100644
--- a/lib/pleroma/object/containment.ex
+++ b/lib/pleroma/object/containment.ex
@@ -57,7 +57,9 @@ def contain_origin_from_id(id, %{"id" => other_id} = _params) do
     id_uri = URI.parse(id)
     other_uri = URI.parse(other_id)
 
-    if id_uri.host == other_uri.host do
+    # We explicitly allow 'tag' URIs through, due to legacy OStatus objects
+    # being present in the ActivityPub network.
+    if id_uri.host == other_uri.host || other_uri.scheme == "tag" do
       :ok
     else
       :error