diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-18 04:01:26 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-18 04:01:26 +0000 |
| commit | cd019a5927059bb52447add43a9b29893928c416 (patch) | |
| tree | f9a78a61375bb9074664dd9e9925c797ce05b732 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 3f38a055715a8140524f4f55073d5b936d076fb4 (diff) | |
| parent | ecdf0657ba4a90d821d3874c827593963e0ff041 (diff) | |
| download | pleroma-cd019a5927059bb52447add43a9b29893928c416.tar.gz | |
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index a8ef0a8ca..7e4ee317c 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -573,7 +573,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do {:ok, _activity} <- ActivityPub.accept(%{ to: [follower.ap_id], - actor: followed.ap_id, + actor: followed, object: follow_activity.data["id"], type: "Accept" }) do @@ -593,7 +593,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do {:ok, _activity} <- ActivityPub.reject(%{ to: [follower.ap_id], - actor: followed.ap_id, + actor: followed, object: follow_activity.data["id"], type: "Reject" }) do |