hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make User.confirm/1 and User.approve/1 idempotent

Browse source
This commit is contained in:
Alex Gleason 2020-10-12 16:42:59 -05:00
commit cb29769a22
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/user.ex
View file

@ -1590,7 +1590,7 @@ defmodule Pleroma.User do
end)
end
def approve(%User{} = user) do
def approve(%User{approval_pending: true} = user) do
with chg <- change(user, approval_pending: false),
{:ok, user} <- update_and_set_cache(chg) do
post_register_action(user)
@ -1598,6 +1598,8 @@ defmodule Pleroma.User do
end
end
def approve(%User{} = user), do: {:ok, user}
def confirm(users) when is_list(users) do
Repo.transaction(fn ->
Enum.map(users, fn user ->
@ -1606,7 +1608,7 @@ defmodule Pleroma.User do
end)
end
def confirm(%User{} = user) do
def confirm(%User{confirmation_pending: true} = user) do
with chg <- confirmation_changeset(user, need_confirmation: false),
{:ok, user} <- update_and_set_cache(chg) do
post_register_action(user)
@ -1614,6 +1616,8 @@ defmodule Pleroma.User do
end
end
def confirm(%User{} = user), do: {:ok, user}
def update_notification_settings(%User{} = user, settings) do
user
|> cast(%{notification_settings: settings}, [])