nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Alex Gleason 2021-06-30 12:25:20 -05:00
parent 99cc26bb02
commit 310ef6b70d
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -26,6 +26,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed ### Fixed
- Don't crash so hard when email settings are invalid. - Don't crash so hard when email settings are invalid.
- Checking activated Upload Filters for required commands. - 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` - Mix task `pleroma.database prune_objects`
### Removed ### Removed

2
lib/pleroma/user.ex
View file

@ -1730,7 +1730,7 @@ def purge_user_changeset(user) do
# Purge doesn't delete the user from the database. # Purge doesn't delete the user from the database.
# It just nulls all its fields and deactivates it. # It just nulls all its fields and deactivates it.
# See `User.purge_user_changeset/1` above. # See `User.purge_user_changeset/1` above.
def purge(%User{} = user) do defp purge(%User{} = user) do
user user
|> purge_user_changeset() |> purge_user_changeset()
|> update_and_set_cache() |> update_and_set_cache()