Merge branch 'main' into production

bookwyrm/migrations/0151_auto_20220705_0049.py

@@ -0,0 +1,90 @@
+# Generated by Django 3.2.13 on 2022-07-05 00:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0150_readthrough_stopped_date"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="notification",
+            name="related_book",
+        ),
+        migrations.AddField(
+            model_name="notification",
+            name="related_list_items",
+            field=models.ManyToManyField(
+                related_name="notifications", to="bookwyrm.ListItem"
+            ),
+        ),
+        migrations.AddField(
+            model_name="notification",
+            name="related_reports",
+            field=models.ManyToManyField(to="bookwyrm.Report"),
+        ),
+        migrations.AddField(
+            model_name="notification",
+            name="related_users",
+            field=models.ManyToManyField(
+                related_name="notifications", to=settings.AUTH_USER_MODEL
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="related_list_item",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="notifications_tmp",
+                to="bookwyrm.listitem",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="related_report",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="notifications_tmp",
+                to="bookwyrm.report",
+            ),
+        ),
+        migrations.RunSQL(
+            sql="""
+            INSERT INTO bookwyrm_notification_related_users (notification_id, user_id)
+            SELECT id, related_user_id
+            FROM bookwyrm_notification
+                WHERE bookwyrm_notification.related_user_id IS NOT NULL;
+
+            INSERT INTO bookwyrm_notification_related_list_items (notification_id, listitem_id)
+            SELECT id, related_list_item_id
+            FROM bookwyrm_notification
+                WHERE bookwyrm_notification.related_list_item_id IS NOT NULL;
+
+            INSERT INTO bookwyrm_notification_related_reports (notification_id, report_id)
+            SELECT id, related_report_id
+            FROM bookwyrm_notification
+                WHERE bookwyrm_notification.related_report_id IS NOT NULL;
+
+            """,
+            reverse_sql=migrations.RunSQL.noop,
+        ),
+        migrations.RemoveField(
+            model_name="notification",
+            name="related_list_item",
+        ),
+        migrations.RemoveField(
+            model_name="notification",
+            name="related_report",
+        ),
+        migrations.RemoveField(
+            model_name="notification",
+            name="related_user",
+        ),
+    ]

bookwyrm/migrations/0152_remove_notification_notification_type_valid.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.13 on 2022-07-05 03:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0151_auto_20220705_0049"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="notification",
+            name="notification_type_valid",
+        ),
+    ]

bookwyrm/migrations/0153_merge_20220706_2141.py

@@ -0,0 +1,13 @@
+# Generated by Django 3.2.13 on 2022-07-06 21:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0152_alter_report_user"),
+        ("bookwyrm", "0152_remove_notification_notification_type_valid"),
+    ]
+
+    operations = []

bookwyrm/models/antispam.py

@@ -3,7 +3,7 @@
 import operator
 
 from django.apps import apps
-from django.db import models
+from django.db import models, transaction
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
@@ -58,25 +58,20 @@ def automod_task():
         return
     reporter = AutoMod.objects.first().created_by
     reports = automod_users(reporter) + automod_statuses(reporter)
-    if reports:
-        admins = User.objects.filter(
-            models.Q(user_permissions__name__in=["moderate_user", "moderate_post"])
-            | models.Q(is_superuser=True)
-        ).all()
-        notification_model = apps.get_model(
-            "bookwyrm", "Notification", require_ready=True
-        )
+    if not reports:
+        return
+
+    admins = User.objects.filter(
+        models.Q(user_permissions__name__in=["moderate_user", "moderate_post"])
+        | models.Q(is_superuser=True)
+    ).all()
+    notification_model = apps.get_model("bookwyrm", "Notification", require_ready=True)
+    with transaction.atomic():
         for admin in admins:
-            notification_model.objects.bulk_create(
-                [
-                    notification_model(
-                        user=admin,
-                        related_report=r,
-                        notification_type="REPORT",
-                    )
-                    for r in reports
-                ]
+            notification, _ = notification_model.objects.get_or_create(
+                user=admin, notification_type=notification_model.REPORT, read=False
             )
+            notification.related_repors.add(reports)
 
 
 def automod_users(reporter):

bookwyrm/models/group.py

@@ -140,42 +140,31 @@ def save(self, *args, **kwargs):
         # make an invitation
         super().save(*args, **kwargs)
 
-        # now send the invite
-        model = apps.get_model("bookwyrm.Notification", require_ready=True)
-        notification_type = "INVITE"
-        model.objects.create(
-            user=self.user,
-            related_user=self.group.user,
-            related_group=self.group,
-            notification_type=notification_type,
-        )
-
     @transaction.atomic
     def accept(self):
         """turn this request into the real deal"""
         GroupMember.from_request(self)
 
         model = apps.get_model("bookwyrm.Notification", require_ready=True)
         # tell the group owner
-        model.objects.create(
-            user=self.group.user,
-            related_user=self.user,
+        model.notify(
+            self.group.user,
+            self.user,
             related_group=self.group,
-            notification_type="ACCEPT",
+            notification_type=model.ACCEPT,
         )
 
         # let the other members know about it
         for membership in self.group.memberships.all():
             member = membership.user
             if member not in (self.user, self.group.user):
-                model.objects.create(
-                    user=member,
-                    related_user=self.user,
+                model.notify(
+                    member,
+                    self.user,
                     related_group=self.group,
-                    notification_type="JOIN",
+                    notification_type=model.JOIN,
                 )
 
     def reject(self):
         """generate a Reject for this membership request"""
-
         self.delete()

bookwyrm/models/list.py

@@ -1,7 +1,6 @@
 """ make a list of books!! """
 import uuid
 
-from django.apps import apps
 from django.core.exceptions import PermissionDenied
 from django.db import models
 from django.db.models import Q
@@ -151,34 +150,12 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     collection_field = "book_list"
 
     def save(self, *args, **kwargs):
-        """create a notification too"""
-        created = not bool(self.id)
+        """Update the list's date"""
         super().save(*args, **kwargs)
         # tick the updated date on the parent list
         self.book_list.updated_date = timezone.now()
         self.book_list.save(broadcast=False, update_fields=["updated_date"])
 
-        list_owner = self.book_list.user
-        model = apps.get_model("bookwyrm.Notification", require_ready=True)
-        # create a notification if somoene ELSE added to a local user's list
-        if created and list_owner.local and list_owner != self.user:
-            model.objects.create(
-                user=list_owner,
-                related_user=self.user,
-                related_list_item=self,
-                notification_type="ADD",
-            )
-
-        if self.book_list.group:
-            for membership in self.book_list.group.memberships.all():
-                if membership.user != self.user:
-                    model.objects.create(
-                        user=membership.user,
-                        related_user=self.user,
-                        related_list_item=self,
-                        notification_type="ADD",
-                    )
-
     def raise_not_deletable(self, viewer):
         """the associated user OR the list owner can delete"""
         if self.book_list.user == viewer: