projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into registration-workflow
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
auth_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
index 9f09550e1c97e372f1e812a336c46243d68e7fac..75b809aabf7c1767a64f05c38387130a92ea8ee0 100644
(file)
--- 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
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
alias Pleroma.User
alias Pleroma.Web.OAuth.App
alias Pleroma.Web.OAuth.Authorization
@@
-13,7
+15,7
@@
defmodule Pleroma.Web.MastodonAPI.AuthController do
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
- plug(Pleroma.Plugs.RateLimiter, [name: :password_reset] when action == :password_reset)
+ plug(Pleroma.
Web.
Plugs.RateLimiter, [name: :password_reset] when action == :password_reset)
@local_mastodon_name "Mastodon-Local"
@local_mastodon_name "Mastodon-Local"
@@
-61,9
+63,7
@@
defmodule Pleroma.Web.MastodonAPI.AuthController do
TwitterAPI.password_reset(nickname_or_email)
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
end
defp local_mastodon_root_path(conn) do