zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Use database constraint to prevent relationships with yourself.

Browse source
This commit is contained in:
Adam Kelly 2020-03-14 22:20:01 +00:00
parent 1cdd7ea1fc
commit ffe81291ad
3 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fedireads/incoming.py
View file

@ -128,14 +128,15 @@ def handle_incoming_follow(activity):
to_follow = models.User.objects.get(actor=activity['object'])
# figure out who they are
user = get_or_create_remote_user(activity['actor'])
# TODO: allow users to manually approve requests
try:
request = models.UserFollowRequest.objects.create(
user_subject=user,
user_object=to_follow,
relationship_id=activity['id']
)
except django.db.utils.IntegrityError:
except django.db.utils.IntegrityError as err:
if err.__cause__.diag.constraint_name != 'userfollowrequest_unique':
raise
# Duplicate follow request. Not sure what the correct behaviour is, but
# just dropping it works for now. We should perhaps generate the
# Accept, but then do we need to match the activity id?