diff options
| author | feld <feld@feld.me> | 2020-12-17 16:00:30 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-12-17 16:00:30 +0000 |
| commit | ff7f7416f70591439579fd370aaebd4fb4b21249 (patch) | |
| tree | 915321403b8a1639fa317b72d438b8a61a0eb090 /lib/pleroma/web/twitter_api/controller.ex | |
| parent | 8b8c317c0ff1534d3296369ba315b8919e8dc55c (diff) | |
| parent | 80891e83d8df25b742a321d2c837e38c805e6582 (diff) | |
| download | pleroma-ff7f7416f70591439579fd370aaebd4fb4b21249.tar.gz | |
Merge branch 'registration-workflow' into 'develop'
Improve registration workflow, fixes #2175
Closes #2235 and #2175
See merge request pleroma/pleroma!3068
Diffstat (limited to 'lib/pleroma/web/twitter_api/controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controller.ex | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/controller.ex b/lib/pleroma/web/twitter_api/controller.ex index f42dba442..16f43863c 100644 --- a/lib/pleroma/web/twitter_api/controller.ex +++ b/lib/pleroma/web/twitter_api/controller.ex @@ -31,10 +31,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, - {:ok, _} <- - user - |> User.confirmation_changeset(need_confirmation: false) - |> User.update_and_set_cache() do + {:ok, _} <- User.confirm(user) do redirect(conn, to: "/") end end |