diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-13 22:47:47 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-13 22:47:47 -0500 |
| commit | deb3f911366925bcc342a4a0deb44a2e7da7f1ba (patch) | |
| tree | c8e587198f64c4c5f991a05561943c6bd0af465b /lib/pleroma/object/containment.ex | |
| parent | 5e88796784e0ac2dbf57d9cf954fdc8ae8aeae43 (diff) | |
| parent | 173e977e283789a814278c63bc81f40a13942e21 (diff) | |
| download | pleroma-deb3f911366925bcc342a4a0deb44a2e7da7f1ba.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
Diffstat (limited to 'lib/pleroma/object/containment.ex')
| -rw-r--r-- | lib/pleroma/object/containment.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex index fb0398f92..040537acf 100644 --- a/lib/pleroma/object/containment.ex +++ b/lib/pleroma/object/containment.ex @@ -71,6 +71,14 @@ defmodule Pleroma.Object.Containment do compare_uris(id_uri, other_uri) end + # Mastodon pin activities don't have an id, so we check the object field, which will be pinned. + def contain_origin_from_id(id, %{"object" => object}) when is_binary(object) do + id_uri = URI.parse(id) + object_uri = URI.parse(object) + + compare_uris(id_uri, object_uri) + end + def contain_origin_from_id(_id, _data), do: :error def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}), |