hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup Pleroma.User

Browse source
This commit is contained in:
Egor Kislitsyn 2019-09-24 14:14:34 +07:00
commit 1bea67cb5e
3 changed files with 108 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,14 +15,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
action_fallback(:errors)
def confirm_email(conn, %{"user_id" => uid, "token" => token}) do
true <- user.local,
true <- user.info.confirmation_pending,
true <- user.info.confirmation_token == token,
conn
|> redirect(to: "/")
with %User{info: info} = user <- User.get_cached_by_id(uid),
true <- user.local and info.confirmation_pending and info.confirmation_token == token,
{:ok, _} <-
User.update_info(user, &User.Info.confirmation_changeset(&1, need_confirmation: false)) do
redirect(conn, to: "/")
end
end