diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-05 19:46:23 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-05 19:46:23 +0000 |
| commit | 294e08cb65940ff193d6920e576f56718a5623f4 (patch) | |
| tree | 5113a78b25db1d3258d7e0c752946243b7563583 /lib/pleroma/web/common_api | |
| parent | 4168ead67290fce809c8c7bf671fd9de07079da6 (diff) | |
| parent | 565809592cf2618291cb59adf31aea7ed0ee78bb (diff) | |
| download | pleroma-294e08cb65940ff193d6920e576f56718a5623f4.tar.gz | |
Merge branch 'backport/update-activity-fixes' into 'maint/1.1'
backport update activity fixes to maint/1.1
See merge request pleroma/pleroma!1797
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 5faddc9f4..184ec6021 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -17,6 +17,8 @@ defmodule Pleroma.Web.CommonAPI do import Pleroma.Web.Gettext import Pleroma.Web.CommonAPI.Utils + require Pleroma.Constants + def follow(follower, followed) do with {:ok, follower} <- User.maybe_direct_follow(follower, followed), {:ok, activity} <- ActivityPub.follow(follower, followed), @@ -316,7 +318,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}) |