projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into global-status-expiration
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
delete_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
index 256ac70b613df31795f4e5db143c150bc1b2faf3..f42c035105444a8b48eefa53389bdff4c3ab7d0a 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
@@
-20,7
+20,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.DeleteValidator do
field(:actor, Types.ObjectID)
field(:to, Types.Recipients, default: [])
field(:cc, Types.Recipients, default: [])
field(:actor, Types.ObjectID)
field(:to, Types.Recipients, default: [])
field(:cc, Types.Recipients, default: [])
- field(:deleted_activity_id)
+ field(:deleted_activity_id
, Types.ObjectID
)
field(:object, Types.ObjectID)
end
field(:object, Types.ObjectID)
end
@@
-51,6
+51,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.DeleteValidator do
Page
Question
Video
Page
Question
Video
+ Tombstone
}
def validate_data(cng) do
cng
}
def validate_data(cng) do
cng
@@
-67,19
+68,17
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.DeleteValidator do
end
defp same_domain?(cng) do
end
defp same_domain?(cng) do
- actor_
domain
=
+ actor_
uri
=
cng
|> get_field(:actor)
|> URI.parse()
cng
|> get_field(:actor)
|> URI.parse()
- |> (& &1.host).()
- object_
domain
=
+ object_
uri
=
cng
|> get_field(:object)
|> URI.parse()
cng
|> get_field(:object)
|> URI.parse()
- |> (& &1.host).()
- object_
domain == actor_domain
+ object_
uri.host == actor_uri.host
end
def validate_deletion_rights(cng) do
end
def validate_deletion_rights(cng) do