diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-13 10:08:07 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-13 10:08:07 +0000 |
| commit | 1025c526c003460e62ddfff09ba65461feceb1f6 (patch) | |
| tree | a10219d324c0046040115b808fde581abc3c166c /lib | |
| parent | fb090b748ab7ec3740008017f419e210405e2633 (diff) | |
| parent | e835cd97f6988522dae8f60a0381f0f93c6abb2d (diff) | |
| download | pleroma-1025c526c003460e62ddfff09ba65461feceb1f6.tar.gz | |
Merge branch 'bugfix/1360-actorless-posts' into 'develop'
Containment: Add a catch-all clause to contain_origin.
Closes #1360
See merge request pleroma/pleroma!1975
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/object/containment.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex index a1f9c1250..25aa32f60 100644 --- a/lib/pleroma/object/containment.ex +++ b/lib/pleroma/object/containment.ex @@ -64,6 +64,8 @@ defmodule Pleroma.Object.Containment do def contain_origin(id, %{"attributedTo" => actor} = params), do: contain_origin(id, Map.put(params, "actor", actor)) + def contain_origin(_id, _data), do: :error + 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) |