Merge branch 'main' into stopped-shelf

bookwyrm/models/fields.py

@@ -389,7 +389,7 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         self.alt_field = alt_field
         super().__init__(*args, **kwargs)
 
-    # pylint: disable=arguments-differ
+    # pylint: disable=arguments-differ,arguments-renamed
     def set_field_from_activity(self, instance, data, save=True, overwrite=True):
         """helper function for assinging a value to the field"""
         value = getattr(data, self.get_activitypub_field())

bookwyrm/models/relationship.py

@@ -39,15 +39,14 @@ class UserRelationship(BookWyrmModel):
 
     def save(self, *args, **kwargs):
         """clear the template cache"""
-        # invalidate the template cache
-        cache.delete_many(
-            [
-                f"relationship-{self.user_subject.id}-{self.user_object.id}",
-                f"relationship-{self.user_object.id}-{self.user_subject.id}",
-            ]
-        )
+        clear_cache(self.user_subject, self.user_object)
         super().save(*args, **kwargs)
 
+    def delete(self, *args, **kwargs):
+        """clear the template cache"""
+        clear_cache(self.user_subject, self.user_object)
+        super().delete(*args, **kwargs)
+
     class Meta:
         """relationships should be unique"""
 
@@ -90,7 +89,9 @@ class UserFollows(ActivityMixin, UserRelationship):
                 user_object=self.user_subject,
             )
         ).exists():
-            raise IntegrityError()
+            raise IntegrityError(
+                "Attempting to follow blocked user", self.user_subject, self.user_object
+            )
         # don't broadcast this type of relationship -- accepts and requests
         # are handled by the UserFollowRequest model
         super().save(*args, broadcast=False, **kwargs)
@@ -98,11 +99,12 @@ class UserFollows(ActivityMixin, UserRelationship):
     @classmethod
     def from_request(cls, follow_request):
         """converts a follow request into a follow relationship"""
-        return cls.objects.create(
+        obj, _ = cls.objects.get_or_create(
             user_subject=follow_request.user_subject,
             user_object=follow_request.user_object,
             remote_id=follow_request.remote_id,
         )
+        return obj
 
 
 class UserFollowRequest(ActivitypubMixin, UserRelationship):
@@ -133,7 +135,9 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
                 user_object=self.user_subject,
             )
         ).exists():
-            raise IntegrityError()
+            raise IntegrityError(
+                "Attempting to follow blocked user", self.user_subject, self.user_object
+            )
         super().save(*args, **kwargs)
 
         if broadcast and self.user_subject.local and not self.user_object.local:
@@ -174,7 +178,8 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
         with transaction.atomic():
             UserFollows.from_request(self)
-            self.delete()
+            if self.id:
+                self.delete()
 
     def reject(self):
         """generate a Reject for this follow request"""
@@ -207,3 +212,13 @@ class UserBlocks(ActivityMixin, UserRelationship):
             Q(user_subject=self.user_subject, user_object=self.user_object)
             | Q(user_subject=self.user_object, user_object=self.user_subject)
         ).delete()
+
+
+def clear_cache(user_subject, user_object):
+    """clear relationship cache"""
+    cache.delete_many(
+        [
+            f"relationship-{user_subject.id}-{user_object.id}",
+            f"relationship-{user_object.id}-{user_subject.id}",
+        ]
+    )

bookwyrm/models/site.py

@@ -49,8 +49,12 @@ class SiteSettings(models.Model):
     # registration
     allow_registration = models.BooleanField(default=False)
     allow_invite_requests = models.BooleanField(default=True)
+    invite_request_question = models.BooleanField(default=False)
     require_confirm_email = models.BooleanField(default=True)
 
+    invite_question_text = models.CharField(
+        max_length=255, blank=True, default="What is your favourite book?"
+    )
     # images
     logo = models.ImageField(upload_to="logos/", null=True, blank=True)
     logo_small = models.ImageField(upload_to="logos/", null=True, blank=True)
@@ -100,11 +104,14 @@ class SiteSettings(models.Model):
         return urljoin(STATIC_FULL_URL, default_path)
 
     def save(self, *args, **kwargs):
-        """if require_confirm_email is disabled, make sure no users are pending"""
+        """if require_confirm_email is disabled, make sure no users are pending,
+        if enabled, make sure invite_question_text is not empty"""
         if not self.require_confirm_email:
             User.objects.filter(is_active=False, deactivation_reason="pending").update(
                 is_active=True, deactivation_reason=None
             )
+        if not self.invite_question_text:
+            self.invite_question_text = "What is your favourite book?"
         super().save(*args, **kwargs)
 
 
@@ -150,6 +157,7 @@ class InviteRequest(BookWyrmModel):
     invite = models.ForeignKey(
         SiteInvite, on_delete=models.SET_NULL, null=True, blank=True
     )
+    answer = models.TextField(max_length=50, unique=False, null=True, blank=True)
     invite_sent = models.BooleanField(default=False)
     ignored = models.BooleanField(default=False)