Private
Public Access
Treat an article with no publish date as published when we fetched it
Feeds that give no publish date left the row with no time at all and grouped the article under "Undated". The stream's sort order already fell back to fetched_at; the list row, its date-group header, and the open article's header now use the same fallback. The article's own published_at stays empty — nothing is invented in the database, so a later refetch can't see a spurious change. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
c339d456e4
commit
bf6deb535f
4 files changed
+40
-11
No files matched your search
+33
-3
@@ -204,7 +204,7 @@ def test_article_rows_carry_their_utc_instant_for_client_side_date_grouping(clie
|
||||
dated = Article.objects.create(
|
||||
feed=feed, guid="dated", title="Dated", published_at=timezone.now()
|
||||
)
|
||||
undated = Article.objects.create(feed=feed, guid="undated", title="Undated")
|
||||
undated = Article.objects.create(feed=feed, guid="undated", title="No publish date")
|
||||
|
||||
client.login(username="alice", password="pw-alice-123")
|
||||
response = client.get(reverse("reader:stream"), {"filter": "all"})
|
||||
@@ -214,9 +214,15 @@ def test_article_rows_carry_their_utc_instant_for_client_side_date_grouping(clie
|
||||
assert f'id="article-{dated.pk}"' in content
|
||||
assert f'data-published-utc="{expected_iso}"' in content
|
||||
|
||||
undated_row = re.search(rf'<li id="article-{undated.pk}".*?>', content, flags=re.DOTALL)
|
||||
# A feed that gave no publish date falls back to when it was fetched
|
||||
# (the same fallback the stream's sort order uses), so the row still
|
||||
# carries a time and groups under a real date, not "Undated".
|
||||
undated_row = re.search(rf'<li id="article-{undated.pk}".*?</li>', content, flags=re.DOTALL)
|
||||
assert undated_row is not None
|
||||
assert 'data-published-utc=""' in undated_row.group(0)
|
||||
row_html = undated_row.group(0)
|
||||
assert f'data-published-utc="{undated.fetched_at.isoformat()}"' in row_html
|
||||
assert 'class="article-time"' in row_html
|
||||
assert "Undated" not in content
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
@@ -473,3 +479,27 @@ def test_article_detail_back_link_keeps_the_stream_scope(client, alice):
|
||||
assert f"filter=all&feed={feed.pk}" in detail
|
||||
assert "Back to stream" in detail
|
||||
assert article.title in detail
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_article_with_no_publish_date_shows_when_it_was_fetched(client, alice):
|
||||
"""A feed that gives no date is treated as published when we fetched
|
||||
it — in the list row, its group header, and the open article's header
|
||||
— without storing an invented value on the article itself."""
|
||||
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="No publish date")
|
||||
assert article.published_at is None
|
||||
|
||||
client.login(username="alice", password="pw-alice-123")
|
||||
iso = article.fetched_at.isoformat()
|
||||
|
||||
stream = client.get(reverse("reader:stream"), {"filter": "all"}).content.decode()
|
||||
assert f'datetime="{iso}"' in stream
|
||||
assert "Received today" in stream
|
||||
|
||||
detail = client.get(reverse("reader:article_detail", args=[article.pk])).content.decode()
|
||||
assert f'datetime="{iso}"' in detail
|
||||
|
||||
article.refresh_from_db()
|
||||
assert article.published_at is None
|
||||
@@ -113,7 +113,8 @@ def _group_by_date(articles):
|
||||
today = timezone.localdate()
|
||||
|
||||
def day_of(article):
|
||||
return timezone.localtime(article.published_at).date() if article.published_at else None
|
||||
when = article.published_at or article.fetched_at
|
||||
return timezone.localtime(when).date() if when else None
|
||||
|
||||
return [
|
||||
{"label": _date_label(day, today), "articles": list(items)}
|
||||
|
||||
@@ -3,9 +3,8 @@
|
||||
<p class="article-meta">
|
||||
{% if article.feed.favicon_url %}<img src="{{ article.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
|
||||
{{ article.feed.title }}
|
||||
{% if article.published_at %}
|
||||
· <time datetime="{{ article.published_at|date:"c" }}" data-local-format="long">{{ article.published_at|date:"M j, Y H:i" }}</time>
|
||||
{% endif %}
|
||||
{# fetched_at stands in when the feed gave no publish date #}
|
||||
· <time datetime="{{ article.published_at|default:article.fetched_at|date:"c" }}" data-local-format="long">{{ article.published_at|default:article.fetched_at|date:"M j, Y H:i" }}</time>
|
||||
{% if article.author %} · {{ article.author }}{% endif %}
|
||||
{% if article.link %} · <a href="{{ article.link }}" target="_blank" rel="noopener noreferrer">Original ↗</a>{% endif %}
|
||||
</p>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<li id="article-{{ article.pk }}" class="article-row{% if article.is_read %} is-read{% endif %}"
|
||||
data-published-utc="{% if article.published_at %}{{ article.published_at|date:"c" }}{% endif %}">
|
||||
data-published-utc="{{ article.published_at|default:article.fetched_at|date:"c" }}">
|
||||
<div class="article-row-main">
|
||||
{% include "reader/_article_actions.html" %}
|
||||
{% if article.feed.favicon_url %}
|
||||
@@ -8,9 +8,8 @@
|
||||
<span class="article-feed-name">{{ article.feed.title|default:article.feed.feed_url }}</span>
|
||||
<a href="{% url 'reader:article_detail' article.pk %}{% if scope_qs %}?{{ scope_qs }}{% endif %}" class="article-title"
|
||||
data-inline-url="{% url 'reader:article_inline' article.pk %}">{{ article.title|default:"(untitled)" }}</a>
|
||||
{% if article.published_at %}
|
||||
<time class="article-time" datetime="{{ article.published_at|date:"c" }}" data-local-format="short">{{ article.published_at|date:"M j, g:i A" }}</time>
|
||||
{% endif %}
|
||||
{# fetched_at stands in when a feed gives no publish date — same fallback the stream's sort order uses #}
|
||||
<time class="article-time" datetime="{{ article.published_at|default:article.fetched_at|date:"c" }}" data-local-format="short">{{ article.published_at|default:article.fetched_at|date:"M j, g:i A" }}</time>
|
||||
</div>
|
||||
<div id="article-body-{{ article.pk }}" class="article-inline-body" hidden></div>
|
||||
</li>
|
||||
Reference in new issue
Block a user