Merge branch 'split-masto-api/domain-blocks' into 'develop'

Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request pleroma/pleroma!1729

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

diff --cc lib/pleroma/web/router.ex
index b1003fffaa84262b9d892e39f5b2e54733dab023,d370f30db2550a5455de0b3267328c146b0da4d7..731bec323ddb352d72daee2c21793408496097ff
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -346,9 -346,9 +346,9 @@@ defmodule Pleroma.Web.Router d
        get("/lists/:id", ListController, :show)
        get("/lists/:id/accounts", ListController, :list_accounts)
  
-       get("/domain_blocks", MastodonAPIController, :domain_blocks)
+       get("/domain_blocks", DomainBlockController, :index)
  
 -      get("/filters", MastodonAPIController, :get_filters)
 +      get("/filters", FilterController, :index)
  
        get("/suggestions", MastodonAPIController, :suggestions)
  

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