diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2019-10-18 03:26:50 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-10-18 14:50:10 +0000 |
| commit | bf2107743ffcd3b7b9c32c49242f1dfd89dcfdb6 (patch) | |
| tree | ca48c162c937b7697761f8c7355a5e9e471393a4 /lib | |
| parent | 85ddcaf418bd24722ea222e0fe19d538675ee784 (diff) | |
| download | pleroma-bf2107743ffcd3b7b9c32c49242f1dfd89dcfdb6.tar.gz | |
object: containment: don't try to contain ostatus objects
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/object/containment.ex | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ defmodule Pleroma.Object.Containment 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 |