Private
Public Access
The previous UI was plain unstyled lists. Rebuilt around what FreshRSS actually looks like (per reference screenshots): a persistent left sidebar (folders/feeds with unread counts, favourites, tags) and a single main column with a date-grouped article list, where clicking a title expands the full article inline in place rather than navigating to a separate page. - apps/core/context_processors.py: feeds the sidebar's folder/feed tree, tags, and starred count to every authenticated page in one shared query set, so base.html can render it without each view wiring it up. - apps/reader/views.py: date-grouped stream (itertools.groupby over the already-ordered queryset), ?feed=/?folder= scoping alongside the existing ?tag=, a bulk mark-all-read endpoint (bulk_create/update, not one UserArticleState per article), and article_inline — the htmx endpoint behind the inline expand, sharing its mark-read logic with the full article_detail view via _load_article_and_mark_read. - templates/reader/_article_inline.html returns the article content plus an out-of-band swap of _article_actions.html, so the row's read/star icons update immediately when an article is expanded and marked read. - static/js/stream.js: the accordion toggle (one article open at a time), calling htmx.ajax() directly rather than hx-* attributes so a second click on an already-open row can collapse it without re-fetching. - static/css/base.css: full FreshRSS-like dark theme (with a light variant under prefers-color-scheme) replacing the previous unstyled pass — sidebar, topbar search, row/icon states, inline-expand styling. Verified end to end against a running dev server: folder/feed/tag scoping, mark-all-read, the inline-expand mark-read side effect and its icon update, and — against config.settings.prod specifically — that no inline <script> crept back in anywhere (would silently break under the CSP added in the previous commit) and the CSP header is still present on every page. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
45 lines
1.6 KiB
Python
45 lines
1.6 KiB
Python
from django.db.models import Count
|
|
|
|
from .models import Article, UserArticleState
|
|
|
|
|
|
def with_user_state(articles, user):
|
|
"""Annotates an iterable of Article instances with is_read/is_starred/
|
|
is_saved_for_later booleans for the given user, in two queries total
|
|
regardless of how many articles there are (no N+1).
|
|
|
|
Accepts either a queryset or a plain list (search backends return
|
|
plain lists already ordered by relevance), materializing it either
|
|
way.
|
|
"""
|
|
articles = list(articles)
|
|
if not articles:
|
|
return articles
|
|
|
|
states = {
|
|
state.article_id: state
|
|
for state in UserArticleState.objects.filter(
|
|
user=user, article_id__in=[a.pk for a in articles]
|
|
)
|
|
}
|
|
for article in articles:
|
|
state = states.get(article.pk)
|
|
article.is_read = state.is_read if state else False
|
|
article.is_starred = state.is_starred if state else False
|
|
article.is_saved_for_later = state.is_saved_for_later if state else False
|
|
return articles
|
|
|
|
|
|
def unread_counts_by_feed(user):
|
|
"""{feed_id: unread_count} for every feed the user subscribes to, in one
|
|
query — used by the sidebar, so it must stay cheap regardless of how
|
|
many feeds/articles exist."""
|
|
rows = (
|
|
Article.objects.filter(feed__subscriptions__user=user)
|
|
.exclude(user_states__user=user, user_states__is_read=True)
|
|
.exclude(user_states__user=user, user_states__is_hidden=True)
|
|
.values("feed_id")
|
|
.annotate(unread=Count("id"))
|
|
)
|
|
return {row["feed_id"]: row["unread"] for row in rows}
|