projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
media proxy: good enough wip
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index fc7f210969eae6f2e72b8a968afab5e55fa78863..82887966c257469d87247f9d8229c7c4f33044ba 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-559,7
+559,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
def login(conn, _) do
conn
def login(conn, _) do
conn
- |> render(MastodonView, "login.html")
+ |> render(MastodonView, "login.html"
, %{error: false}
)
end
defp get_or_make_app() do
end
defp get_or_make_app() do
@@
-581,6
+581,10
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
conn
|> put_session(:oauth_token, token.token)
|> redirect(to: "/web/getting-started")
conn
|> put_session(:oauth_token, token.token)
|> redirect(to: "/web/getting-started")
+ else
+ _e ->
+ conn
+ |> render(MastodonView, "login.html", %{error: "Wrong username or password"})
end
end
end
end