projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into gun
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
domain_block_controller.ex
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 03db6c9b838d82b1569a85bb1e485dc2a027f0e4..e4156cbe6f5661f4e665900e8eb44a6a65213eb3 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex
@@
-1,15
+1,28
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.DomainBlockController do
use Pleroma.Web, :controller
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.DomainBlockController do
use Pleroma.Web, :controller
+ alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
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"
@doc "GET /api/v1/domain_blocks"
- def index(%{assigns: %{user:
%{info: info}
}} = conn, _) do
- json(conn, Map.get(
info
, :domain_blocks, []))
+ def index(%{assigns: %{user:
user
}} = conn, _) do
+ json(conn, Map.get(
user
, :domain_blocks, []))
end
@doc "POST /api/v1/domain_blocks"
end
@doc "POST /api/v1/domain_blocks"