add Markers /api/v1/markers

[akkoma] / lib / pleroma / web / common_api / common_api.ex

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 677a53ddfb8a37471d7d8245c25f8e8619b51cbf..386408d51f24a7127be51caee97d319f1a5673bb 100644 (file)
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -16,6 +16,8 @@ defmodule Pleroma.Web.CommonAPI do
   import Pleroma.Web.Gettext
   import Pleroma.Web.CommonAPI.Utils
 
+  require Pleroma.Constants
+
   def follow(follower, followed) do
     timeout = Pleroma.Config.get([:activitypub, :follow_handshake_timeout])
 
@@ -80,7 +82,7 @@ defmodule Pleroma.Web.CommonAPI do
     with %Activity{} = activity <- get_by_id_or_ap_id(id_or_ap_id),
          object <- Object.normalize(activity),
          nil <- Utils.get_existing_announce(user.ap_id, object),
-         public <- get_announce_visibility(object, params) do
+         public <- public_announce?(object, params) do
       ActivityPub.announce(user, object, nil, true, public)
     else
       _ -> {:error, dgettext("errors", "Could not repeat")}
@@ -170,11 +172,11 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
-  def get_announce_visibility(_, %{"visibility" => visibility})
+  def public_announce?(_, %{"visibility" => visibility})
       when visibility in ~w{public unlisted private direct},
       do: visibility in ~w(public unlisted)
 
-  def get_announce_visibility(object, _) do
+  def public_announce?(object, _) do
     Visibility.is_public?(object)
   end
 
@@ -271,7 +273,7 @@ defmodule Pleroma.Web.CommonAPI do
 
     ActivityPub.update(%{
       local: true,
-      to: [user.follower_address],
+      to: [Pleroma.Constants.as_public(), user.follower_address],
       cc: [],
       actor: user.ap_id,
       object: Pleroma.Web.ActivityPub.UserView.render("user.json", %{user: user})