Browse Source

Purge a local user upon deletion, fixes #2062

matrix-explorations
Alex Gleason 3 years ago
parent
commit
d55faa2f8f
No known key found for this signature in database GPG Key ID: 7211D1F99744FBB7
2 changed files with 36 additions and 3 deletions
  1. +13
    -1
      lib/pleroma/user.ex
  2. +23
    -2
      test/web/admin_api/controllers/admin_api_controller_test.exs

+ 13
- 1
lib/pleroma/user.ex View File

@@ -1583,6 +1583,18 @@ defmodule Pleroma.User do
|> update_and_set_cache()
end

@spec purge_user_changeset(User.t()) :: Changeset.t()
def purge_user_changeset(user) do
change(user, %{
deactivated: true,
email: nil,
avatar: %{},
banner: %{},
background: %{},
fields: []
})
end

def delete(users) when is_list(users) do
for user <- users, do: delete(user)
end
@@ -1610,7 +1622,7 @@ defmodule Pleroma.User do

_ ->
user
|> change(%{deactivated: true, email: nil})
|> purge_user_changeset()
|> update_and_set_cache()
end
end


+ 23
- 2
test/web/admin_api/controllers/admin_api_controller_test.exs View File

@@ -155,13 +155,28 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do

describe "DELETE /api/pleroma/admin/users" do
test "single user", %{admin: admin, conn: conn} do
user = insert(:user)
clear_config([:instance, :federating], true)

user =
insert(:user,
avatar: %{"url" => [%{"href" => "https://someurl"}]},
banner: %{"url" => [%{"href" => "https://somebanner"}]}
)

# Create some activities to check they got deleted later
follower = insert(:user)
{:ok, _} = CommonAPI.post(user, %{status: "test"})
{:ok, _, _, _} = CommonAPI.follow(user, follower)
{:ok, _, _, _} = CommonAPI.follow(follower, user)
user = Repo.get(User, user.id)
assert user.note_count == 1
assert user.follower_count == 1
assert user.following_count == 1
refute user.deactivated

with_mock Pleroma.Web.Federator,
publish: fn _ -> nil end do
publish: fn _ -> nil end,
perform: fn _, _ -> nil end do
conn =
conn
|> put_req_header("accept", "application/json")
@@ -181,6 +196,12 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
user = Repo.get(User, user.id)
assert user.deactivated

assert user.avatar == %{}
assert user.banner == %{}
assert user.note_count == 0
assert user.follower_count == 0
assert user.following_count == 0

assert called(Pleroma.Web.Federator.publish(:_))
end
end


Loading…
Cancel
Save