projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/1.1.5' into 'stable'
[akkoma]
/
lib
/
pleroma
/
object
/
containment.ex
diff --git
a/lib/pleroma/object/containment.ex
b/lib/pleroma/object/containment.ex
index ada9da0bb6de7a0bdcb144b789223b939bd5deb9..5f9d7523101f68c445264b180e9737520da3c136 100644
(file)
--- a/
lib/pleroma/object/containment.ex
+++ b/
lib/pleroma/object/containment.ex
@@
-48,9
+48,10
@@
defmodule Pleroma.Object.Containment do
end
end
end
end
- def contain_origin_from_id(_id, %{"id" => nil}), do: :error
+ def contain_origin(id, %{"attributedTo" => actor} = params),
+ do: contain_origin(id, Map.put(params, "actor", actor))
- 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)
id_uri = URI.parse(id)
other_uri = URI.parse(other_id)
@@
-60,4
+61,11
@@
defmodule Pleroma.Object.Containment do
:error
end
end
:error
end
end
+
+ def contain_origin_from_id(_id, _data), do: :error
+
+ def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}),
+ do: contain_origin(id, object)
+
+ def contain_child(_), do: :ok
end
end