Merge branch 'main' into user-creation

bookwyrm/models/favorite.py

@@ -1,4 +1,5 @@
 ''' like/fav/star a status '''
+from django.apps import apps
 from django.db import models
 from django.utils import timezone
 
@@ -22,6 +23,30 @@ class Favorite(ActivityMixin, BookWyrmModel):
         self.user.save(broadcast=False)
         super().save(*args, **kwargs)
 
+        if self.status.user.local and self.status.user != self.user:
+            notification_model = apps.get_model(
+                'bookwyrm.Notification', require_ready=True)
+            notification_model.objects.create(
+                user=self.status.user,
+                notification_type='FAVORITE',
+                related_user=self.user,
+                related_status=self.status
+            )
+
+    def delete(self, *args, **kwargs):
+        ''' delete and delete notifications '''
+        # check for notification
+        if self.status.user.local:
+            notification_model = apps.get_model(
+                'bookwyrm.Notification', require_ready=True)
+            notification = notification_model.objects.filter(
+                user=self.status.user, related_user=self.user,
+                related_status=self.status, notification_type='FAVORITE'
+            ).first()
+            if notification:
+                notification.delete()
+        super().delete(*args, **kwargs)
+
     class Meta:
         ''' can't fav things twice '''
         unique_together = ('user', 'status')

bookwyrm/models/fields.py

@@ -263,6 +263,7 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
         if formatted is None or formatted is MISSING:
             return
         getattr(instance, self.name).set(formatted)
+        instance.save(broadcast=False)
 
     def field_to_activity(self, value):
         if self.link_only:

bookwyrm/models/import_job.py

@@ -2,6 +2,7 @@
 import re
 import dateutil.parser
 
+from django.apps import apps
 from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.utils import timezone
@@ -50,6 +51,18 @@ class ImportJob(models.Model):
     )
     retry = models.BooleanField(default=False)
 
+    def save(self, *args, **kwargs):
+        ''' save and notify '''
+        super().save(*args, **kwargs)
+        if self.complete:
+            notification_model = apps.get_model(
+                'bookwyrm.Notification', require_ready=True)
+            notification_model.objects.create(
+                user=self.user,
+                notification_type='IMPORT',
+                related_import=self,
+            )
+
 
 class ImportItem(models.Model):
     ''' a single line of a csv being imported '''

bookwyrm/models/list.py

@@ -1,4 +1,5 @@
 ''' make a list of books!! '''
+from django.apps import apps
 from django.db import models
 
 from bookwyrm import activitypub
@@ -67,10 +68,26 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     order = fields.IntegerField(blank=True, null=True)
     endorsement = models.ManyToManyField('User', related_name='endorsers')
 
-    activity_serializer = activitypub.AddBook
+    activity_serializer = activitypub.AddListItem
     object_field = 'book'
     collection_field = 'book_list'
 
+    def save(self, *args, **kwargs):
+        ''' create a notification too '''
+        created = not bool(self.id)
+        super().save(*args, **kwargs)
+        list_owner = self.book_list.user
+        # 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 = apps.get_model('bookwyrm.Notification', require_ready=True)
+            model.objects.create(
+                user=list_owner,
+                related_user=self.user,
+                related_list_item=self,
+                notification_type='ADD',
+            )
+
+
     class Meta:
         ''' an opinionated constraint! you can't put a book on a list twice '''
         unique_together = ('book', 'book_list')

bookwyrm/models/notification.py

@@ -5,24 +5,41 @@ from .base_model import BookWyrmModel
 
 NotificationType = models.TextChoices(
     'NotificationType',
-    'FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT')
+    'FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD')
 
 class Notification(BookWyrmModel):
     ''' you've been tagged, liked, followed, etc '''
-    user = models.ForeignKey('User', on_delete=models.PROTECT)
+    user = models.ForeignKey('User', on_delete=models.CASCADE)
     related_book = models.ForeignKey(
-        'Edition', on_delete=models.PROTECT, null=True)
+        'Edition', on_delete=models.CASCADE, null=True)
     related_user = models.ForeignKey(
         'User',
-        on_delete=models.PROTECT, null=True, related_name='related_user')
+        on_delete=models.CASCADE, null=True, related_name='related_user')
     related_status = models.ForeignKey(
-        'Status', on_delete=models.PROTECT, null=True)
+        'Status', on_delete=models.CASCADE, null=True)
     related_import = models.ForeignKey(
-        'ImportJob', on_delete=models.PROTECT, null=True)
+        'ImportJob', on_delete=models.CASCADE, null=True)
+    related_list_item = models.ForeignKey(
+        'ListItem', on_delete=models.CASCADE, null=True)
     read = models.BooleanField(default=False)
     notification_type = models.CharField(
         max_length=255, choices=NotificationType.choices)
 
