summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-06-30 12:25:20 -0500
committerAlex Gleason <alex@alexgleason.me>2021-06-30 12:25:20 -0500
commit310ef6b70d9ca18d857f43677d857d09d91ffe0e (patch)
tree807326efe8c7ca883bf4479a12e5c450e84d77eb
parent99cc26bb02f2ac7ab26aa761ee5427406830a778 (diff)
Deletions: change User.purge/1 to defp, add CHANGELOG entry
-rw-r--r--CHANGELOG.md2
-rw-r--r--lib/pleroma/user.ex2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52d92c6d2..330802b29 100644
--- 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 f5b12abad..62506f37a 100644
--- 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()