diff options
| author | lain <lain@soykaf.club> | 2019-10-06 08:11:47 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-06 08:11:47 +0000 |
| commit | 61097ba6ab1f40f8a885f1adc96455b3c82cfd9b (patch) | |
| tree | 4ead08dab6a485b3020fb9f30663e4b4466698ae /lib/pleroma/web/common_api | |
| parent | 1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626 (diff) | |
| parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
| download | pleroma-61097ba6ab1f40f8a885f1adc96455b3c82cfd9b.tar.gz | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/common_api')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 4 |
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 995d4b1af..caf9371de 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]) @@ -290,7 +292,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}) |