From: kaniini <ariadne@dereferenced.org>
Date: Fri, 27 Sep 2019 07:54:54 +0000 (+0000)
Subject: Merge branch 'split-masto-api/follow-requests' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=92d08d4113c4de09cd8d736ed1a0349745866eef;p=akkoma

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

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

See merge request pleroma/pleroma!1730
---

92d08d4113c4de09cd8d736ed1a0349745866eef
diff --cc lib/pleroma/web/router.ex
index 731bec323,72d3827a5..a025474e2
--- a/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)