yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

differentiate local user search and webfinger lookup

Browse Source
This commit is contained in:
Mouse Reeve 2020-10-14 09:21:53 -07:00
parent 4ba9b7a119
commit b36b306934
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bookwyrm/outgoing.py
View File

@ -34,7 +34,7 @@ def outbox(request, username):
) )
def handle_account_search(query): def handle_remote_webfinger(query):
''' webfingerin' other servers ''' ''' webfingerin' other servers '''
user = None user = None
domain = query.split('@')[1] domain = query.split('@')[1]
@ -61,14 +61,10 @@ def handle_account_search(query):
def handle_follow(user, to_follow): def handle_follow(user, to_follow):
''' someone local wants to follow someone ''' ''' someone local wants to follow someone '''
try: relationship, _ = models.UserFollowRequest.objects.get_or_create(
relationship, _ = models.UserFollowRequest.objects.get_or_create( user_subject=user,
user_subject=user, user_object=to_follow,
user_object=to_follow, )
)
except IntegrityError as err:
if err.__cause__.diag.constraint_name != 'userfollowrequest_unique':
raise
activity = relationship.to_activity() activity = relationship.to_activity()
broadcast(user, activity, direct_recipients=[to_follow]) broadcast(user, activity, direct_recipients=[to_follow])