diff options
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 8f660a334..a0b51da89 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -84,7 +84,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end def announce(%User{ap_id: _} = user, %Object{data: %{"id" => _}} = object, activity_id \\ nil, local \\ true) do - with announce_data <- make_announce_data(user, object, activity_id), + with true <- is_public?(object), + announce_data <- make_announce_data(user, object, activity_id), {:ok, activity} <- insert(announce_data, local), {:ok, object} <- add_announce_to_object(activity, object), :ok <- maybe_federate(activity) do @@ -316,9 +317,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end end - def visible_for_user?(activity, nil) do + def is_public?(activity) do "https://www.w3.org/ns/activitystreams#Public" in (activity.data["to"] ++ (activity.data["cc"] || [])) end + + def visible_for_user?(activity, nil) do + is_public?(activity) + end def visible_for_user?(activity, user) do x = [user.ap_id | user.following] y = (activity.data["to"] ++ (activity.data["cc"] || [])) |