hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

See merge request pleroma/pleroma!1729
This commit is contained in:
kaniini 2019-09-27 07:54:08 +00:00
commit 68bf99baf2
5 changed files with 80 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/router.ex
View file

@ -346,7 +346,7 @@ defmodule Pleroma.Web.Router do
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", FilterController, :index)
@ -422,8 +422,8 @@ defmodule Pleroma.Web.Router do
post("/follow_requests/:id/authorize", MastodonAPIController, :authorize_follow_request)
post("/follow_requests/:id/reject", MastodonAPIController, :reject_follow_request)
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)