mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-18 15:41:05 +00:00
Code Issues Projects Releases Wiki Activity

[#114] Removed flash messages rendering on redirects.

Browse source
This commit is contained in:
Ivan Tashkinov 2018-12-20 13:05:42 +03:00
parent 501ce34d7f
commit 8adcd1e80f
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file

@ -13,7 +13,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
require Logger require Logger
plug(:only_if_public_instance when action in [:public_timeline, :public_and_external_timeline]) plug(:only_if_public_instance when action in [:public_timeline, :public_and_external_timeline])
plug(:fetch_flash when action in [:confirm_email, :resend_confirmation_email])
action_fallback(:errors) action_fallback(:errors)
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
@ -390,7 +389,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change), changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change),
{:ok, _} <- User.update_and_set_cache(changeset) do {:ok, _} <- User.update_and_set_cache(changeset) do
conn conn
|> put_flash(:info, "Email confirmed. Please sign in.")
|> redirect(to: "/") |> redirect(to: "/")
end end
end end
@ -401,7 +399,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
with %User{} = user <- User.get_by_nickname_or_email(nickname_or_email), with %User{} = user <- User.get_by_nickname_or_email(nickname_or_email),
{:ok, _} <- User.try_send_confirmation_email(user) do {:ok, _} <- User.try_send_confirmation_email(user) do
conn conn
|> put_flash(:info, "Email confirmation has been sent.")
|> json_response(:no_content, "") |> json_response(:no_content, "")
end end
end end