diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-04-29 11:14:32 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-04-29 11:14:32 -0500 |
| commit | 762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0 (patch) | |
| tree | 0416ef7020ba2b333cb223200d7108928f714fde /lib/pleroma/web/twitter_api/controller.ex | |
| parent | b7b05a074867c1444dd539d6d2331f6d5504f6e6 (diff) | |
| parent | 115673bce773f91630c3bd4fd2d0023f92bee163 (diff) | |
| download | pleroma-762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into block-behavior
Diffstat (limited to 'lib/pleroma/web/twitter_api/controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/controller.ex b/lib/pleroma/web/twitter_api/controller.ex index 16f43863c..077bfa70d 100644 --- a/lib/pleroma/web/twitter_api/controller.ex +++ b/lib/pleroma/web/twitter_api/controller.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.TwitterAPI.Controller do @@ -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 |