Merge branch 'follow-request-count' into 'develop'

Follow request count See merge request pleroma/pleroma!817
2019-02-18 04:01:26 +00:00 · 2019-02-18 04:01:26 +00:00 · cd019a5927
commit cd019a5927
parent 3f38a05571 ecdf0657ba
9 changed files with 91 additions and 18 deletions
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@ -680,7 +680,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
         {:ok, _activity} <-
           ActivityPub.accept(%{
             to: [follower.ap_id],
-             actor: followed.ap_id,
+             actor: followed,
             object: follow_activity.data["id"],
             type: "Accept"
           }) do
@ -702,7 +702,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
         {:ok, _activity} <-
           ActivityPub.reject(%{
             to: [follower.ap_id],
-             actor: followed.ap_id,
+             actor: followed,
             object: follow_activity.data["id"],
             type: "Reject"
           }) do