Private
Public Access
Subscription editing was a real gap: there was no way to rename a feed's display title, move it between folders, or create a folder at all outside OPML import. Added an edit page (apps/feeds/views.py:edit_subscription, EditSubscriptionForm) reachable from the subscriptions list. Added feed-level tagging via a new SubscriptionTag model (apps/articles/ models.py), mirroring the existing ArticleTag — tag a whole feed on its edit page, and every one of its articles surfaces under that tag in the stream alongside individually-tagged articles (apps.reader.views._apply_ scope now matches either). Renamed AddTagToArticleForm to AddTagForm since it's shared by both now. The stream also now remembers the last filter (unread/all/starred/saved) in the session instead of always defaulting to "unread" when a sidebar feed/folder/tag link omits ?filter= — sidebar links no longer force ?filter=all, letting the remembered choice apply. Verified end to end against a running dev server: editing a subscription's title/folder, creating a folder inline, tagging a feed and seeing its articles appear under that tag, and the remembered-filter behavior across requests with no ?filter= param. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
113 lines
4.0 KiB
Python
113 lines
4.0 KiB
Python
from django.conf import settings
|
|
from django.db import models
|
|
|
|
from apps.feeds.models import Feed, Subscription
|
|
|
|
|
|
class Article(models.Model):
|
|
"""A single fetched entry, shared across every subscriber of its feed.
|
|
|
|
Per-user state (read/starred/saved/hidden) lives in UserArticleState,
|
|
never on this model — editing an article's content on re-fetch must
|
|
never touch anyone's read/star state.
|
|
"""
|
|
|
|
feed = models.ForeignKey(Feed, on_delete=models.CASCADE, related_name="articles")
|
|
guid = models.CharField(max_length=1000)
|
|
link = models.URLField(max_length=2000, blank=True)
|
|
title = models.CharField(max_length=1000, blank=True)
|
|
author = models.CharField(max_length=500, blank=True)
|
|
content_html = models.TextField(blank=True)
|
|
summary = models.TextField(blank=True)
|
|
content_hash = models.CharField(max_length=64, blank=True)
|
|
published_at = models.DateTimeField(null=True, blank=True)
|
|
fetched_at = models.DateTimeField(auto_now_add=True)
|
|
|
|
class Meta:
|
|
unique_together = [("feed", "guid")]
|
|
indexes = [models.Index(fields=["feed", "published_at"])]
|
|
ordering = ["-published_at", "-fetched_at"]
|
|
|
|
def __str__(self):
|
|
return self.title or self.guid
|
|
|
|
|
|
class UserArticleState(models.Model):
|
|
"""Per-user read/star/save/hide state for an Article.
|
|
|
|
Rows are created lazily, only on first interaction — a row with no
|
|
explicit True flags is equivalent to "no row exists" (unread, not
|
|
starred). Never bulk-create one of these per subscriber on ingest.
|
|
"""
|
|
|
|
user = models.ForeignKey(
|
|
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="article_states"
|
|
)
|
|
article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name="user_states")
|
|
|
|
is_read = models.BooleanField(default=False)
|
|
is_starred = models.BooleanField(default=False)
|
|
is_saved_for_later = models.BooleanField(default=False)
|
|
is_hidden = models.BooleanField(default=False)
|
|
|
|
read_at = models.DateTimeField(null=True, blank=True)
|
|
starred_at = models.DateTimeField(null=True, blank=True)
|
|
|
|
class Meta:
|
|
unique_together = [("user", "article")]
|
|
indexes = [
|
|
models.Index(fields=["user", "is_read"]),
|
|
models.Index(fields=["user", "is_starred"]),
|
|
]
|
|
|
|
def __str__(self):
|
|
return f"{self.user}: {self.article}"
|
|
|
|
|
|
class Tag(models.Model):
|
|
user = models.ForeignKey(
|
|
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="tags"
|
|
)
|
|
name = models.CharField(max_length=100)
|
|
color = models.CharField(max_length=7, blank=True)
|
|
|
|
class Meta:
|
|
unique_together = [("user", "name")]
|
|
ordering = ["name"]
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
|
|
class ArticleTag(models.Model):
|
|
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
|
|
article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name="article_tags")
|
|
tag = models.ForeignKey(Tag, on_delete=models.CASCADE, related_name="article_tags")
|
|
|
|
class Meta:
|
|
unique_together = [("user", "article", "tag")]
|
|
|
|
def __str__(self):
|
|
return f"{self.article} -> {self.tag}"
|
|
|
|
|
|
class SubscriptionTag(models.Model):
|
|
"""Tags a feed itself (via the user's Subscription to it), independent
|
|
of tagging individual articles — e.g. tagging a whole feed "backend"
|
|
rather than tagging each of its articles one by one. Articles from a
|
|
tagged feed show up under that tag in the stream alongside any
|
|
individually-tagged articles (see apps.reader.views._apply_scope).
|
|
"""
|
|
|
|
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
|
|
subscription = models.ForeignKey(
|
|
Subscription, on_delete=models.CASCADE, related_name="subscription_tags"
|
|
)
|
|
tag = models.ForeignKey(Tag, on_delete=models.CASCADE, related_name="subscription_tags")
|
|
|
|
class Meta:
|
|
unique_together = [("user", "subscription", "tag")]
|
|
|
|
def __str__(self):
|
|
return f"{self.subscription} -> {self.tag}"
|