diff options
author | Ariadne Conill <ariadne@dereferenced.org> | 2019-11-08 14:51:28 -0600 |
---|---|---|
committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-11-08 14:51:28 -0600 |
commit | 5b60d82592e3fd19646add354de4cde903abf38c (patch) | |
tree | 7b57a9d5fff7c75ee0757b4cdd11716f5182e271 /lib | |
parent | 5cbb1cd5502d3953a6f29d86d59dba547d12fee8 (diff) | |
download | pleroma-5b60d82592e3fd19646add354de4cde903abf38c.tar.gz |
object containment: handle all cases where ID is invalid (missing, nil, non-string)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/object/containment.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex index 68535c09e..a1f9c1250 100644 --- a/lib/pleroma/object/containment.ex +++ b/lib/pleroma/object/containment.ex @@ -64,15 +64,15 @@ defmodule Pleroma.Object.Containment do def contain_origin(id, %{"attributedTo" => actor} = params), do: contain_origin(id, Map.put(params, "actor", actor)) - def contain_origin_from_id(_id, %{"id" => nil}), do: :error - - def contain_origin_from_id(id, %{"id" => other_id} = _params) do + def contain_origin_from_id(id, %{"id" => other_id} = _params) when is_binary(other_id) do id_uri = URI.parse(id) other_uri = URI.parse(other_id) compare_uris(id_uri, other_uri) end + def contain_origin_from_id(_id, _data), do: :error + def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}), do: contain_origin(id, object) |