+    def save(self, *args, **kwargs):
+        ''' save, but don't make dupes '''
+        # there's probably a better way to do this
+        if self.__class__.objects.filter(
+                user=self.user,
+                related_book=self.related_book,
+                related_user=self.related_user,
+                related_status=self.related_status,
+                related_import=self.related_import,
+                related_list_item=self.related_list_item,
+                notification_type=self.notification_type,
+            ).exists():
+            return
+        super().save(*args, **kwargs)
+
     class Meta:
         ''' checks if notifcation is in enum list for valid types '''
         constraints = [

bookwyrm/models/relationship.py

@@ -1,4 +1,5 @@
 ''' defines relationships between users '''
+from django.apps import apps
 from django.db import models, transaction
 from django.db.models import Q
 
@@ -80,18 +81,34 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
         try:
             UserFollows.objects.get(
                 user_subject=self.user_subject,
-                user_object=self.user_object
+                user_object=self.user_object,
             )
+            # blocking in either direction is a no-go
             UserBlocks.objects.get(
                 user_subject=self.user_subject,
-                user_object=self.user_object
+                user_object=self.user_object,
+            )
+            UserBlocks.objects.get(
+                user_subject=self.user_object,
+                user_object=self.user_subject,
             )
             return None
         except (UserFollows.DoesNotExist, UserBlocks.DoesNotExist):
             super().save(*args, **kwargs)
+
         if broadcast and self.user_subject.local and not self.user_object.local:
             self.broadcast(self.to_activity(), self.user_subject)
 
+        if self.user_object.local:
+            model = apps.get_model('bookwyrm.Notification', require_ready=True)
+            notification_type = 'FOLLOW_REQUEST' \
+                if self.user_object.manually_approves_followers else 'FOLLOW'
+            model.objects.create(
+                user=self.user_object,
+                related_user=self.user_subject,
+                notification_type=notification_type,
+            )
+
 
     def accept(self):
         ''' turn this request into the real deal'''

bookwyrm/models/status.py

@@ -52,6 +52,38 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
     serialize_reverse_fields = [('attachments', 'attachment', 'id')]
     deserialize_reverse_fields = [('attachments', 'attachment')]
 
+
+    def save(self, *args, **kwargs):
+        ''' save and notify '''
+        super().save(*args, **kwargs)
+
+        notification_model = apps.get_model(
+            'bookwyrm.Notification', require_ready=True)
+
+        if self.deleted:
+            notification_model.objects.filter(related_status=self).delete()
+
+        if self.reply_parent and self.reply_parent.user != self.user and \
+                self.reply_parent.user.local:
+            notification_model.objects.create(
+                user=self.reply_parent.user,
+                notification_type='REPLY',
+                related_user=self.user,
+                related_status=self,
+            )
+        for mention_user in self.mention_users.all():
+            # avoid double-notifying about this status
+            if not mention_user.local or \
+                    (self.reply_parent and \
+                     mention_user == self.reply_parent.user):
+                continue
+            notification_model.objects.create(
+                user=mention_user,
+                notification_type='MENTION',
+                related_user=self.user,
+                related_status=self,
+            )
+
     @property
     def recipients(self):
         ''' tagged users who definitely need to get this status in broadcast '''
@@ -236,6 +268,33 @@ class Boost(ActivityMixin, Status):
     )
     activity_serializer = activitypub.Boost
 
+    def save(self, *args, **kwargs):
+        ''' save and notify '''
+        super().save(*args, **kwargs)
+        if not self.boosted_status.user.local:
+            return
+
+        notification_model = apps.get_model(
+            'bookwyrm.Notification', require_ready=True)
+        notification_model.objects.create(
+            user=self.boosted_status.user,
+            related_status=self.boosted_status,
+            related_user=self.user,
+            notification_type='BOOST',
+        )
+
+    def delete(self, *args, **kwargs):
+        ''' delete and un-notify '''
+        notification_model = apps.get_model(
+            'bookwyrm.Notification', require_ready=True)
+        notification_model.objects.filter(
+            user=self.boosted_status.user,
+            related_status=self.boosted_status,
+            related_user=self.user,
+            notification_type='BOOST',
+        ).delete()
+        super().delete(*args, **kwargs)
+
 
     def __init__(self, *args, **kwargs):
         ''' the user field is "actor" here instead of "attributedTo" '''