diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-07-23 12:59:40 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-07-23 12:59:40 -0500 |
commit | 4bfad0b483957acf755a043f33799742997da859 (patch) | |
tree | dd8d69b838823d2ddff4353333550a836ad331b9 /lib | |
parent | bdb3375933b17ffd596d9d870d797fcc47a4828b (diff) | |
download | pleroma-4bfad0b483957acf755a043f33799742997da859.tar.gz |
Support blocking via query parameters as well and document the change.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/api_spec/operations/domain_block_operation.ex | 3 | ||||
-rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/web/api_spec/operations/domain_block_operation.ex b/lib/pleroma/web/api_spec/operations/domain_block_operation.ex index 8234394f9..1e0da8209 100644 --- a/lib/pleroma/web/api_spec/operations/domain_block_operation.ex +++ b/lib/pleroma/web/api_spec/operations/domain_block_operation.ex @@ -31,6 +31,7 @@ defmodule Pleroma.Web.ApiSpec.DomainBlockOperation do } end + # Supporting domain query parameter is deprecated in Mastodon API def create_operation do %Operation{ tags: ["domain_blocks"], @@ -45,11 +46,13 @@ defmodule Pleroma.Web.ApiSpec.DomainBlockOperation do """, operationId: "DomainBlockController.create", requestBody: domain_block_request(), + parameters: [Operation.parameter(:domain, :query, %Schema{type: :string}, "Domain name")], security: [%{"oAuth" => ["follow", "write:blocks"]}], responses: %{200 => empty_object_response()} } end + # Supporting domain query parameter is deprecated in Mastodon API def delete_operation do %Operation{ tags: ["domain_blocks"], 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 117e89426..9c2d093cd 100644 --- a/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex @@ -32,6 +32,11 @@ defmodule Pleroma.Web.MastodonAPI.DomainBlockController do json(conn, %{}) end + def create(%{assigns: %{user: blocker}} = conn, %{domain: domain}) do + User.block_domain(blocker, domain) + json(conn, %{}) + end + @doc "DELETE /api/v1/domain_blocks" def delete(%{assigns: %{user: blocker}, body_params: %{domain: domain}} = conn, _params) do User.unblock_domain(blocker, domain) |