projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OpenAPI spec for AdminAPI.UserController
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controller.ex
diff --git
a/lib/pleroma/web/twitter_api/controller.ex
b/lib/pleroma/web/twitter_api/controller.ex
index 16f43863ce6a959bf8dd12c5a8c9c3bc8d71695d..077bfa70d5661db507bcfd106abd5e9460540a8f 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.Controller do
# 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),
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
{:ok, _} <- User.confirm(user) do
redirect(conn, to: "/")
end