aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-09-24 19:50:07 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-09-24 19:50:07 +0700
commit209395c7e60afe7115f22afd6936d9c6bdd7bb72 (patch)
tree73364c3a70ddd5de17c6af2fb43dfe468bc7a5ef /lib/pleroma/web/twitter_api
parent79b25be4e1e9e97277a831c98ccea86a038914de (diff)
downloadpleroma-209395c7e60afe7115f22afd6936d9c6bdd7bb72.tar.gz
Add User.change_info/2 and User.update_info/2
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 42234ae09..27f3664e0 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -5,7 +5,6 @@
defmodule Pleroma.Web.TwitterAPI.Controller do
use Pleroma.Web, :controller
- alias Ecto.Changeset
alias Pleroma.Notification
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
@@ -16,15 +15,14 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
action_fallback(:errors)
def confirm_email(conn, %{"user_id" => uid, "token" => token}) do
- with %User{} = user <- User.get_cached_by_id(uid),
true <- user.local,
true <- user.info.confirmation_pending,
true <- user.info.confirmation_token == token,
- info_change <- User.Info.confirmation_changeset(user.info, need_confirmation: false),
- changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change),
- {:ok, _} <- User.update_and_set_cache(changeset) do
conn
|> redirect(to: "/")
+ with %User{info: info} = user <- User.get_cached_by_id(uid),
+ {:ok, _} <-
+ User.update_info(user, &User.Info.confirmation_changeset(&1, need_confirmation: false)) do
end
end