diff --git a/apps/reader/tests.py b/apps/reader/tests.py index ea8c6e1..1ee7337 100644 --- a/apps/reader/tests.py +++ b/apps/reader/tests.py @@ -217,3 +217,75 @@ def test_article_rows_carry_their_utc_instant_for_client_side_date_grouping(clie undated_row = re.search(rf'
  • ', content, flags=re.DOTALL) assert undated_row is not None assert 'data-published-utc=""' in undated_row.group(0) + + +@pytest.mark.django_db +def test_check_new_articles_reports_nothing_below_the_given_cursor(client, alice): + feed = Feed.objects.create(feed_url="https://example.com/feed.xml") + Subscription.objects.create(user=alice, feed=feed) + existing = Article.objects.create(feed=feed, guid="existing", title="Existing") + + client.login(username="alice", password="pw-alice-123") + response = client.get(reverse("reader:check_new"), {"filter": "all", "since": existing.pk}) + + assert response.status_code == 200 + assert response.content.decode().strip() == "" + + +@pytest.mark.django_db +def test_check_new_articles_reports_articles_created_after_the_cursor(client, alice): + feed = Feed.objects.create(feed_url="https://example.com/feed.xml") + Subscription.objects.create(user=alice, feed=feed) + existing = Article.objects.create(feed=feed, guid="existing", title="Existing") + Article.objects.create(feed=feed, guid="new-1", title="New one") + + client.login(username="alice", password="pw-alice-123") + response = client.get(reverse("reader:check_new"), {"filter": "all", "since": existing.pk}) + + content = response.content.decode() + assert "1 new article" in content + assert "click to show" in content + + +@pytest.mark.django_db +def test_check_new_articles_respects_the_active_tag_scope(client, alice): + from apps.articles.models import SubscriptionTag, Tag + + feed_a = Feed.objects.create(feed_url="https://a.example.com/feed.xml") + feed_b = Feed.objects.create(feed_url="https://b.example.com/feed.xml") + sub_a = Subscription.objects.create(user=alice, feed=feed_a) + Subscription.objects.create(user=alice, feed=feed_b) + tag = Tag.objects.create(user=alice, name="work") + SubscriptionTag.objects.create(user=alice, subscription=sub_a, tag=tag) + + cursor = Article.objects.create(feed=feed_a, guid="cursor", title="Cursor").pk + # New in feed_b, which isn't tagged "work" — shouldn't count for this scope. + Article.objects.create(feed=feed_b, guid="untagged-new", title="Untagged new") + + client.login(username="alice", password="pw-alice-123") + response = client.get( + reverse("reader:check_new"), {"filter": "all", "tag": tag.pk, "since": cursor} + ) + + assert response.content.decode().strip() == "" + + # New in feed_a (tagged "work") — should count. + Article.objects.create(feed=feed_a, guid="tagged-new", title="Tagged new") + response = client.get( + reverse("reader:check_new"), {"filter": "all", "tag": tag.pk, "since": cursor} + ) + assert "1 new article" in response.content.decode() + + +@pytest.mark.django_db +def test_stream_exposes_the_latest_article_id_and_scope_for_the_banner(client, alice): + feed = Feed.objects.create(feed_url="https://example.com/feed.xml") + Subscription.objects.create(user=alice, feed=feed) + article = Article.objects.create(feed=feed, guid="g1", title="Hello") + + client.login(username="alice", password="pw-alice-123") + response = client.get(reverse("reader:stream"), {"filter": "all"}) + content = response.content.decode() + + assert f"since={article.pk}" in content + assert "filter=all" in content diff --git a/apps/reader/urls.py b/apps/reader/urls.py index cf683ab..6020dbe 100644 --- a/apps/reader/urls.py +++ b/apps/reader/urls.py @@ -6,6 +6,7 @@ app_name = "reader" urlpatterns = [ path("", views.stream, name="stream"), + path("check-new/", views.check_new_articles, name="check_new"), path("mark-all-read/", views.mark_all_read, name="mark_all_read"), path("articles//", views.article_detail, name="article_detail"), path( diff --git a/apps/reader/views.py b/apps/reader/views.py index 3c2fd70..734d289 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -1,7 +1,8 @@ from itertools import groupby +from urllib.parse import urlencode from django.contrib.auth.decorators import login_required -from django.db.models import Q +from django.db.models import Max, Q from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse @@ -117,8 +118,7 @@ def _group_by_date(articles): ] -@login_required -def stream(request): +def _resolve_active_filter(request): requested_filter = request.GET.get("filter") if requested_filter in VALID_FILTERS: active_filter = requested_filter @@ -128,7 +128,14 @@ def stream(request): # selected, rather than always resetting to "unread". active_filter = request.session.get("stream_filter", "unread") request.session["stream_filter"] = active_filter + return active_filter + +def _filtered_queryset(request, active_filter): + """The stream's fully-scoped queryset (filter tab + tag/feed scope), + unpaginated — shared by stream() and check_new_articles() so the "any + new articles?" check always matches exactly what the stream itself + would show.""" queryset = _base_queryset(request.user) if active_filter == "unread": queryset = queryset.exclude(user_states__user=request.user, user_states__is_read=True) @@ -146,8 +153,13 @@ def stream(request): article_tags__tag__name=SAVED_TAG_NAME, article_tags__tag__is_system=True, ) + return _apply_scope(request, queryset) - queryset, active_tag, active_feed = _apply_scope(request, queryset) + +@login_required +def stream(request): + active_filter = _resolve_active_filter(request) + queryset, active_tag, active_feed = _filtered_queryset(request, active_filter) try: page = max(int(request.GET.get("page", 1)), 1) @@ -158,6 +170,12 @@ def stream(request): total_count = queryset.count() articles = with_user_state(queryset[start:end], request.user) + scope_params = {"filter": active_filter} + if active_tag: + scope_params["tag"] = active_tag.pk + if active_feed: + scope_params["feed"] = active_feed.pk + context = { "date_groups": _group_by_date(articles), "active_filter": active_filter, @@ -168,10 +186,30 @@ def stream(request): "page": page, "has_next_page": end < total_count, "has_previous_page": page > 1, + # Lets the "new articles" banner ask, on this exact same scope, + # whether anything with a higher id has shown up since this page + # was rendered — id (not published_at) because it's monotonic + # regardless of how a feed backdates an entry's published date. + "latest_article_id": queryset.aggregate(Max("id"))["id__max"] or 0, + "new_check_qs": urlencode(scope_params), } return render(request, "reader/stream.html", context) +@login_required +def check_new_articles(request): + active_filter = _resolve_active_filter(request) + queryset, _active_tag, _active_feed = _filtered_queryset(request, active_filter) + + try: + since_id = int(request.GET.get("since", 0)) + except ValueError: + since_id = 0 + + new_count = queryset.filter(id__gt=since_id).count() + return render(request, "reader/_new_articles_banner.html", {"new_count": new_count}) + + @login_required @require_POST def mark_all_read(request): diff --git a/static/css/base.css b/static/css/base.css index 478f360..1386ea5 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -113,6 +113,19 @@ form p { display: inline; } +.new-articles-banner { + display: block; + width: 100%; + margin: 0 0 0.75rem; + padding: 0.5rem 0.75rem; + border: none; + border-radius: 0.375rem; + background: var(--accent); + color: #fff; + font-weight: 600; + text-align: center; +} + .empty-state { opacity: 0.6; padding: 2rem 0; diff --git a/templates/reader/_new_articles_banner.html b/templates/reader/_new_articles_banner.html new file mode 100644 index 0000000..d63da00 --- /dev/null +++ b/templates/reader/_new_articles_banner.html @@ -0,0 +1,5 @@ +{% if new_count %} + +{% endif %} diff --git a/templates/reader/stream.html b/templates/reader/stream.html index 5d003d6..f657713 100644 --- a/templates/reader/stream.html +++ b/templates/reader/stream.html @@ -23,5 +23,11 @@ +
    + {% include "reader/_article_list.html" %} {% endblock %}