Deletions: change User.purge/1 to defp, add CHANGELOG entry

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52d92c6d2458e27f4ac162336a29ef444913b037..330802b290155e253c985b651a600581b0812d10 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Don't crash so hard when email settings are invalid.
 - Checking activated Upload Filters for required commands.
+- Remote users can no longer reappear after being deleted.
+- Deactivated users may now be deleted.
 - Mix task `pleroma.database prune_objects`
 
 ### Removed

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f5b12abad04f29bedc41b2439f629c8039059d45..62506f37ad6d29ef6e10ffb86cdb14651f9e8667 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1730,7 +1730,7 @@ defmodule Pleroma.User do
   # Purge doesn't delete the user from the database.
   # It just nulls all its fields and deactivates it.
   # See `User.purge_user_changeset/1` above.
-  def purge(%User{} = user) do
+  defp purge(%User{} = user) do
     user
     |> purge_user_changeset()
     |> update_and_set_cache()