diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-23 13:56:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-23 13:56:50 +0300 |
| commit | 8f5589cf667d8dd24da07e58db94225d81a55a7b (patch) | |
| tree | 7598cf8c495f0d02b3a4704a79e8618bd9652fee /lib/pleroma/web/mastodon_api/controllers | |
| parent | b0bd81ef7187ddf5b4e6cfbc1780fc60b65798c6 (diff) | |
| parent | a5e1c400e49e7979e70f2c9dd4887ae144dca44c (diff) | |
| download | pleroma-8f5589cf667d8dd24da07e58db94225d81a55a7b.tar.gz | |
Merge develop
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 |