X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fbuilder.ex;h=51b74414ac6b8404426d2a459932f94dc249fa19;hb=a7627bdc7ae67a5c103f968eea02d6b1cf1ef8da;hp=63f89c2b4fed0baf79728b0aa03a2c79f89c5a35;hpb=17a8342c1e2bd615edb8e41535aa96c1b22d440a;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/builder.ex b/lib/pleroma/web/activity_pub/builder.ex
index 63f89c2b4..51b74414a 100644
--- a/lib/pleroma/web/activity_pub/builder.ex
+++ b/lib/pleroma/web/activity_pub/builder.ex
@@ -7,9 +7,12 @@ defmodule Pleroma.Web.ActivityPub.Builder do
 
   alias Pleroma.Object
   alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.Relay
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.ActivityPub.Visibility
 
+  require Pleroma.Constants
+
   @spec emoji_react(User.t(), Object.t(), String.t()) :: {:ok, map(), keyword()}
   def emoji_react(actor, object, emoji) do
     with {:ok, data, meta} <- object_action(actor, object) do
@@ -83,8 +86,21 @@ defmodule Pleroma.Web.ActivityPub.Builder do
     end
   end
 
-  def announce(actor, object) do
-    to = [actor.follower_address, object.data["actor"]]
+  @spec announce(User.t(), Object.t(), keyword()) :: {:ok, map(), keyword()}
+  def announce(actor, object, options \\ []) do
+    public? = Keyword.get(options, :public, false)
+
+    to =
+      cond do
+        actor.ap_id == Relay.relay_ap_id() ->
+          [actor.follower_address]
+
+        public? ->
+          [actor.follower_address, object.data["actor"], Pleroma.Constants.as_public()]
+
+        true ->
+          [actor.follower_address, object.data["actor"]]
+      end
 
     {:ok,
      %{
@@ -93,7 +109,8 @@ defmodule Pleroma.Web.ActivityPub.Builder do
        "object" => object.data["id"],
        "to" => to,
        "context" => object.data["context"],
-       "type" => "Announce"
+       "type" => "Announce",
+       "published" => Utils.make_date()
      }, []}
   end