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 'pleroma/develop' into cycles-constants
[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 6f757f49ce008cecede0a29646f1369c6855eb52..a2f752ac3ce2836f46d08b8514423aadbab6e355 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,5
+1,5
@@
# 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
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator 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 = Utils.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 ->