zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Hide user pages to blocked users

Browse source
This commit is contained in:
Mouse Reeve 2021-01-26 08:31:55 -08:00
parent 681f5482fd
commit 3f011445e2
3 changed files with 56 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bookwyrm/views/helpers.py
View file

@ -190,3 +190,9 @@ def handle_reading_status(user, shelf, book, privacy):
status.save()
broadcast(user, status.to_create_activity(user))
def is_blocked(viewer, user):
''' is this viewer blocked by the user? '''
if viewer.is_authenticated and viewer in user.blocks.all():
return True
return False

15
bookwyrm/views/user.py
View file

@ -18,7 +18,7 @@ from bookwyrm.activitypub import ActivitypubResponse
from bookwyrm.broadcast import broadcast
from bookwyrm.settings import PAGE_LENGTH
from .helpers import get_activity_feed, get_user_from_username, is_api_request
from .helpers import object_visible_to_user
from .helpers import is_blocked, object_visible_to_user
# pylint: disable= no-self-use
@ -32,9 +32,8 @@ class User(View):
return HttpResponseNotFound()
# make sure we're not blocked
if request.user.is_authenticated:
if request.user in user.blocks.all():
return HttpResponseNotFound()
if is_blocked(request.user, user):
return HttpResponseNotFound()
if is_api_request(request):
# we have a json request
@ -102,6 +101,10 @@ class Followers(View):
except models.User.DoesNotExist:
return HttpResponseNotFound()
# make sure we're not blocked
if is_blocked(request.user, user):
return HttpResponseNotFound()
if is_api_request(request):
return ActivitypubResponse(
user.to_followers_activity(**request.GET))
@ -123,6 +126,10 @@ class Following(View):
except models.User.DoesNotExist:
return HttpResponseNotFound()
# make sure we're not blocked
if is_blocked(request.user, user):
return HttpResponseNotFound()
if is_api_request(request):
return ActivitypubResponse(
user.to_following_activity(**request.GET))