diff --git a/apps/reader/tests.py b/apps/reader/tests.py
index 26fe5e2..a86ba6c 100644
--- a/apps/reader/tests.py
+++ b/apps/reader/tests.py
@@ -438,3 +438,38 @@ def test_stream_pagination_links_keep_the_feed_scope(client, alice):
_, content = _stream_article_ids(client, {"filter": "all", "feed": feed.pk})
assert _link_query(content, "Older")["feed"] == str(feed.pk)
+
+
+def test_templates_use_no_inline_event_handlers():
+ """Production's CSP (script-src 'self') blocks inline on*= handlers —
+ they work in dev, where no CSP is sent, and silently do nothing in
+ production. Behavior belongs in static/js."""
+ from pathlib import Path
+
+ from django.conf import settings
+
+ pattern = re.compile(r"""<[^>]+\s(on[a-z]+)\s*=""", re.IGNORECASE)
+ offenders = []
+ for template in Path(settings.BASE_DIR, "templates").rglob("*.html"):
+ for match in pattern.finditer(template.read_text()):
+ offenders.append(f"{template.name}: {match.group(1)}")
+ assert offenders == []
+
+
+@pytest.mark.django_db
+def test_article_detail_back_link_keeps_the_stream_scope(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")
+ stream = client.get(
+ reverse("reader:stream"), {"filter": "all", "feed": feed.pk}
+ ).content.decode()
+ link = re.search(r'href="(/articles/\d+/\?[^"]+)"', stream)
+ assert link is not None
+
+ detail = client.get(link.group(1).replace("&", "&")).content.decode()
+ assert f"filter=all&feed={feed.pk}" in detail
+ assert "Back to stream" in detail
+ assert article.title in detail
diff --git a/apps/reader/views.py b/apps/reader/views.py
index ae5a22d..46fa3af 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -238,6 +238,7 @@ def stream(request):
# 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),
+ "scope_qs": urlencode(scope_params),
}
return render(request, "reader/stream.html", context)
@@ -311,7 +312,14 @@ def _load_article_and_mark_read(user, article_id):
@login_required
def article_detail(request, article_id):
article = _load_article_and_mark_read(request.user, article_id)
- return render(request, "reader/article_detail.html", {"article": article})
+ # The stream passes its filter/tag/feed scope through the link so
+ # "Back to stream" returns to it instead of resetting to every feed.
+ back_params = {k: request.GET[k] for k in ("filter", "tag", "feed") if request.GET.get(k)}
+ return render(
+ request,
+ "reader/article_detail.html",
+ {"article": article, "back_qs": urlencode(back_params)},
+ )
@login_required
diff --git a/static/js/stream.js b/static/js/stream.js
index 4c4ff68..961cc5a 100644
--- a/static/js/stream.js
+++ b/static/js/stream.js
@@ -1,8 +1,11 @@
-function toggleArticle(event, id) {
- event.preventDefault();
- var link = event.currentTarget;
+// Delegated listeners, not inline onclick="" attributes: production's
+// Content Security Policy (config/settings/prod.py, script-src 'self')
+// blocks inline event handlers, which silently turned the title click into
+// a plain link to the detail page and the new-articles banner into a no-op.
+
+function toggleArticle(link) {
var row = link.closest("li.article-row");
- var body = document.getElementById("article-body-" + id);
+ var body = row.querySelector(".article-inline-body");
var wasOpen = row.classList.contains("is-expanded");
document.querySelectorAll("li.article-row.is-expanded").forEach(function (openRow) {
@@ -25,5 +28,20 @@ function toggleArticle(event, id) {
);
}
}
- return false;
}
+
+document.addEventListener("click", function (event) {
+ var link = event.target.closest("a.article-title[data-inline-url]");
+ if (link) {
+ // Leave modified clicks alone so "open in new tab" still works.
+ if (event.button !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) {
+ return;
+ }
+ event.preventDefault();
+ toggleArticle(link);
+ return;
+ }
+ if (event.target.closest(".new-articles-banner")) {
+ location.reload();
+ }
+});
diff --git a/templates/reader/_article_row.html b/templates/reader/_article_row.html
index 27a6a59..f5741f1 100644
--- a/templates/reader/_article_row.html
+++ b/templates/reader/_article_row.html
@@ -6,9 +6,8 @@
{% endif %}
{{ article.feed.title|default:article.feed.feed_url }}
- {{ article.title|default:"(untitled)" }}
+ {{ article.title|default:"(untitled)" }}
{% if article.published_at %}
{% endif %}
diff --git a/templates/reader/_new_articles_banner.html b/templates/reader/_new_articles_banner.html
index d63da00..1155a08 100644
--- a/templates/reader/_new_articles_banner.html
+++ b/templates/reader/_new_articles_banner.html
@@ -1,5 +1,5 @@
{% if new_count %}
-