diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-12-30 17:10:02 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-12-30 17:10:02 -0600 |
| commit | cbce88007672dc810cb345bb9872a009cbdc93d8 (patch) | |
| tree | 45be2517812f2a598d9b6133554038a87d4b9f46 /lib/pleroma/web/twitter_api/controller.ex | |
| parent | 83770b7b391fdf8bdc22f63047b1cf444a7b16ce (diff) | |
| parent | 38924166eb3228deb71a2e23f1e8fd3255c6bd85 (diff) | |
| download | pleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into aliases
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 |