Merge branch 'main' into review-rate

2021-02-18 13:12:04 -08:00
parent 06feef44ad 9cbecec8ac
commit 42ca32a985
5 changed files with 61 additions and 13 deletions
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@ -82,11 +82,16 @@ 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):