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

Merge pull request #636 from mouse-reeve/follow-block-button

Browse Source 
Cleans up display of follow/block/unfollow/unblock buttons
This commit is contained in:
Mouse Reeve
2021-02-23 13:38:02 -08:00
committed by GitHub
parent 152107a9af 9ac332f6cc
commit fdbd3688f4
16 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bookwyrm/views/helpers.py
View File

@ -9,13 +9,13 @@ from bookwyrm.status import create_generated_note
from bookwyrm.utils import regex
def get_user_from_username(username):
def get_user_from_username(viewer, username):
''' helper function to resolve a localname or a username to a user '''
# raises DoesNotExist if user is now found
try:
return models.User.objects.get(localname=username)
return models.User.viewer_aware_objects(viewer).get(localname=username)
except models.User.DoesNotExist:
return models.User.objects.get(username=username)
return models.User.viewer_aware_objects(viewer).get(username=username)
def is_api_request(request):