diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 820314b7a..56c380202 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -33,7 +33,7 @@
- {% if request.user.show_goal and not goal and tab.key == 'home' and has_read_throughs %}
+ {% if request.user.show_goal and not goal and tab.key == 'home' %}
{% now 'Y' as year %}
{% include 'feed/goal_card.html' with year=year %}
@@ -41,7 +41,7 @@
{% endif %}
- {% if annual_summary_year and tab.key == 'home' %}
+ {% if annual_summary_year and tab.key == 'home' and has_read_throughs %}
{% include 'feed/summary_card.html' with year=annual_summary_year %}
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 381d233e9..45ff00d02 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -1,4 +1,5 @@
""" non-interactive pages """
+from datetime import date
from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator
from django.db.models import Q
@@ -51,8 +52,11 @@ class Feed(View):
paginated = Paginator(filtered_activities, PAGE_LENGTH)
suggestions = suggested_users.get_suggestions(request.user)
-
- readthroughs = models.ReadThrough.objects.filter(user=request.user)
+ cutoff = date(get_annual_summary_year(), 12, 31)
+ readthroughs = models.ReadThrough.objects.filter(
+ user=request.user,
+ finish_date__lte=cutoff
+ )
data = {
**feed_page_data(request.user),
@@ -68,7 +72,7 @@ class Feed(View):
"path": f"/{tab['key']}",
"annual_summary_year": get_annual_summary_year(),
"has_tour": True,
- "has_read_throughs": True if len(readthroughs) else False,
+ "has_read_throughs": len(readthroughs) > 0,
},
}
return TemplateResponse(request, "feed/feed.html", data)