Private
Public Access
Make the banner and sidebar counts live on every page
One 5-minute poll (/new-since/) now drives the new-articles banner, the tab dot and the sidebar counts, across all subscriptions rather than the selected feed/tag. The banner lives in the base layout with a server-rendered baseline id and reloads the current view on click; new articles are never inserted automatically. Sidebar counts are patched in place by the poll, and immediately after reading or starring (HX-Trigger: countsChanged). Ingestion, filter rules and subscription changes now drop the cached counts instead of waiting out the TTL. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
fed5bcc49e
commit
2a3e9f632e
18 files changed
+399
-196
No files matched your search
@@ -16,6 +16,20 @@ def sidebar_unread_cache_key(user_id: int) -> str:
|
||||
return f"sidebar-unread:{user_id}"
|
||||
|
||||
|
||||
def invalidate_feed_subscribers_sidebar_cache(feed_id: int) -> None:
|
||||
"""Drop the cached unread counts of everyone subscribed to a feed —
|
||||
called when ingestion adds articles or filter rules change their
|
||||
read/hidden state, so the sidebar's next refresh shows them at once
|
||||
instead of after the TTL."""
|
||||
from apps.feeds.models import Subscription
|
||||
|
||||
user_ids = Subscription.objects.filter(feed_id=feed_id).values_list("user_id", flat=True)
|
||||
try:
|
||||
cache.delete_many([sidebar_unread_cache_key(user_id) for user_id in user_ids])
|
||||
except Exception:
|
||||
logger.warning("Sidebar cache unavailable; nothing to invalidate")
|
||||
|
||||
|
||||
def invalidate_sidebar_unread_cache(user_id: int) -> None:
|
||||
"""Call this wherever a request changes the current user's own
|
||||
read/unread state (toggle_read, mark_all_read, viewing an article) so
|
||||
|
||||
@@ -1,8 +1,34 @@
|
||||
from apps.articles.models import STARRED_TAG_NAME, ArticleTag, SubscriptionTag, Tag
|
||||
from django.db.models import Max
|
||||
|
||||
from apps.articles.models import STARRED_TAG_NAME, Article, ArticleTag, SubscriptionTag, Tag
|
||||
from apps.articles.queries import unread_counts_by_feed
|
||||
from apps.feeds.models import Subscription
|
||||
|
||||
|
||||
def starred_count(user):
|
||||
return ArticleTag.objects.filter(
|
||||
user=user, tag__user=user, tag__name=STARRED_TAG_NAME, tag__is_system=True
|
||||
).count()
|
||||
|
||||
|
||||
def sidebar_counts(user):
|
||||
"""The sidebar's numbers on their own, for the live-update poll
|
||||
(static/js/live-updates.js) to patch into the rendered sidebar:
|
||||
unread per feed, unread per tag (summed over the feeds it covers,
|
||||
as in sidebar() below), and the starred total."""
|
||||
unread_counts = unread_counts_by_feed(user)
|
||||
tag_totals = {}
|
||||
for tag_id, feed_id in SubscriptionTag.objects.filter(
|
||||
user=user, tag__is_system=False
|
||||
).values_list("tag_id", "subscription__feed_id"):
|
||||
tag_totals[str(tag_id)] = tag_totals.get(str(tag_id), 0) + unread_counts.get(feed_id, 0)
|
||||
return {
|
||||
"feeds": {str(feed_id): count for feed_id, count in unread_counts.items()},
|
||||
"tags": tag_totals,
|
||||
"starred": starred_count(user),
|
||||
}
|
||||
|
||||
|
||||
def sidebar(request):
|
||||
"""Tag/feed tree and starred count for the persistent sidebar rendered
|
||||
by base.html on every authenticated page. Kept out of individual views
|
||||
@@ -59,7 +85,10 @@ def sidebar(request):
|
||||
for tag in tags
|
||||
],
|
||||
"sidebar_untagged": untagged,
|
||||
"sidebar_starred_count": ArticleTag.objects.filter(
|
||||
user=user, tag__user=user, tag__name=STARRED_TAG_NAME, tag__is_system=True
|
||||
).count(),
|
||||
"sidebar_starred_count": starred_count(user),
|
||||
# The page's "newest article seen" baseline for the new-articles
|
||||
# banner / tab dot; rendered into the page, not fetched, so there's
|
||||
# no gap between rendering and the first poll (and a page served
|
||||
# from the PWA cache still compares against what it actually shows).
|
||||
"latest_article_id": Article.objects.aggregate(Max("id"))["id__max"] or 0,
|
||||
}
|
||||
Reference in new issue
Block a user