diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-01-06 15:22:35 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-01-06 15:22:35 -0600 |
| commit | 1438fd958325c3d469315c478f06def9e4dd0de3 (patch) | |
| tree | 738e7e9ce8e0e0af89d9dff411191643cbf45aab /lib/pleroma/web/twitter_api/controller.ex | |
| parent | 2aeb229de3f59e1704c633c31415e7e834f6ba67 (diff) | |
| parent | 5e128a6be30563adc3b8a938aa68d18ac04cdfa0 (diff) | |
| download | pleroma-1438fd958325c3d469315c478f06def9e4dd0de3.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 | 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 |