diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 7d52572e..1d511184 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -1,5 +1,6 @@
{% extends 'layout.html' %}
{% load fr_display %}
+{% load humanize %}
{% block content %}
@@ -89,12 +90,36 @@
{% endif %}
-
+
{% for review in reviews %}
{% include 'snippets/status.html' with status=review hide_book=True depth=1 %}
{% endfor %}
+
+
+ {% for rating in ratings %}
+
+ {% endfor %}
+
+
+
{% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 89dfeceb..ccfbe0ef 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -67,8 +67,6 @@ urlpatterns = [
# books
re_path(r'%s(.json)?/?$' % book_path, views.book_page),
- re_path(r'%s/(?P
friends|local|federated)?$' % \
- book_path, views.book_page),
re_path(r'%s/edit/?$' % book_path, views.edit_book_page),
re_path(r'^editions/(?P\d+)/?$', views.editions_page),
diff --git a/bookwyrm/views.py b/bookwyrm/views.py
index 9d269b5d..30f01280 100644
--- a/bookwyrm/views.py
+++ b/bookwyrm/views.py
@@ -417,7 +417,7 @@ def edit_profile_page(request):
return TemplateResponse(request, 'edit_user.html', data)
-def book_page(request, book_id, tab='friends'):
+def book_page(request, book_id):
''' info about a book '''
book = models.Book.objects.select_subclasses().get(id=book_id)
if is_api_request(request):
@@ -432,23 +432,15 @@ def book_page(request, book_id, tab='friends'):
if not work:
return HttpResponseNotFound()
- book_reviews = models.Review.objects.filter(book__in=work.edition_set.all())
+ reviews = models.Review.objects.filter(
+ book__in=work.edition_set.all(),
+ ).order_by('-published_date')
+ user_tags = []
if request.user.is_authenticated:
- user_reviews = book_reviews.filter(
- user=request.user,
- ).all()
-
- reviews = get_activity_feed(request.user, tab, model=book_reviews)
-
user_tags = models.Tag.objects.filter(
book=book, user=request.user
).values_list('identifier', flat=True)
- else:
- tab = 'public'
- reviews = book_reviews.filter(privacy='public')
- user_reviews = []
- user_tags = []
rating = reviews.aggregate(Avg('rating'))
tags = models.Tag.objects.filter(
@@ -459,8 +451,8 @@ def book_page(request, book_id, tab='friends'):
data = {
'book': book,
- 'user_reviews': user_reviews,
- 'reviews': reviews.distinct(),
+ 'reviews': reviews.filter(content__isnull=False),
+ 'ratings': reviews.filter(content__isnull=True),
'rating': rating['rating__avg'],
'tags': tags,
'user_tags': user_tags,