rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Merge pull request #909 from mouse-reeve/case-insensitive-webfinger

Browse source 
Case insensitive remote user search
This commit is contained in:
Mouse Reeve 2021-04-08 10:41:26 -07:00 committed by GitHub
commit c0c39a5531
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bookwyrm/tests/views/test_helpers.py
View file

@ -112,6 +112,9 @@ class ViewsHelpers(TestCase):
result = views.helpers.handle_remote_webfinger("mouse@local.com") result = views.helpers.handle_remote_webfinger("mouse@local.com")
self.assertEqual(result, self.local_user) self.assertEqual(result, self.local_user)
result = views.helpers.handle_remote_webfinger("mOuSe@loCal.cOm")
self.assertEqual(result, self.local_user)
@responses.activate @responses.activate
def test_load_user(self, _): def test_load_user(self, _):
""" find a remote user using webfinger """ """ find a remote user using webfinger """

2
bookwyrm/views/helpers.py
View file

@ -124,7 +124,7 @@ def handle_remote_webfinger(query):
return None return None
try: try:
user = models.User.objects.get(username=query) user = models.User.objects.get(username__iexact=query)
except models.User.DoesNotExist: except models.User.DoesNotExist:
url = "https://%s/.well-known/webfinger?resource=acct:%s" % (domain, query) url = "https://%s/.well-known/webfinger?resource=acct:%s" % (domain, query)
try: try:

2
bookwyrm/views/search.py
View file

@ -34,7 +34,7 @@ class Search(View):
if query and re.match(regex.full_username, query): if query and re.match(regex.full_username, query):
handle_remote_webfinger(query) handle_remote_webfinger(query)
# do a user search # do a user search
user_results = ( user_results = (
models.User.viewer_aware_objects(request.user) models.User.viewer_aware_objects(request.user)
.annotate( .annotate(