diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-07-17 12:19:41 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-07-17 12:19:41 -0500 |
commit | 57568437361dd14151e3aa0590c7d1da05141cf4 (patch) | |
tree | 2199989e3772031e5c45f7f046f5126b99ace86f /lib | |
parent | 5e745567031e87ee0854dca8d10065449af27d9c (diff) | |
download | pleroma-57568437361dd14151e3aa0590c7d1da05141cf4.tar.gz |
Fully delete users with status :approval_pending
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/user.ex | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 8e2c9fbe2..23288d434 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1525,12 +1525,13 @@ defmodule Pleroma.User do defp delete_or_deactivate(%User{local: true} = user) do status = account_status(user) - if status == :confirmation_pending do - delete_and_invalidate_cache(user) - else - user - |> change(%{deactivated: true, email: nil}) - |> update_and_set_cache() + case status do + :confirmation_pending -> delete_and_invalidate_cache(user) + :approval_pending -> delete_and_invalidate_cache(user) + _ -> + user + |> change(%{deactivated: true, email: nil}) + |> update_and_set_cache() end end |