-
-
Notifications
You must be signed in to change notification settings - Fork 264
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into check-version-number
- Loading branch information
Showing
45 changed files
with
481 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
""" Erase any data stored about deleted users """ | ||
import sys | ||
from django.core.management.base import BaseCommand, CommandError | ||
from bookwyrm import models | ||
from bookwyrm.models.user import erase_user_data | ||
|
||
# pylint: disable=missing-function-docstring | ||
class Command(BaseCommand): | ||
"""command-line options""" | ||
|
||
help = "Remove Two Factor Authorisation from user" | ||
|
||
def add_arguments(self, parser): # pylint: disable=no-self-use | ||
parser.add_argument( | ||
"--dryrun", | ||
action="store_true", | ||
help="Preview users to be cleared without altering the database", | ||
) | ||
|
||
def handle(self, *args, **options): # pylint: disable=unused-argument | ||
|
||
# Check for anything fishy | ||
bad_state = models.User.objects.filter(is_deleted=True, is_active=True) | ||
if bad_state.exists(): | ||
raise CommandError( | ||
f"{bad_state.count()} user(s) marked as both active and deleted" | ||
) | ||
|
||
deleted_users = models.User.objects.filter(is_deleted=True) | ||
self.stdout.write(f"Found {deleted_users.count()} deleted users") | ||
if options["dryrun"]: | ||
self.stdout.write("\n".join(u.username for u in deleted_users[:5])) | ||
if deleted_users.count() > 5: | ||
self.stdout.write("... and more") | ||
sys.exit() | ||
|
||
self.stdout.write("Erasing user data:") | ||
for user_id in deleted_users.values_list("id", flat=True): | ||
erase_user_data.delay(user_id) | ||
self.stdout.write(".", ending="") | ||
|
||
self.stdout.write("") | ||
self.stdout.write("Tasks created successfully") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
bookwyrm/migrations/0192_sitesettings_user_exports_enabled.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 3.2.23 on 2024-01-16 10:28 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("bookwyrm", "0191_merge_20240102_0326"), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name="sitesettings", | ||
name="user_exports_enabled", | ||
field=models.BooleanField(default=False), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.