Merge branch 'split-masto-api/follow-requests' into 'develop'

Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

See merge request pleroma/pleroma!1730

diff --cc lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 731bec323ddb352d72daee2c21793408496097ff,72d3827a587517dcf39c0ed6ca9838a1f5a0a367..a025474e2b40f6ab64b9ef273c49a55efb640bf6
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -419,11 -419,11 +419,11 @@@ defmodule Pleroma.Web.Router d
        post("/accounts/:id/mute", MastodonAPIController, :mute)
        post("/accounts/:id/unmute", MastodonAPIController, :unmute)
  
-       post("/follow_requests/:id/authorize", MastodonAPIController, :authorize_follow_request)
-       post("/follow_requests/:id/reject", MastodonAPIController, :reject_follow_request)
+       post("/follow_requests/:id/authorize", FollowRequestController, :authorize)
+       post("/follow_requests/:id/reject", FollowRequestController, :reject)
  
 -      post("/domain_blocks", MastodonAPIController, :block_domain)
 -      delete("/domain_blocks", MastodonAPIController, :unblock_domain)
 +      post("/domain_blocks", DomainBlockController, :create)
 +      delete("/domain_blocks", DomainBlockController, :delete)
  
        post("/pleroma/accounts/:id/subscribe", MastodonAPIController, :subscribe)
        post("/pleroma/accounts/:id/unsubscribe", MastodonAPIController, :unsubscribe)

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge