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

Fixes incoming request local user lookup

This commit is contained in:
Mouse Reeve 2020-01-27 20:12:55 -08:00
parent f7242452fa
commit 8dfad68ca7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fedireads/federation.py
View File

@ -11,6 +11,7 @@ from fedireads.settings import DOMAIN
from fedireads import models from fedireads import models
import json import json
import requests import requests
import re
from uuid import uuid4 from uuid import uuid4
def webfinger(request): def webfinger(request):
@ -77,7 +78,7 @@ def inbox(request, username):
# TODO: should do some kind of checking if the user accepts # TODO: should do some kind of checking if the user accepts
# this action from the sender # this action from the sender
# but this will just throw an error if the user doesn't exist I guess # but this will just throw an error if the user doesn't exist I guess
models.User.objects.get(username=username) #models.User.objects.get(username=username)
if activity['type'] == 'Add': if activity['type'] == 'Add':
return handle_add(activity) return handle_add(activity)
@ -140,16 +141,20 @@ def handle_incoming_follow(activity):
} }
''' '''
# figure out who they want to follow # figure out who they want to follow
following = activity['object'].replace('https://%s/api/u/' % DOMAIN, '') to_follow = re.sub(
following = models.User.objects.get(username=following) r'https?://([\w\.]+)/api/u/(\w+)',
r'\2@\1',
activity['object']
)
to_follow = models.User.objects.get(username=to_follow)
# figure out who they are # figure out who they are
user = get_or_create_remote_user(activity) user = get_or_create_remote_user(activity)
following.followers.add(user) to_follow.followers.add(user)
# verify uuid and accept the request # verify uuid and accept the request
models.FollowActivity( models.FollowActivity(
uuid=activity['id'], uuid=activity['id'],
user=user, user=user,
followed=following, followed=to_follow,
content=activity, content=activity,
activity_type='Follow', activity_type='Follow',
) )