limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Fully delete users with status :approval_pending

Browse source
This commit is contained in:
Alex Gleason 2020-07-17 12:19:41 -05:00
parent 5e74556703
commit 5756843736
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/user.ex
View file

@ -1525,9 +1525,10 @@ defmodule Pleroma.User do
defp delete_or_deactivate(%User{local: true} = user) do defp delete_or_deactivate(%User{local: true} = user) do
status = account_status(user) status = account_status(user)
if status == :confirmation_pending do case status do
delete_and_invalidate_cache(user) :confirmation_pending -> delete_and_invalidate_cache(user)
else :approval_pending -> delete_and_invalidate_cache(user)
_ ->
user user
|> change(%{deactivated: true, email: nil}) |> change(%{deactivated: true, email: nil})
|> update_and_set_cache() |> update_and_set_cache()

11
test/user_test.exs
View file

@ -1314,6 +1314,17 @@ defmodule Pleroma.UserTest do
end end
end end
test "delete/1 when approval is pending deletes the user" do
user = insert(:user, approval_pending: true)
{:ok, user: user}
{:ok, job} = User.delete(user)
{:ok, _} = ObanHelpers.perform(job)
refute User.get_cached_by_id(user.id)
refute User.get_by_id(user.id)
end
test "get_public_key_for_ap_id fetches a user that's not in the db" do test "get_public_key_for_ap_id fetches a user that's not in the db" do
assert {:ok, _key} = User.get_public_key_for_ap_id("http://mastodon.example.org/users/admin") assert {:ok, _key} = User.get_public_key_for_ap_id("http://mastodon.example.org/users/admin")
end end