{% for user in suggested_users %}
diff --git a/bookwyrm/templates/feed/thread.html b/bookwyrm/templates/feed/thread.html
index 18ab6ea38..793cddfcd 100644
--- a/bookwyrm/templates/feed/thread.html
+++ b/bookwyrm/templates/feed/thread.html
@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load status_display %}
{% with depth=depth|add:1 %}
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index e06392a8e..b1145611d 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -1,6 +1,5 @@
{% extends 'layout.html' %}
{% load i18n %}
-{% load bookwyrm_tags %}
{% load humanize %}
{% block title %}{% trans "Import Status" %}{% endblock %}
@@ -54,8 +53,8 @@
- {{ item.data|dict_key:'Title' }}
+ {{ item.data.Title }}
- {{ item.data|dict_key:'Author' }}
+ {{ item.data.Author }}
{% if item.book %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bc6544012..becf77819 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load layout %}
{% load i18n %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 2902f793f..55dc68aae 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,12 +1,13 @@
{% extends 'lists/list_layout.html' %}
{% load i18n %}
{% load bookwyrm_tags %}
+{% load markdown %}
{% block panel %}
{% if request.user == list.user and pending_count %}
{% endif %}
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index b59e2a96a..1fdaaca92 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load markdown %}
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 5f12858f6..16ab305e5 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,6 +1,5 @@
{% spaceless %}
-{% load bookwyrm_tags %}
{% load i18n %}
{{ title }} by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
{% else %}
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 3a01fc82d..5b84ea44e 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -1,4 +1,5 @@
-{% load bookwyrm_tags %}
+{% load interaction %}
+{% load utilities %}
{% load i18n %}
{% with status.id|uuid as uuid %}
diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html
index 7dee4b700..b1a8e8465 100644
--- a/bookwyrm/templates/snippets/create_status.html
+++ b/bookwyrm/templates/snippets/create_status.html
@@ -1,6 +1,6 @@
{% load humanize %}
{% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
{% with status_type=request.GET.status_type %}
- {{ book.created_date | naturalday }}
+ {{ book.created_date|naturalday }}
{% latest_read_through book user as read_through %}
- {{ read_through.start_date | naturalday |default_if_none:""}}
+ {{ read_through.start_date|naturalday|default_if_none:""}}
- {{ read_through.finish_date | naturalday |default_if_none:""}}
+ {{ read_through.finish_date|naturalday|default_if_none:""}}
- {% if ratings %}
+ {% if request.user.is_authenticated %}
- {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
+ {% include 'snippets/stars.html' with rating=book.rating %}
{% endif %}
{% if shelf.user == request.user %}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 99698575b..5afe168a2 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,6 +1,6 @@
{% extends 'user/layout.html' %}
{% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
{% block title %}{{ user.display_name }}{% endblock %}
diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
index c450365bb..22d44c878 100644
--- a/bookwyrm/templates/user/user_preview.html
+++ b/bookwyrm/templates/user/user_preview.html
@@ -1,5 +1,6 @@
{% load i18n %}
{% load humanize %}
+{% load utilities %}
{% load bookwyrm_tags %}
{{ item.fail_reason }}. @@ -90,8 +89,8 @@
Line {{ item.index }}: - {{ item.data|dict_key:'Title' }} by - {{ item.data|dict_key:'Author' }} + {{ item.data.Title }} by + {{ item.data.Author }}
{{ item.fail_reason }}. @@ -130,10 +129,10 @@ {% endif %}
- {{ pending_count }} book{{ pending_count | pluralize }} awaiting your approval + {{ pending_count }} book{{ pending_count|pluralize }} awaiting your approval
{% for list in lists %}
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index ed623b129..a51b2fdb0 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -1,7 +1,7 @@
{% extends 'layout.html' %}
{% load i18n %}
-{% load humanize %}
{% load bookwyrm_tags %}
+{% load humanize %}
{% block title %}{% trans "Notifications" %}{% endblock %}
diff --git a/bookwyrm/templates/search/user.html b/bookwyrm/templates/search/user.html
index c6adc613a..56bb1bfab 100644
--- a/bookwyrm/templates/search/user.html
+++ b/bookwyrm/templates/search/user.html
@@ -1,5 +1,4 @@
{% extends 'search/layout.html' %}
-{% load bookwyrm_tags %}
{% block panel %}
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 386433f33..b300a92d7 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -1,7 +1,8 @@
{% extends 'settings/admin_layout.html' %}
-{% block title %}{{ server.server_name }}{% endblock %}
{% load i18n %}
-{% load bookwyrm_tags %}
+{% load markdown %}
+
+{% block title %}{{ server.server_name }}{% endblock %}
{% block header %}
{{ server.server_name }}
diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html
index d53acf2b5..bb37c46d4 100644
--- a/bookwyrm/templates/snippets/avatar.html
+++ b/bookwyrm/templates/snippets/avatar.html
@@ -1,3 +1,2 @@
-{% load bookwyrm_tags %}
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index c0899c84e..de7665e81 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -1,6 +1,5 @@
{% extends 'layout.html' %}
{% load i18n %}
-{% load bookwyrm_tags %}
{% block title %}{{ list.name }}{% endblock %}
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index a7a548110..d4b0a7c29 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,5 +1,5 @@
{% extends 'layout.html' %}
-{% load bookwyrm_tags %}
+{% load utilities %}
{% load i18n %}
{% block title %}{% trans "Lists" %}{% endblock %}
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index 934799e33..db03850f8 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -1,6 +1,5 @@
{% extends 'settings/admin_layout.html' %}
{% load i18n %}
-{% load bookwyrm_tags %}
{% load humanize %}
{% block title %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
@@ -29,7 +28,7 @@
{{ comment.user.display_name }}
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 5f12858f6..16ab305e5 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,6 +1,5 @@
{% spaceless %}
-{% load bookwyrm_tags %}
{% load i18n %}
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index f6021622a..5fd918981 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -1,4 +1,7 @@
{% load bookwyrm_tags %}
+{% load utilities %}
+{% load status_display %}
+
{% load i18n %}
diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
index 463906501..c79c6971f 100644
--- a/bookwyrm/templates/user_admin/user.html
+++ b/bookwyrm/templates/user_admin/user.html
@@ -1,7 +1,5 @@
{% extends 'settings/admin_layout.html' %}
{% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
{% block title %}{{ user.username }}{% endblock %}
{% block header %}{{ user.username }}{% endblock %}
diff --git a/bookwyrm/templates/user_admin/user_info.html b/bookwyrm/templates/user_admin/user_info.html
index e5f5d5806..579b3af7e 100644
--- a/bookwyrm/templates/user_admin/user_info.html
+++ b/bookwyrm/templates/user_admin/user_info.html
@@ -1,5 +1,5 @@
{% load i18n %}
-{% load bookwyrm_tags %}
+{% load markdown %}
{% trans "User details" %}
@@ -7,7 +7,7 @@ {% include 'user/user_preview.html' with user=user %} {% if user.summary %}
- {{ user.summary | to_markdown | safe }}
+ {{ user.summary|to_markdown|safe }}
{% endif %}
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index eda3d1023..70228799f 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -1,22 +1,15 @@
""" template filters """
-from uuid import uuid4
-
-from django import template, utils
+from django import template
from django.db.models import Avg
from bookwyrm import models, views
from bookwyrm.views.status import to_markdown
+from bookwyrm.templatetags.utilities import get_user_identifier
register = template.Library()
-@register.filter(name="dict_key")
-def dict_key(d, k):
- """Returns the given key from a dictionary."""
- return d.get(k) or 0
-
-
@register.filter(name="rating")
def get_rating(book, user):
"""get the overall rating of a book"""
@@ -43,119 +36,12 @@ def get_user_rating(book, user):
return 0
-@register.filter(name="username")
-def get_user_identifier(user):
- """use localname for local users, username for remote"""
- return user.localname if user.localname else user.username
-
-
-@register.filter(name="notification_count")
-def get_notification_count(user):
- """how many UNREAD notifications are there"""
- return user.notification_set.filter(read=False).count()
-
-
-@register.filter(name="replies")
-def get_replies(status):
- """get all direct replies to a status"""
- # TODO: this limit could cause problems
- return models.Status.objects.filter(
- reply_parent=status,
- deleted=False,
- ).select_subclasses()[:10]
-
-
-@register.filter(name="parent")
-def get_parent(status):
- """get the reply parent for a status"""
- return (
- models.Status.objects.filter(id=status.reply_parent_id)
- .select_subclasses()
- .get()
- )
-
-
-@register.filter(name="liked")
-def get_user_liked(user, status):
- """did the given user fav a status?"""
- try:
- models.Favorite.objects.get(user=user, status=status)
- return True
- except models.Favorite.DoesNotExist:
- return False
-
-
-@register.filter(name="boosted")
-def get_user_boosted(user, status):
- """did the given user fav a status?"""
- return user.id in status.boosters.all().values_list("user", flat=True)
-
-
-@register.filter(name="follow_request_exists")
-def follow_request_exists(user, requester):
- """see if there is a pending follow request for a user"""
- try:
- models.UserFollowRequest.objects.filter(
- user_subject=requester,
- user_object=user,
- ).get()
- return True
- except models.UserFollowRequest.DoesNotExist:
- return False
-
-
-@register.filter(name="boosted_status")
-def get_boosted(boost):
- """load a boosted status. have to do this or it wont get foregin keys"""
- return (
- models.Status.objects.select_subclasses()
- .filter(id=boost.boosted_status.id)
- .get()
- )
-
-
@register.filter(name="book_description")
def get_book_description(book):
"""use the work's text if the book doesn't have it"""
return book.description or book.parent_work.description
-@register.filter(name="uuid")
-def get_uuid(identifier):
- """for avoiding clashing ids when there are many forms"""
- return "%s%s" % (identifier, uuid4())
-
-
-@register.filter(name="to_markdown")
-def get_markdown(content):
- """convert markdown to html"""
- if content:
- return to_markdown(content)
- return None
-
-
-@register.filter(name="mentions")
-def get_mentions(status, user):
- """people to @ in a reply: the parent and all mentions"""
- mentions = set([status.user] + list(status.mention_users.all()))
- return (
- " ".join("@" + get_user_identifier(m) for m in mentions if not m == user) + " "
- )
-
-
-@register.filter(name="status_preview_name")
-def get_status_preview_name(obj):
- """text snippet with book context for a status"""
- name = obj.__class__.__name__.lower()
- if name == "review":
- return "%s of %s" % (name, obj.book.title)
- if name == "comment":
- return "%s on %s" % (name, obj.book.title)
- if name == "quotation":
- return "%s from %s" % (name, obj.book.title)
- return name
-
-
@register.filter(name="next_shelf")
def get_next_shelf(current_shelf):
"""shelf you'd use to update reading progress"""
@@ -168,17 +54,6 @@ def get_next_shelf(current_shelf):
return "to-read"
-@register.filter(name="title")
-def get_title(book):
- """display the subtitle if the title is short"""
- if not book:
- return ""
- title = book.title
- if len(title) < 6 and book.subtitle:
- title = "{:s}: {:s}".format(title, book.subtitle)
- return title
-
-
@register.simple_tag(takes_context=False)
def related_status(notification):
"""for notifications"""
@@ -212,31 +87,6 @@ def latest_read_through(book, user):
)
-@register.simple_tag(takes_context=False)
-def active_read_through(book, user):
- """the most recent read activity"""
- return (
- models.ReadThrough.objects.filter(
- user=user, book=book, finish_date__isnull=True
- )
- .order_by("-start_date")
- .first()
- )
-
-
-@register.simple_tag(takes_context=False)
-def comparison_bool(str1, str2):
- """idk why I need to write a tag for this, it reutrns a bool"""
- return str1 == str2
-
-
-@register.simple_tag(takes_context=False)
-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"""
diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py
new file mode 100644
index 000000000..6e8d0549c
--- /dev/null
+++ b/bookwyrm/templatetags/interaction.py
@@ -0,0 +1,22 @@
+""" template filters for status interaction buttons """
+from django import template
+from bookwyrm import models
+
+
+register = template.Library()
+
+
+@register.filter(name="liked")
+def get_user_liked(user, status):
+ """did the given user fav a status?"""
+ try:
+ models.Favorite.objects.get(user=user, status=status)
+ return True
+ except models.Favorite.DoesNotExist:
+ return False
+
+
+@register.filter(name="boosted")
+def get_user_boosted(user, status):
+ """did the given user fav a status?"""
+ return user.id in status.boosters.all().values_list("user", flat=True)
diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py
new file mode 100644
index 000000000..e0f1d8ba6
--- /dev/null
+++ b/bookwyrm/templatetags/layout.py
@@ -0,0 +1,12 @@
+""" template filters used for creating the layout"""
+from django import template, utils
+
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=False)
+def get_lang():
+ """get current language, strip to the first two letters"""
+ language = utils.translation.get_language()
+ return language[0 : language.find("-")]
diff --git a/bookwyrm/templatetags/markdown.py b/bookwyrm/templatetags/markdown.py
new file mode 100644
index 000000000..370d60a1a
--- /dev/null
+++ b/bookwyrm/templatetags/markdown.py
@@ -0,0 +1,14 @@
+""" template filters """
+from django import template
+from bookwyrm.views.status import to_markdown
+
+
+register = template.Library()
+
+
+@register.filter(name="to_markdown")
+def get_markdown(content):
+ """convert markdown to html"""
+ if content:
+ return to_markdown(content)
+ return None
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
new file mode 100644
index 000000000..f39de9e39
--- /dev/null
+++ b/bookwyrm/templatetags/status_display.py
@@ -0,0 +1,43 @@
+""" template filters """
+from django import template
+
+from bookwyrm import models
+from bookwyrm.templatetags.utilities import get_user_identifier
+
+
+register = template.Library()
+
+
+@register.filter(name="mentions")
+def get_mentions(status, user):
+ """people to @ in a reply: the parent and all mentions"""
+ mentions = set([status.user] + list(status.mention_users.all()))
+ return (
+ " ".join("@" + get_user_identifier(m) for m in mentions if not m == user) + " "
+ )
+
+
+@register.filter(name="replies")
+def get_replies(status):
+ """get all direct replies to a status"""
+ # TODO: this limit could cause problems
+ return models.Status.objects.filter(
+ reply_parent=status,
+ deleted=False,
+ ).select_subclasses()[:10]
+
+
+@register.filter(name="parent")
+def get_parent(status):
+ """get the reply parent for a status"""
+ return (
+ models.Status.objects.filter(id=status.reply_parent_id)
+ .select_subclasses()
+ .get()
+ )
+
+
+@register.filter(name="boosted_status")
+def get_boosted(boost):
+ """load a boosted status. have to do this or it won't get foreign keys"""
+ return models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
new file mode 100644
index 000000000..f828397ea
--- /dev/null
+++ b/bookwyrm/templatetags/utilities.py
@@ -0,0 +1,35 @@
+""" template filters for really common utilities """
+from uuid import uuid4
+from django import template
+
+
+register = template.Library()
+
+
+@register.filter(name="uuid")
+def get_uuid(identifier):
+ """for avoiding clashing ids when there are many forms"""
+ return "%s%s" % (identifier, uuid4())
+
+
+@register.filter(name="username")
+def get_user_identifier(user):
+ """use localname for local users, username for remote"""
+ return user.localname if user.localname else user.username
+
+
+@register.filter(name="title")
+def get_title(book):
+ """display the subtitle if the title is short"""
+ if not book:
+ return ""
+ title = book.title
+ if len(title) < 6 and book.subtitle:
+ title = "{:s}: {:s}".format(title, book.subtitle)
+ return title
+
+
+@register.simple_tag(takes_context=False)
+def comparison_bool(str1, str2):
+ """idk why I need to write a tag for this, it reutrns a bool"""
+ return str1 == str2
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index a92e887a3..4b1aa5946 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -2,12 +2,17 @@
import re
from unittest.mock import patch
-from dateutil.relativedelta import relativedelta
from django.test import TestCase
from django.utils import timezone
from bookwyrm import models
-from bookwyrm.templatetags import bookwyrm_tags
+from bookwyrm.templatetags import (
+ bookwyrm_tags,
+ interaction,
+ markdown,
+ status_display,
+ utilities,
+)
@patch("bookwyrm.activitystreams.ActivityStream.add_status")
@@ -33,12 +38,6 @@ class TemplateTags(TestCase):
)
self.book = models.Edition.objects.create(title="Test Book")
- def test_dict_key(self, _):
- """just getting a value out of a dict"""
- test_dict = {"a": 1, "b": 3}
- self.assertEqual(bookwyrm_tags.dict_key(test_dict, "a"), 1)
- self.assertEqual(bookwyrm_tags.dict_key(test_dict, "c"), 0)
-
def test_get_user_rating(self, _):
"""get a user's most recent rating of a book"""
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -52,27 +51,14 @@ class TemplateTags(TestCase):
def test_get_user_identifer_local(self, _):
"""fall back to the simplest uid available"""
self.assertNotEqual(self.user.username, self.user.localname)
- self.assertEqual(bookwyrm_tags.get_user_identifier(self.user), "mouse")
+ self.assertEqual(utilities.get_user_identifier(self.user), "mouse")
def test_get_user_identifer_remote(self, _):
"""for a remote user, should be their full username"""
self.assertEqual(
- bookwyrm_tags.get_user_identifier(self.remote_user), "rat@example.com"
+ utilities.get_user_identifier(self.remote_user), "rat@example.com"
)
- def test_get_notification_count(self, _):
- """just countin'"""
- self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 0)
-
- models.Notification.objects.create(user=self.user, notification_type="FAVORITE")
- models.Notification.objects.create(user=self.user, notification_type="MENTION")
-
- models.Notification.objects.create(
- user=self.remote_user, notification_type="FOLLOW"
- )
-
- self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 2)
-
def test_get_replies(self, _):
"""direct replies to a status"""
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -95,7 +81,7 @@ class TemplateTags(TestCase):
deleted_date=timezone.now(),
)
- replies = bookwyrm_tags.get_replies(parent)
+ replies = status_display.get_replies(parent)
self.assertEqual(len(replies), 2)
self.assertTrue(first_child in replies)
self.assertTrue(second_child in replies)
@@ -111,7 +97,7 @@ class TemplateTags(TestCase):
reply_parent=parent, user=self.user, content="hi"
)
- result = bookwyrm_tags.get_parent(child)
+ result = status_display.get_parent(child)
self.assertEqual(result, parent)
self.assertIsInstance(result, models.Review)
@@ -119,44 +105,26 @@ class TemplateTags(TestCase):
"""did a user like a status"""
status = models.Review.objects.create(user=self.remote_user, book=self.book)
- self.assertFalse(bookwyrm_tags.get_user_liked(self.user, status))
+ self.assertFalse(interaction.get_user_liked(self.user, status))
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
models.Favorite.objects.create(user=self.user, status=status)
- self.assertTrue(bookwyrm_tags.get_user_liked(self.user, status))
+ self.assertTrue(interaction.get_user_liked(self.user, status))
def test_get_user_boosted(self, _):
"""did a user boost a status"""
status = models.Review.objects.create(user=self.remote_user, book=self.book)
- self.assertFalse(bookwyrm_tags.get_user_boosted(self.user, status))
+ self.assertFalse(interaction.get_user_boosted(self.user, status))
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
models.Boost.objects.create(user=self.user, boosted_status=status)
- self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status))
-
- def test_follow_request_exists(self, _):
- """does a user want to follow"""
- self.assertFalse(
- bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
- )
-
- with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
- models.UserFollowRequest.objects.create(
- user_subject=self.user, user_object=self.remote_user
- )
-
- self.assertFalse(
- bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
- )
- self.assertTrue(
- bookwyrm_tags.follow_request_exists(self.remote_user, self.user)
- )
+ self.assertTrue(interaction.get_user_boosted(self.user, status))
def test_get_boosted(self, _):
"""load a boosted status"""
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
status = models.Review.objects.create(user=self.remote_user, book=self.book)
boost = models.Boost.objects.create(user=self.user, boosted_status=status)
- boosted = bookwyrm_tags.get_boosted(boost)
+ boosted = status_display.get_boosted(boost)
self.assertIsInstance(boosted, models.Review)
self.assertEqual(boosted, status)
@@ -178,48 +146,23 @@ class TemplateTags(TestCase):
def test_get_uuid(self, _):
"""uuid functionality"""
- uuid = bookwyrm_tags.get_uuid("hi")
+ uuid = utilities.get_uuid("hi")
self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid))
def test_get_markdown(self, _):
"""mardown format data"""
- result = bookwyrm_tags.get_markdown("_hi_")
+ result = markdown.get_markdown("_hi_")
self.assertEqual(result, "hi
") - result = bookwyrm_tags.get_markdown("") + result = markdown.get_markdown("") self.assertEqual(result, "hi
") def test_get_mentions(self, _): """list of people mentioned""" status = models.Status.objects.create(content="hi", user=self.remote_user) - result = bookwyrm_tags.get_mentions(status, self.user) + result = status_display.get_mentions(status, self.user) self.assertEqual(result, "@rat@example.com ") - def test_get_status_preview_name(self, _): - """status context string""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - status = models.Status.objects.create(content="hi", user=self.user) - result = bookwyrm_tags.get_status_preview_name(status) - self.assertEqual(result, "status") - - status = models.Review.objects.create( - content="hi", user=self.user, book=self.book - ) - result = bookwyrm_tags.get_status_preview_name(status) - self.assertEqual(result, "review of Test Book") - - status = models.Comment.objects.create( - content="hi", user=self.user, book=self.book - ) - result = bookwyrm_tags.get_status_preview_name(status) - self.assertEqual(result, "comment on Test Book") - - status = models.Quotation.objects.create( - content="hi", user=self.user, book=self.book - ) - result = bookwyrm_tags.get_status_preview_name(status) - self.assertEqual(result, "quotation from Test Book") - def test_related_status(self, _): """gets the subclass model for a notification status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 5312ac212..758e290ed 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -2,6 +2,7 @@ from collections import namedtuple from django.db import IntegrityError +from django.db.models import Count, OuterRef, Subquery, F, Q from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.http import HttpResponseBadRequest, HttpResponseNotFound @@ -37,30 +38,41 @@ class Shelf(View): return HttpResponseNotFound() if not shelf.visible_to_user(request.user): return HttpResponseNotFound() + books = shelf.books # this is a constructed "all books" view, with a fake "shelf" obj else: FakeShelf = namedtuple( "Shelf", ("identifier", "name", "user", "books", "privacy") ) books = models.Edition.objects.filter( + # privacy is ensured because the shelves are already filtered above shelfbook__shelf__in=shelves.all() ).distinct() shelf = FakeShelf("all", _("All books"), user, books, "public") - is_self = request.user == user - if is_api_request(request): return ActivitypubResponse(shelf.to_activity(**request.GET)) + reviews = privacy_filter( + request.user, + models.Review.objects.filter( + user=user, + rating__isnull=False, + book__id=OuterRef("id"), + ), + ).order_by("-published_date") + + books = books.annotate(rating=Subquery(reviews.values("rating")[:1])) + paginated = Paginator( - shelf.books.order_by("-updated_date"), + books.order_by("-updated_date"), PAGE_LENGTH, ) page = paginated.get_page(request.GET.get("page")) data = { "user": user, - "is_self": is_self, + "is_self": request.user == user, "shelves": shelves.all(), "shelf": shelf, "books": page,