aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-10-07 15:41:41 +0300
committerMaxim Filippov <colixer@gmail.com>2019-10-07 15:41:41 +0300
commit35068baf65f1be9ac4e5ae8d08222244ae823fcc (patch)
tree0ed0b88fd100fb3df83400c147ab9a6a88d53c73 /lib/pleroma/web/common_api
parent7aceaa517be7b109a9acc15fb4914535b536b66c (diff)
parent0a99f1e8c5551dcf170722e5087a0401b2d907af (diff)
downloadpleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.tar.gz
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 2b80598ea..e5d399d02 100644
--- 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])
@@ -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})