projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
announce_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
index 40f861f477b83d64dc72d7893bc6bccc72e89daf..5763417903056c2f79f994bf4cc806f049276a20 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
@@
-1,13
+1,13
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
use Ecto.Schema
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
use Ecto.Schema
+ alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.User
- alias Pleroma.Web.ActivityPub.ObjectValidators.Types
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Visibility
@@
-19,14
+19,14
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
@primary_key false
embedded_schema do
@primary_key false
embedded_schema do
- field(:id,
Type
s.ObjectID, primary_key: true)
+ field(:id,
ObjectValidator
s.ObjectID, primary_key: true)
field(:type, :string)
field(:type, :string)
- field(:object,
Type
s.ObjectID)
- field(:actor,
Type
s.ObjectID)
+ field(:object,
ObjectValidator
s.ObjectID)
+ field(:actor,
ObjectValidator
s.ObjectID)
field(:context, :string, autogenerate: {Utils, :generate_context_id, []})
field(:context, :string, autogenerate: {Utils, :generate_context_id, []})
- field(:to,
Type
s.Recipients, default: [])
- field(:cc,
Type
s.Recipients, default: [])
- field(:published,
Type
s.DateTime)
+ field(:to,
ObjectValidator
s.Recipients, default: [])
+ field(:cc,
ObjectValidator
s.Recipients, default: [])
+ field(:published,
ObjectValidator
s.DateTime)
end
def cast_and_validate(data) do
end
def cast_and_validate(data) do
@@
-50,7
+50,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
cng
end
cng
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Announce"])
|> validate_required([:id, :type, :object, :actor, :to, :cc])
data_cng
|> validate_inclusion(:type, ["Announce"])
|> validate_required([:id, :type, :object, :actor, :to, :cc])
@@
-67,7
+67,12
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
%Object{} = object <- Object.get_cached_by_ap_id(object),
false <- Visibility.is_public?(object) do
same_actor = object.data["actor"] == actor.ap_id
%Object{} = object <- Object.get_cached_by_ap_id(object),
false <- Visibility.is_public?(object) do
same_actor = object.data["actor"] == actor.ap_id
- is_public = Pleroma.Constants.as_public() in (get_field(cng, :to) ++ get_field(cng, :cc))
+ recipients = get_field(cng, :to) ++ get_field(cng, :cc)
+ local_public = Pleroma.Constants.as_local_public()
+
+ is_public =
+ Enum.member?(recipients, Pleroma.Constants.as_public()) or
+ Enum.member?(recipients, local_public)
cond do
same_actor && is_public ->
cond do
same_actor && is_public ->