From b36b306934b2e889a0c37e859f00736cf3181866 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 14 Oct 2020 09:21:53 -0700 Subject: [PATCH] differentiate local user search and webfinger lookup --- bookwyrm/outgoing.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/bookwyrm/outgoing.py b/bookwyrm/outgoing.py index 25a61c46e..0efa8a4af 100644 --- a/bookwyrm/outgoing.py +++ b/bookwyrm/outgoing.py @@ -34,7 +34,7 @@ def outbox(request, username): ) -def handle_account_search(query): +def handle_remote_webfinger(query): ''' webfingerin' other servers ''' user = None domain = query.split('@')[1] @@ -61,14 +61,10 @@ def handle_account_search(query): def handle_follow(user, to_follow): ''' someone local wants to follow someone ''' - try: - relationship, _ = models.UserFollowRequest.objects.get_or_create( - user_subject=user, - user_object=to_follow, - ) - except IntegrityError as err: - if err.__cause__.diag.constraint_name != 'userfollowrequest_unique': - raise + relationship, _ = models.UserFollowRequest.objects.get_or_create( + user_subject=user, + user_object=to_follow, + ) activity = relationship.to_activity() broadcast(user, activity, direct_recipients=[to_follow])