From b34a49117263d9136e94669d9edef5bd04ae8df2 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 22 Oct 2023 15:34:25 +1100 Subject: [PATCH] run black --- .../migrations/0183_auto_20231021_2050.py | 77 +++++++++++++++---- ...184_sitesettings_user_import_time_limit.py | 6 +- bookwyrm/models/bookwyrm_export_job.py | 4 +- bookwyrm/models/bookwyrm_import_job.py | 2 +- bookwyrm/models/notification.py | 19 ++++- bookwyrm/settings.py | 2 +- bookwyrm/views/__init__.py | 2 +- bookwyrm/views/admin/imports.py | 9 ++- bookwyrm/views/imports/import_data.py | 12 ++- bookwyrm/views/preferences/export.py | 10 ++- 10 files changed, 111 insertions(+), 32 deletions(-) diff --git a/bookwyrm/migrations/0183_auto_20231021_2050.py b/bookwyrm/migrations/0183_auto_20231021_2050.py index 201a9201a..c960fe5bd 100644 --- a/bookwyrm/migrations/0183_auto_20231021_2050.py +++ b/bookwyrm/migrations/0183_auto_20231021_2050.py @@ -7,28 +7,79 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0182_merge_20230905_2240'), + ("bookwyrm", "0182_merge_20230905_2240"), ] operations = [ migrations.AddField( - model_name='notification', - name='related_user_export', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.bookwyrmexportjob'), + model_name="notification", + name="related_user_export", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="bookwyrm.bookwyrmexportjob", + ), ), migrations.AlterField( - model_name='childjob', - name='status', - field=models.CharField(choices=[('pending', 'Pending'), ('active', 'Active'), ('complete', 'Complete'), ('stopped', 'Stopped'), ('failed', 'Failed')], default='pending', max_length=50, null=True), + model_name="childjob", + name="status", + field=models.CharField( + choices=[ + ("pending", "Pending"), + ("active", "Active"), + ("complete", "Complete"), + ("stopped", "Stopped"), + ("failed", "Failed"), + ], + default="pending", + max_length=50, + null=True, + ), ), migrations.AlterField( - model_name='notification', - name='notification_type', - field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import'), ('USER_IMPORT', 'User Import'), ('USER_EXPORT', 'User Export'), ('ADD', 'Add'), ('REPORT', 'Report'), ('LINK_DOMAIN', 'Link Domain'), ('INVITE', 'Invite'), ('ACCEPT', 'Accept'), ('JOIN', 'Join'), ('LEAVE', 'Leave'), ('REMOVE', 'Remove'), ('GROUP_PRIVACY', 'Group Privacy'), ('GROUP_NAME', 'Group Name'), ('GROUP_DESCRIPTION', 'Group Description')], max_length=255), + model_name="notification", + name="notification_type", + field=models.CharField( + choices=[ + ("FAVORITE", "Favorite"), + ("REPLY", "Reply"), + ("MENTION", "Mention"), + ("TAG", "Tag"), + ("FOLLOW", "Follow"), + ("FOLLOW_REQUEST", "Follow Request"), + ("BOOST", "Boost"), + ("IMPORT", "Import"), + ("USER_IMPORT", "User Import"), + ("USER_EXPORT", "User Export"), + ("ADD", "Add"), + ("REPORT", "Report"), + ("LINK_DOMAIN", "Link Domain"), + ("INVITE", "Invite"), + ("ACCEPT", "Accept"), + ("JOIN", "Join"), + ("LEAVE", "Leave"), + ("REMOVE", "Remove"), + ("GROUP_PRIVACY", "Group Privacy"), + ("GROUP_NAME", "Group Name"), + ("GROUP_DESCRIPTION", "Group Description"), + ], + max_length=255, + ), ), migrations.AlterField( - model_name='parentjob', - name='status', - field=models.CharField(choices=[('pending', 'Pending'), ('active', 'Active'), ('complete', 'Complete'), ('stopped', 'Stopped'), ('failed', 'Failed')], default='pending', max_length=50, null=True), + model_name="parentjob", + name="status", + field=models.CharField( + choices=[ + ("pending", "Pending"), + ("active", "Active"), + ("complete", "Complete"), + ("stopped", "Stopped"), + ("failed", "Failed"), + ], + default="pending", + max_length=50, + null=True, + ), ), ] diff --git a/bookwyrm/migrations/0184_sitesettings_user_import_time_limit.py b/bookwyrm/migrations/0184_sitesettings_user_import_time_limit.py index a23161db1..24b4dad37 100644 --- a/bookwyrm/migrations/0184_sitesettings_user_import_time_limit.py +++ b/bookwyrm/migrations/0184_sitesettings_user_import_time_limit.py @@ -6,13 +6,13 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0183_auto_20231021_2050'), + ("bookwyrm", "0183_auto_20231021_2050"), ] operations = [ migrations.AddField( - model_name='sitesettings', - name='user_import_time_limit', + model_name="sitesettings", + name="user_import_time_limit", field=models.IntegerField(default=48), ), ] diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 96e602cc9..65f209905 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -43,7 +43,9 @@ def start_export_task(**kwargs): except Exception as err: # pylint: disable=broad-except logger.exception("User Export Job %s Failed with error: %s", job.id, err) job.set_status("failed") - job.set_status("complete") # need to explicitly set this here to trigger notifications + job.set_status( + "complete" + ) # need to explicitly set this here to trigger notifications job.save(update_fields=["export_data"]) diff --git a/bookwyrm/models/bookwyrm_import_job.py b/bookwyrm/models/bookwyrm_import_job.py index 73372829b..6e71aa4b5 100644 --- a/bookwyrm/models/bookwyrm_import_job.py +++ b/bookwyrm/models/bookwyrm_import_job.py @@ -65,7 +65,7 @@ def start_import_task(**kwargs): process_books(job, tar) - job.set_status("complete") # set here to trigger notifications + job.set_status("complete") # set here to trigger notifications job.save() archive_file.close() diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py index 4c420a2e1..c8140bce9 100644 --- a/bookwyrm/models/notification.py +++ b/bookwyrm/models/notification.py @@ -2,7 +2,14 @@ from django.db import models, transaction from django.dispatch import receiver from .base_model import BookWyrmModel -from . import Boost, Favorite, GroupMemberInvitation, ImportJob, BookwyrmImportJob, LinkDomain +from . import ( + Boost, + Favorite, + GroupMemberInvitation, + ImportJob, + BookwyrmImportJob, + LinkDomain, +) from bookwyrm.models.bookwyrm_export_job import BookwyrmExportJob from . import ListItem, Report, Status, User, UserFollowRequest @@ -64,7 +71,9 @@ class Notification(BookWyrmModel): ) related_status = models.ForeignKey("Status", on_delete=models.CASCADE, null=True) related_import = models.ForeignKey("ImportJob", on_delete=models.CASCADE, null=True) - related_user_export = models.ForeignKey("BookwyrmExportJob", on_delete=models.CASCADE, null=True) + related_user_export = models.ForeignKey( + "BookwyrmExportJob", on_delete=models.CASCADE, null=True + ) related_list_items = models.ManyToManyField( "ListItem", symmetrical=False, related_name="notifications" ) @@ -226,6 +235,7 @@ def notify_user_on_import_complete( related_import=instance, ) + @receiver(models.signals.post_save, sender=BookwyrmImportJob) # pylint: disable=unused-argument def notify_user_on_user_import_complete( @@ -236,10 +246,10 @@ def notify_user_on_user_import_complete( if not instance.complete or "complete" not in update_fields: return Notification.objects.create( - user=instance.user, - notification_type=Notification.USER_IMPORT + user=instance.user, notification_type=Notification.USER_IMPORT ) + @receiver(models.signals.post_save, sender=BookwyrmExportJob) # pylint: disable=unused-argument def notify_user_on_user_export_complete( @@ -257,6 +267,7 @@ def notify_user_on_user_export_complete( related_user_export=instance, ) + @receiver(models.signals.post_save, sender=Report) @transaction.atomic # pylint: disable=unused-argument diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index f74ef0093..9a4c9b5a4 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -422,4 +422,4 @@ if HTTP_X_FORWARDED_PROTO: # Mastodon servers. # Do not change this setting unless you already have an existing # user with the same username - in which case you should change it! -INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" \ No newline at end of file +INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index d98dffdcc..2746ab9f9 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -17,7 +17,7 @@ from .admin.imports import ( enable_imports, set_import_size_limit, set_user_import_completed, - set_user_import_limit + set_user_import_limit, ) from .admin.ip_blocklist import IPBlocklist from .admin.invite import ManageInvites, Invite, InviteRequest diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py index 4da7acf0e..a85d6c79e 100644 --- a/bookwyrm/views/admin/imports.py +++ b/bookwyrm/views/admin/imports.py @@ -40,9 +40,9 @@ class ImportList(View): paginated = Paginator(imports, PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) - user_imports = models.BookwyrmImportJob.objects.filter(complete=complete).order_by( - "created_date" - ) + user_imports = models.BookwyrmImportJob.objects.filter( + complete=complete + ).order_by("created_date") user_paginated = Paginator(user_imports, PAGE_LENGTH) user_page = user_paginated.get_page(request.GET.get("page")) @@ -105,6 +105,7 @@ def set_import_size_limit(request): site.save(update_fields=["import_size_limit", "import_limit_reset"]) return redirect("settings-imports") + @require_POST @login_required @permission_required("bookwyrm.moderate_user", raise_exception=True) @@ -124,4 +125,4 @@ def set_user_import_limit(request): site = models.SiteSettings.objects.get() site.user_import_time_limit = int(request.POST.get("limit")) site.save(update_fields=["user_import_time_limit"]) - return redirect("settings-imports") \ No newline at end of file + return redirect("settings-imports") diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index 4fd50d9ce..1a9085ce1 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -144,8 +144,16 @@ class UserImport(View): ) site = models.SiteSettings.objects.get() hours = site.user_import_time_limit - allowed = jobs.first().created_date < timezone.now() - datetime.timedelta(hours=hours) if jobs.first() else True - next_available = jobs.first().created_date + datetime.timedelta(hours=hours) if not allowed else False + allowed = ( + jobs.first().created_date < timezone.now() - datetime.timedelta(hours=hours) + if jobs.first() + else True + ) + next_available = ( + jobs.first().created_date + datetime.timedelta(hours=hours) + if not allowed + else False + ) paginated = Paginator(jobs, PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = { diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 5e70f896e..037b8dbdc 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -105,8 +105,14 @@ class ExportUser(View): ) site = models.SiteSettings.objects.get() hours = site.user_import_time_limit - allowed = jobs.first().created_date < timezone.now() - timedelta(hours=hours) if jobs.first() else True - next_available = jobs.first().created_date + timedelta(hours=hours) if not allowed else False + allowed = ( + jobs.first().created_date < timezone.now() - timedelta(hours=hours) + if jobs.first() + else True + ) + next_available = ( + jobs.first().created_date + timedelta(hours=hours) if not allowed else False + ) paginated = Paginator(jobs, PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = {