diff options
| author | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 |
| commit | 44a86951a339fdb0146a237ca5178c83823629c7 (patch) | |
| tree | e38ad0c1ecf198a69762dfc95f158e649d9d4723 /lib/pleroma/web/twitter_api/controller.ex | |
| parent | 63923df0a51fdae58daf71a8dd85929a29ab1546 (diff) | |
| parent | 0ad6ea205711df9d1c634f0ad2dde6d432544318 (diff) | |
| download | pleroma-44a86951a339fdb0146a237ca5178c83823629c7.tar.gz | |
Merge branch 'develop' into refactor/approval_pending_user_field
Diffstat (limited to 'lib/pleroma/web/twitter_api/controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controller.ex b/lib/pleroma/web/twitter_api/controller.ex index 467c19e5e..077bfa70d 100644 --- a/lib/pleroma/web/twitter_api/controller.ex +++ b/lib/pleroma/web/twitter_api/controller.ex @@ -30,7 +30,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def confirm_email(conn, %{"user_id" => uid, "token" => token}) do with %User{} = user <- User.get_cached_by_id(uid), - true <- user.local and user.confirmation_pending and user.confirmation_token == token, + true <- user.local and !user.is_confirmed and user.confirmation_token == token, {:ok, _} <- User.confirm(user) do redirect(conn, to: "/") end |