diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html index 32b5062d..22aba08e 100644 --- a/bookwyrm/templates/goal.html +++ b/bookwyrm/templates/goal.html @@ -1,4 +1,4 @@ -{% extends 'user/user_layout.html' %} +{% extends 'user/layout.html' %} {% load i18n %} {% block header %} diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html deleted file mode 100644 index b294db90..00000000 --- a/bookwyrm/templates/user/followers.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends 'user/user_layout.html' %} -{% load i18n %} -{% load bookwyrm_tags %} - -{% block header %} -

- {% trans "User Profile" %} -

-{% endblock %} - -{% block panel %} -
-

{% trans "Followers" %}

- {% for follower in followers %} -
-
- - {% include 'snippets/avatar.html' with user=follower %} - {{ follower.display_name }} - - ({{ follower.username }}) -
-
- {% include 'snippets/follow_button.html' with user=follower %} -
-
- {% endfor %} - {% if not followers.count %} -
{% blocktrans with username=user.display_name %}{{ username }} has no followers{% endblocktrans %}
- {% endif %} -
- -{% include 'snippets/pagination.html' with page=followers path=request.path %} -{% endblock %} diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html deleted file mode 100644 index 38c01ad2..00000000 --- a/bookwyrm/templates/user/following.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends 'user/user_layout.html' %} -{% load i18n %} -{% load bookwyrm_tags %} - -{% block header %} -

- {% trans "User Profile" %} -

-{% endblock %} - -{% block panel %} -
-

{% trans "Following" %}

- {% for follower in user.following.all %} -
-
- - {% include 'snippets/avatar.html' with user=follower %} - {{ follower.display_name }} - - ({{ follower.username }}) -
-
- {% include 'snippets/follow_button.html' with user=follower %} -
-
- {% endfor %} - {% if not following.count %} -
{% blocktrans with username=user|username %}{{ username }} isn't following any users{% endblocktrans %}
- {% endif %} -
- -{% include 'snippets/pagination.html' with page=following path=request.path %} -{% endblock %} diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/layout.html similarity index 93% rename from bookwyrm/templates/user/user_layout.html rename to bookwyrm/templates/user/layout.html index 0c3e94e3..661d8078 100644 --- a/bookwyrm/templates/user/user_layout.html +++ b/bookwyrm/templates/user/layout.html @@ -7,7 +7,11 @@ {% block content %}
- {% block header %}{% endblock %} + {% block header %} +

+ {% trans "User Profile" %} +

