diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
| commit | 04b514c567aa664d2606313d17be69e665a7f1af (patch) | |
| tree | 13f46fd39d8a90837b031b1081b7e20696d6823a /lib/pleroma/web/mastodon_api/controllers | |
| parent | 55562ca9362d66553ea3638c91174bbeb6c637f1 (diff) | |
| parent | d239bd3ca4348d38c12ab54c7e2e9cb2b825cc3c (diff) | |
| download | pleroma-04b514c567aa664d2606313d17be69e665a7f1af.tar.gz | |
Merge branch 'develop' into feature/gen-magic
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/auth_controller.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex index 9f09550e1..57c0be5fe 100644 --- a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex @@ -5,6 +5,8 @@ defmodule Pleroma.Web.MastodonAPI.AuthController do use Pleroma.Web, :controller + import Pleroma.Web.ControllerHelper, only: [json_response: 3] + alias Pleroma.User alias Pleroma.Web.OAuth.App alias Pleroma.Web.OAuth.Authorization @@ -61,9 +63,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthController do TwitterAPI.password_reset(nickname_or_email) - conn - |> put_status(:no_content) - |> json("") + json_response(conn, :no_content, "") end defp local_mastodon_root_path(conn) do |