zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge branch 'main' into review-rate

Browse source
This commit is contained in:
Mouse Reeve 2021-02-18 13:12:04 -08:00
commit 42ca32a985
5 changed files with 61 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bookwyrm/models/relationship.py
View file

@ -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):