diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 |
| commit | 35068baf65f1be9ac4e5ae8d08222244ae823fcc (patch) | |
| tree | 0ed0b88fd100fb3df83400c147ab9a6a88d53c73 /lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex | |
| parent | 7aceaa517be7b109a9acc15fb4914535b536b66c (diff) | |
| parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
| download | pleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.tar.gz | |
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex b/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex index 03db6c9b8..c7606246b 100644 --- a/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex @@ -5,8 +5,21 @@ defmodule Pleroma.Web.MastodonAPI.DomainBlockController do use Pleroma.Web, :controller + alias Pleroma.Plugs.OAuthScopesPlug alias Pleroma.User + plug( + OAuthScopesPlug, + %{scopes: ["follow", "read:blocks"]} when action == :index + ) + + plug( + OAuthScopesPlug, + %{scopes: ["follow", "write:blocks"]} when action != :index + ) + + plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug) + @doc "GET /api/v1/domain_blocks" def index(%{assigns: %{user: %{info: info}}} = conn, _) do json(conn, Map.get(info, :domain_blocks, [])) |