+ {% endblock %}
{# user bio #} @@ -41,8 +45,9 @@ {% endif %} + +{% block tabs %} {% with user|username as username %} -{% if 'user/'|add:username|add:'/books' not in request.path and 'user/'|add:username|add:'/shelf' not in request.path %} -{% endif %} {% endwith %} +{% endblock %} {% block panel %}{% endblock %} diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html index b2fd9eef..aa8ad7fb 100644 --- a/bookwyrm/templates/user/lists.html +++ b/bookwyrm/templates/user/lists.html @@ -1,4 +1,4 @@ -{% extends 'user/user_layout.html' %} +{% extends 'user/layout.html' %} {% load i18n %} {% block header %} diff --git a/bookwyrm/templates/user/relationships/followers.html b/bookwyrm/templates/user/relationships/followers.html new file mode 100644 index 00000000..223f38c7 --- /dev/null +++ b/bookwyrm/templates/user/relationships/followers.html @@ -0,0 +1,14 @@ +{% extends 'user/relationships/layout.html' %} +{% load i18n %} + +{% block header %} +

+ {% trans "Followers" %} +

+{% endblock %} + +{% block nullstate %} +
+ {% blocktrans with username=user.display_name %}{{ username }} has no followers{% endblocktrans %} +
+{% endblock %} diff --git a/bookwyrm/templates/user/relationships/following.html b/bookwyrm/templates/user/relationships/following.html new file mode 100644 index 00000000..5689bc61 --- /dev/null +++ b/bookwyrm/templates/user/relationships/following.html @@ -0,0 +1,14 @@ +{% extends 'user/relationships/layout.html' %} +{% load i18n %} + +{% block header %} +

+ {% trans "Following" %} +

+{% endblock %} + +{% block nullstate %} +
+ {% blocktrans with username=user.display_name %}{{ username }} isn't following any users{% endblocktrans %} +
+{% endblock %} diff --git a/bookwyrm/templates/user/relationships/layout.html b/bookwyrm/templates/user/relationships/layout.html new file mode 100644 index 00000000..5baaf1f9 --- /dev/null +++ b/bookwyrm/templates/user/relationships/layout.html @@ -0,0 +1,46 @@ +{% extends 'user/layout.html' %} +{% load i18n %} +{% load bookwyrm_tags %} + +{% block tabs %} +{% with user|username as username %} + +{% endwith %} +{% endblock %} + +{% block panel %} +
+ {% for follow in follow_list %} +
+
+ + {% include 'snippets/avatar.html' with user=follow %} + {{ follow.display_name }} + + ({{ follow.username }}) +
+
+ {% include 'snippets/follow_button.html' with user=follow %} +
+
+ {% endfor %} + + {% if not follow_list %} + {% block nullstate %} + {% endblock %} + {% endif %} +
+ +{% include 'snippets/pagination.html' with page=follow_list path=request.path %} +{% endblock %} diff --git a/bookwyrm/templates/user/books_header.html b/bookwyrm/templates/user/shelf/books_header.html similarity index 100% rename from bookwyrm/templates/user/books_header.html rename to bookwyrm/templates/user/shelf/books_header.html diff --git a/bookwyrm/templates/user/create_shelf_form.html b/bookwyrm/templates/user/shelf/create_shelf_form.html similarity index 100% rename from bookwyrm/templates/user/create_shelf_form.html rename to bookwyrm/templates/user/shelf/create_shelf_form.html diff --git a/bookwyrm/templates/user/edit_shelf_form.html b/bookwyrm/templates/user/shelf/edit_shelf_form.html similarity index 100% rename from bookwyrm/templates/user/edit_shelf_form.html rename to bookwyrm/templates/user/shelf/edit_shelf_form.html diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf/shelf.html similarity index 94% rename from bookwyrm/templates/user/shelf.html rename to bookwyrm/templates/user/shelf/shelf.html index 33616258..639ab502 100644 --- a/bookwyrm/templates/user/shelf.html +++ b/bookwyrm/templates/user/shelf/shelf.html @@ -1,21 +1,21 @@ -{% extends 'user/user_layout.html' %} +{% extends 'user/layout.html' %} {% load bookwyrm_tags %} {% load humanize %} {% load i18n %} {% block title %} -{% include 'user/books_header.html' %} +{% include 'user/shelf/books_header.html' %} {% endblock %} {% block header %}

- {% include 'user/books_header.html' %} + {% include 'user/shelf/books_header.html' %}

{% endblock %} -{% block panel %} +{% block tabs %}
@@ -39,9 +39,11 @@
{% endif %}
+{% endblock %} +{% block panel %}
- {% include 'user/create_shelf_form.html' with controls_text='create-shelf-form' %} + {% include 'user/shelf/create_shelf_form.html' with controls_text='create-shelf-form' %}
@@ -62,7 +64,7 @@
- {% include 'user/edit_shelf_form.html' with controls_text="edit-shelf-form" %} + {% include 'user/shelf/edit_shelf_form.html' with controls_text="edit-shelf-form" %}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html index 8002a254..99698575 100644 --- a/bookwyrm/templates/user/user.html +++ b/bookwyrm/templates/user/user.html @@ -1,4 +1,4 @@ -{% extends 'user/user_layout.html' %} +{% extends 'user/layout.html' %} {% load i18n %} {% load bookwyrm_tags %} @@ -11,7 +11,7 @@
{% if is_self %}
- + {% trans "Edit profile" %} @@ -25,7 +25,7 @@ {% if user.bookwyrm_user %}

- {% include 'user/books_header.html' %} + {% include 'user/shelf/books_header.html' %}

{% for shelf in shelves %} diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html index c641c58f..c450365b 100644 --- a/bookwyrm/templates/user/user_preview.html +++ b/bookwyrm/templates/user/user_preview.html @@ -1,5 +1,6 @@ {% load i18n %} {% load humanize %} +{% load bookwyrm_tags %}
@@ -12,8 +13,19 @@

{{ user.username }}

{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}

- {% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}, - {% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %} + {% if is_self %} + + {% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}, + {% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %} + + {% elif request.user.is_authenticated %} + + {% mutuals_count user as mutuals %} + + {% blocktrans with mutuals_display=mutuals|intcomma count counter=mutuals %}{{ mutuals_display }} follower you follow{% plural %}{{ mutuals_display }} followers you follow{% endblocktrans %} + + + {% endif %}

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 2ed0cbc2..eda3d102 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -235,3 +235,12 @@ def get_lang(): """get current language, strip to the first two letters""" language = utils.translation.get_language() return language[0 : language.find("-")] + + +@register.simple_tag(takes_context=True) +def mutuals_count(context, user): + """how many users that you follow, follow them""" + viewer = context["request"].user + if not viewer.is_authenticated: + return None + return user.followers.filter(id__in=viewer.following.all()).count() diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index 0dddd2a1..ab5abed0 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -3,6 +3,7 @@ import json from unittest.mock import patch import pathlib from django.db.models import Q +from django.http import Http404 from django.test import TestCase from django.test.client import RequestFactory import responses @@ -67,7 +68,7 @@ class ViewsHelpers(TestCase): views.helpers.get_user_from_username(self.local_user, "mouse@local.com"), self.local_user, ) - with self.assertRaises(models.User.DoesNotExist): + with self.assertRaises(Http404): views.helpers.get_user_from_username(self.local_user, "mojfse@example.com") def test_is_api_request(self, _): diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 3b431de1..3fa78e35 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -6,6 +6,7 @@ from PIL import Image from django.contrib.auth.models import AnonymousUser from django.core.files.base import ContentFile from django.core.files.uploadedfile import SimpleUploadedFile +from django.http.response import Http404 from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory @@ -76,8 +77,8 @@ class UserViews(TestCase): self.rat.blocks.add(self.local_user) with patch("bookwyrm.views.user.is_api_request") as is_api: is_api.return_value = False - result = view(request, "rat") - self.assertEqual(result.status_code, 404) + with self.assertRaises(Http404): + view(request, "rat") def test_followers_page(self): """there are so many views, this just makes sure it LOADS""" @@ -105,8 +106,8 @@ class UserViews(TestCase): self.rat.blocks.add(self.local_user) with patch("bookwyrm.views.user.is_api_request") as is_api: is_api.return_value = False - result = view(request, "rat") - self.assertEqual(result.status_code, 404) + with self.assertRaises(Http404): + view(request, "rat") def test_following_page(self): """there are so many views, this just makes sure it LOADS""" @@ -134,8 +135,8 @@ class UserViews(TestCase): self.rat.blocks.add(self.local_user) with patch("bookwyrm.views.user.is_api_request") as is_api: is_api.return_value = False - result = view(request, "rat") - self.assertEqual(result.status_code, 404) + with self.assertRaises(Http404): + view(request, "rat") def test_edit_user_page(self): """there are so many views, this just makes sure it LOADS""" @@ -166,7 +167,6 @@ class UserViews(TestCase): self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") - # idk how to mock the upload form, got tired of triyng to make it work def test_edit_user_avatar(self): """use a form to update a user""" view = views.EditUser.as_view() diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 98f365ea..a03d6b4c 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -2,7 +2,7 @@ from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.db.models import Q -from django.http import HttpResponseNotFound +from django.http import HttpResponseNotFound, Http404 from django.template.response import TemplateResponse from django.utils import timezone from django.utils.decorators import method_decorator @@ -62,7 +62,7 @@ class DirectMessage(View): if username: try: user = get_user_from_username(request.user, username) - except models.User.DoesNotExist: + except Http404: pass if user: queryset = queryset.filter(Q(user=user) | Q(mention_users=user)) @@ -94,7 +94,7 @@ class Status(View): status = models.Status.objects.select_subclasses().get( id=status_id, deleted=False ) - except (ValueError, models.Status.DoesNotExist, models.User.DoesNotExist): + except (ValueError, models.Status.DoesNotExist): return HttpResponseNotFound() # the url should have the poster's username in it diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 09c2d53a..c3336a94 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -14,10 +14,7 @@ from .helpers import get_user_from_username def follow(request): """follow another user, here or abroad""" username = request.POST["user"] - try: - to_follow = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseBadRequest() + to_follow = get_user_from_username(request.user, username) try: models.UserFollowRequest.objects.create( @@ -35,10 +32,7 @@ def follow(request): def unfollow(request): """unfollow a user""" username = request.POST["user"] - try: - to_unfollow = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseBadRequest() + to_unfollow = get_user_from_username(request.user, username) try: models.UserFollows.objects.get( @@ -63,10 +57,7 @@ def unfollow(request): def accept_follow_request(request): """a user accepts a follow request""" username = request.POST["user"] - try: - requester = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseBadRequest() + requester = get_user_from_username(request.user, username) try: follow_request = models.UserFollowRequest.objects.get( @@ -85,10 +76,7 @@ def accept_follow_request(request): def delete_follow_request(request): """a user rejects a follow request""" username = request.POST["user"] - try: - requester = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseBadRequest() + requester = get_user_from_username(request.user, username) try: follow_request = models.UserFollowRequest.objects.get( diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 5a8617fc..31e5f031 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -3,6 +3,7 @@ import re from requests import HTTPError from django.core.exceptions import FieldError from django.db.models import Count, Max, Q +from django.http import Http404 from bookwyrm import activitypub, models from bookwyrm.connectors import ConnectorException, get_data @@ -12,11 +13,17 @@ from bookwyrm.utils import regex 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 + # raises 404 if the user isn't found try: return models.User.viewer_aware_objects(viewer).get(localname=username) except models.User.DoesNotExist: + pass + + # if the localname didn't match, try the username + try: return models.User.viewer_aware_objects(viewer).get(username=username) + except models.User.DoesNotExist: + raise Http404() def is_api_request(request): diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 9bcf0a4a..94507d46 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -25,10 +25,7 @@ class Shelf(View): def get(self, request, username, shelf_identifier=None): """display a shelf""" - try: - user = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseNotFound() + user = get_user_from_username(request.user, username) shelves = privacy_filter(request.user, user.shelf_set) @@ -68,7 +65,7 @@ class Shelf(View): "books": paginated.get_page(request.GET.get("page")), } - return TemplateResponse(request, "user/shelf.html", data) + return TemplateResponse(request, "user/shelf/shelf.html", data) @method_decorator(login_required, name="dispatch") # pylint: disable=unused-argument diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index d394c1d7..3f77e962 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -6,7 +6,6 @@ from PIL import Image from django.contrib.auth.decorators import login_required from django.core.files.base import ContentFile from django.core.paginator import Paginator -from django.http import HttpResponseNotFound from django.shortcuts import redirect from django.template.response import TemplateResponse from django.utils import timezone @@ -17,7 +16,7 @@ from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.settings import PAGE_LENGTH from .helpers import get_user_from_username, is_api_request -from .helpers import is_blocked, privacy_filter +from .helpers import privacy_filter # pylint: disable= no-self-use @@ -26,14 +25,7 @@ class User(View): def get(self, request, username): """profile page for a user""" - try: - user = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseNotFound() - - # make sure we're not blocked - if is_blocked(request.user, user): - return HttpResponseNotFound() + user = get_user_from_username(request.user, username) if is_api_request(request): # we have a json request @@ -94,14 +86,7 @@ class Followers(View): def get(self, request, username): """list of followers""" - try: - user = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseNotFound() - - # make sure we're not blocked - if is_blocked(request.user, user): - return HttpResponseNotFound() + user = get_user_from_username(request.user, username) if is_api_request(request): return ActivitypubResponse(user.to_followers_activity(**request.GET)) @@ -110,9 +95,9 @@ class Followers(View): data = { "user": user, "is_self": request.user.id == user.id, - "followers": paginated.page(request.GET.get("page", 1)), + "follow_list": paginated.page(request.GET.get("page", 1)), } - return TemplateResponse(request, "user/followers.html", data) + return TemplateResponse(request, "user/relationships/followers.html", data) class Following(View): @@ -120,25 +105,18 @@ class Following(View): def get(self, request, username): """list of followers""" - try: - user = get_user_from_username(request.user, username) - except models.User.DoesNotExist: - return HttpResponseNotFound() - - # make sure we're not blocked - if is_blocked(request.user, user): - return HttpResponseNotFound() + user = get_user_from_username(request.user, username) if is_api_request(request): return ActivitypubResponse(user.to_following_activity(**request.GET)) - paginated = Paginator(user.followers.all(), PAGE_LENGTH) + paginated = Paginator(user.following.all(), PAGE_LENGTH) data = { "user": user, "is_self": request.user.id == user.id, - "following": paginated.page(request.GET.get("page", 1)), + "follow_list": paginated.page(request.GET.get("page", 1)), } - return TemplateResponse(request, "user/following.html", data) + return TemplateResponse(request, "user/relationships/following.html", data) @method_decorator(login_required, name="dispatch")