Private
Public Access
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17e7f63e61 | ||
|
|
0bfe9c8076 | ||
|
|
7bb981b545 | ||
|
|
fd68400822 | ||
|
|
90837b339c | ||
|
|
dc8b9ff83b |
No files matched your search
+28
-1
@@ -1 +1,28 @@
|
|||||||
# Register your models here.
|
from django.contrib import admin
|
||||||
|
from django.shortcuts import redirect
|
||||||
|
from django.urls import reverse
|
||||||
|
|
||||||
|
from .models import SiteSettings
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(SiteSettings)
|
||||||
|
class SiteSettingsAdmin(admin.ModelAdmin):
|
||||||
|
"""A true singleton, not a collection — browsing a changelist to pick
|
||||||
|
the one row and click into it is an extra, pointless step, so
|
||||||
|
"Core > Site settings" in the sidebar goes straight to the (only)
|
||||||
|
change form instead, creating the row first if this is a fresh
|
||||||
|
install. No changelist/add/delete views exist at all here.
|
||||||
|
"""
|
||||||
|
|
||||||
|
fields = ["fetch_interval_minutes"]
|
||||||
|
|
||||||
|
def has_add_permission(self, request):
|
||||||
|
return False
|
||||||
|
|
||||||
|
def has_delete_permission(self, request, obj=None):
|
||||||
|
return False
|
||||||
|
|
||||||
|
def changelist_view(self, request, extra_context=None):
|
||||||
|
settings_row = SiteSettings.load()
|
||||||
|
url = reverse("admin:core_sitesettings_change", args=[settings_row.pk])
|
||||||
|
return redirect(url)
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# Generated by Django 5.2.18 on 2026-10-31 18:56
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = []
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="SiteSettings",
|
||||||
|
fields=[
|
||||||
|
(
|
||||||
|
"id",
|
||||||
|
models.PositiveSmallIntegerField(default=1, primary_key=True, serialize=False),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"fetch_interval_minutes",
|
||||||
|
models.PositiveIntegerField(
|
||||||
|
default=60,
|
||||||
|
help_text="How often, in minutes, every feed is polled for new articles. Can't be set lower than EVECTION_MIN_FETCH_INTERVAL_MINUTES (see .env).",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
"verbose_name": "Site settings",
|
||||||
|
"verbose_name_plural": "Site settings",
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
||||||
+35
-1
@@ -1 +1,35 @@
|
|||||||
# Create your models here.
|
from django.db import models
|
||||||
|
|
||||||
|
|
||||||
|
class SiteSettings(models.Model):
|
||||||
|
"""Singleton row (pk=1, same pattern as accounts.SetupLock) holding
|
||||||
|
instance-wide configuration an operator reasonably wants to change
|
||||||
|
without touching the server or .env — editable via Django admin.
|
||||||
|
Currently just the feed-poll interval, which used to be a per-feed
|
||||||
|
field; it's site-wide now (see apps.feeds.tasks.poll_due_feeds).
|
||||||
|
"""
|
||||||
|
|
||||||
|
id = models.PositiveSmallIntegerField(primary_key=True, default=1)
|
||||||
|
fetch_interval_minutes = models.PositiveIntegerField(
|
||||||
|
default=60,
|
||||||
|
help_text=(
|
||||||
|
"How often, in minutes, every feed is polled for new articles. "
|
||||||
|
"Can't be set lower than EVECTION_MIN_FETCH_INTERVAL_MINUTES (see .env)."
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = "Site settings"
|
||||||
|
verbose_name_plural = "Site settings"
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "Site settings"
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def load(cls):
|
||||||
|
"""Returns the singleton row, creating it with defaults on first
|
||||||
|
use so callers never need to special-case "no row exists yet"
|
||||||
|
(e.g. a fresh install whose first poll_due_feeds run hasn't
|
||||||
|
created it, and whose admin hasn't visited the settings page)."""
|
||||||
|
obj, _ = cls.objects.get_or_create(pk=1)
|
||||||
|
return obj
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
from datetime import timedelta
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.urls import reverse
|
||||||
|
from django.utils import timezone
|
||||||
|
|
||||||
|
from apps.feeds.models import Feed
|
||||||
|
from apps.feeds.tasks import poll_due_feeds
|
||||||
|
|
||||||
|
from .models import SiteSettings
|
||||||
|
|
||||||
|
User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_load_creates_the_singleton_row_with_defaults():
|
||||||
|
assert not SiteSettings.objects.exists()
|
||||||
|
settings_row = SiteSettings.load()
|
||||||
|
assert settings_row.fetch_interval_minutes == 60
|
||||||
|
assert SiteSettings.objects.count() == 1
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_load_returns_the_existing_row_without_creating_a_second_one():
|
||||||
|
SiteSettings.objects.create(fetch_interval_minutes=30)
|
||||||
|
settings_row = SiteSettings.load()
|
||||||
|
assert settings_row.fetch_interval_minutes == 30
|
||||||
|
assert SiteSettings.objects.count() == 1
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_poll_due_feeds_uses_the_site_wide_interval_for_every_feed():
|
||||||
|
SiteSettings.objects.create(fetch_interval_minutes=120)
|
||||||
|
due = Feed.objects.create(
|
||||||
|
feed_url="https://a.example.com/feed.xml",
|
||||||
|
last_fetched_at=timezone.now() - timedelta(minutes=150),
|
||||||
|
)
|
||||||
|
not_due = Feed.objects.create(
|
||||||
|
feed_url="https://b.example.com/feed.xml",
|
||||||
|
last_fetched_at=timezone.now() - timedelta(minutes=90),
|
||||||
|
)
|
||||||
|
|
||||||
|
with patch("apps.feeds.tasks.fetch_feed.delay") as mock_delay:
|
||||||
|
poll_due_feeds()
|
||||||
|
|
||||||
|
dispatched_ids = {call.args[0] for call in mock_delay.call_args_list}
|
||||||
|
assert dispatched_ids == {due.id}
|
||||||
|
assert not_due.id not in dispatched_ids
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_admin_changelist_redirects_straight_to_the_change_form(client):
|
||||||
|
assert not SiteSettings.objects.exists()
|
||||||
|
User.objects.create_superuser("admin", password="pw-admin-123")
|
||||||
|
client.login(username="admin", password="pw-admin-123")
|
||||||
|
|
||||||
|
changelist_url = reverse("admin:core_sitesettings_changelist")
|
||||||
|
response = client.get(changelist_url)
|
||||||
|
|
||||||
|
settings_row = SiteSettings.objects.get() # created by the redirect itself
|
||||||
|
assert response.status_code == 302
|
||||||
|
assert response.url == reverse("admin:core_sitesettings_change", args=[settings_row.pk])
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_admin_never_offers_add_or_delete(client):
|
||||||
|
# ModelAdmin.has_add_permission/has_delete_permission returning False
|
||||||
|
# makes Django raise PermissionDenied rather than build a 403 response
|
||||||
|
# directly — the test client's default behavior re-raises that for
|
||||||
|
# debugging convenience instead of returning it as a response.
|
||||||
|
client.raise_request_exception = False
|
||||||
|
|
||||||
|
User.objects.create_superuser("admin", password="pw-admin-123")
|
||||||
|
client.login(username="admin", password="pw-admin-123")
|
||||||
|
|
||||||
|
response = client.get(reverse("admin:core_sitesettings_add"))
|
||||||
|
assert response.status_code == 403
|
||||||
|
|
||||||
|
settings_row = SiteSettings.load()
|
||||||
|
delete_url = reverse("admin:core_sitesettings_delete", args=[settings_row.pk])
|
||||||
|
response = client.get(delete_url)
|
||||||
|
assert response.status_code == 403
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# Generated by Django 5.2.18 on 2026-10-31 18:56
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("feeds", "0003_feed_claimed_at"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name="feed",
|
||||||
|
name="fetch_interval_minutes",
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -35,8 +35,10 @@ class Feed(models.Model):
|
|||||||
)
|
)
|
||||||
last_error_message = models.TextField(blank=True)
|
last_error_message = models.TextField(blank=True)
|
||||||
|
|
||||||
# Instance-wide, not a per-user preference — see class docstring.
|
# The poll interval itself is site-wide now (apps.core.models.
|
||||||
fetch_interval_minutes = models.PositiveIntegerField(default=60)
|
# SiteSettings), not per-feed — only the error-driven backoff on top
|
||||||
|
# of it still varies per feed (see apps.feeds.services.fetcher.
|
||||||
|
# effective_interval_minutes).
|
||||||
fetch_error_count = models.PositiveIntegerField(default=0)
|
fetch_error_count = models.PositiveIntegerField(default=0)
|
||||||
is_active = models.BooleanField(default=True)
|
is_active = models.BooleanField(default=True)
|
||||||
|
|
||||||
|
|||||||
@@ -97,8 +97,15 @@ def sanitize_html(raw_html: str) -> str:
|
|||||||
return cleaned[:MAX_CONTENT_HTML_CHARS]
|
return cleaned[:MAX_CONTENT_HTML_CHARS]
|
||||||
|
|
||||||
|
|
||||||
def _content_hash(title: str, content_html: str) -> str:
|
def _content_hash(
|
||||||
return hashlib.sha256(f"{title}\n{content_html}".encode("utf-8")).hexdigest()
|
title: str, link: str, author: str, summary: str, content_html: str, published_at
|
||||||
|
) -> str:
|
||||||
|
"""Covers every mutable Article field an entry carries (T6) — a feed
|
||||||
|
editing its link/author/summary/published date, not just title or
|
||||||
|
body, must still be detected as a change worth re-saving."""
|
||||||
|
published_key = published_at.isoformat() if published_at else ""
|
||||||
|
payload = "\n".join([title, link, author, summary, content_html, published_key])
|
||||||
|
return hashlib.sha256(payload.encode("utf-8")).hexdigest()
|
||||||
|
|
||||||
|
|
||||||
def _entry_guid(entry) -> str:
|
def _entry_guid(entry) -> str:
|
||||||
@@ -124,14 +131,17 @@ def _entry_content_html(entry) -> str:
|
|||||||
return getattr(entry, "summary", "") or ""
|
return getattr(entry, "summary", "") or ""
|
||||||
|
|
||||||
|
|
||||||
def effective_interval_minutes(feed: Feed) -> int:
|
def effective_interval_minutes(feed: Feed, configured_interval_minutes: int) -> int:
|
||||||
"""The actual polling interval to use, applying exponential backoff on
|
"""The actual polling interval to use for `feed`, applying exponential
|
||||||
top of the admin-configured ``fetch_interval_minutes`` for feeds that
|
backoff on top of the site-wide `configured_interval_minutes` (see
|
||||||
are currently erroring. ``fetch_interval_minutes`` itself is never
|
apps.core.models.SiteSettings) for a feed that's currently erroring.
|
||||||
mutated by the fetcher — it's the admin's chosen baseline.
|
Takes the configured value as a parameter rather than querying
|
||||||
|
SiteSettings itself, since this runs once per feed (apps.feeds.tasks
|
||||||
|
calls it from a list comprehension over every active feed) and the
|
||||||
|
site-wide value doesn't vary by feed.
|
||||||
"""
|
"""
|
||||||
floor = getattr(settings, "EVECTION_MIN_FETCH_INTERVAL_MINUTES", 15)
|
floor = getattr(settings, "EVECTION_MIN_FETCH_INTERVAL_MINUTES", 15)
|
||||||
base = max(feed.fetch_interval_minutes, floor)
|
base = max(configured_interval_minutes, floor)
|
||||||
if feed.fetch_error_count <= 0:
|
if feed.fetch_error_count <= 0:
|
||||||
return base
|
return base
|
||||||
backoff = base * (2**feed.fetch_error_count)
|
backoff = base * (2**feed.fetch_error_count)
|
||||||
@@ -210,20 +220,24 @@ def fetch_and_ingest(feed: Feed) -> FetchResult:
|
|||||||
for entry in entries:
|
for entry in entries:
|
||||||
guid = _entry_guid(entry)
|
guid = _entry_guid(entry)
|
||||||
title = (getattr(entry, "title", "") or "")[:1000]
|
title = (getattr(entry, "title", "") or "")[:1000]
|
||||||
|
link = (getattr(entry, "link", "") or "")[:2000]
|
||||||
|
author = (getattr(entry, "author", "") or "")[:500]
|
||||||
|
summary = (getattr(entry, "summary", "") or "")[:5000]
|
||||||
content_html = sanitize_html(_entry_content_html(entry))
|
content_html = sanitize_html(_entry_content_html(entry))
|
||||||
content_hash = _content_hash(title, content_html)
|
published_at = _entry_published_at(entry)
|
||||||
|
content_hash = _content_hash(title, link, author, summary, content_html, published_at)
|
||||||
|
|
||||||
article, created = Article.objects.get_or_create(
|
article, created = Article.objects.get_or_create(
|
||||||
feed=feed,
|
feed=feed,
|
||||||
guid=guid,
|
guid=guid,
|
||||||
defaults={
|
defaults={
|
||||||
"link": (getattr(entry, "link", "") or "")[:2000],
|
"link": link,
|
||||||
"title": title,
|
"title": title,
|
||||||
"author": (getattr(entry, "author", "") or "")[:500],
|
"author": author,
|
||||||
"content_html": content_html,
|
"content_html": content_html,
|
||||||
"summary": (getattr(entry, "summary", "") or "")[:5000],
|
"summary": summary,
|
||||||
"content_hash": content_hash,
|
"content_hash": content_hash,
|
||||||
"published_at": _entry_published_at(entry),
|
"published_at": published_at,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -231,9 +245,23 @@ def fetch_and_ingest(feed: Feed) -> FetchResult:
|
|||||||
new_ids.append(article.pk)
|
new_ids.append(article.pk)
|
||||||
elif article.content_hash != content_hash:
|
elif article.content_hash != content_hash:
|
||||||
article.title = title
|
article.title = title
|
||||||
|
article.link = link
|
||||||
|
article.author = author
|
||||||
|
article.summary = summary
|
||||||
article.content_html = content_html
|
article.content_html = content_html
|
||||||
|
article.published_at = published_at
|
||||||
article.content_hash = content_hash
|
article.content_hash = content_hash
|
||||||
article.save(update_fields=["title", "content_html", "content_hash"])
|
article.save(
|
||||||
|
update_fields=[
|
||||||
|
"title",
|
||||||
|
"link",
|
||||||
|
"author",
|
||||||
|
"summary",
|
||||||
|
"content_html",
|
||||||
|
"published_at",
|
||||||
|
"content_hash",
|
||||||
|
]
|
||||||
|
)
|
||||||
updated_ids.append(article.pk)
|
updated_ids.append(article.pk)
|
||||||
|
|
||||||
return FetchResult(
|
return FetchResult(
|
||||||
|
|||||||
+8
-4
@@ -8,6 +8,7 @@ from django.db.models import Q
|
|||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
from apps.articles.tasks import apply_filter_rules_for_feed
|
from apps.articles.tasks import apply_filter_rules_for_feed
|
||||||
|
from apps.core.models import SiteSettings
|
||||||
|
|
||||||
from .models import Feed
|
from .models import Feed
|
||||||
from .opml import import_opml
|
from .opml import import_opml
|
||||||
@@ -32,12 +33,15 @@ def poll_due_feeds():
|
|||||||
"""
|
"""
|
||||||
now = timezone.now()
|
now = timezone.now()
|
||||||
claim_stale_before = now - timedelta(minutes=CLAIM_STALE_MINUTES)
|
claim_stale_before = now - timedelta(minutes=CLAIM_STALE_MINUTES)
|
||||||
|
# Loaded once per call, not per feed — the interval is site-wide
|
||||||
|
# (apps.core.models.SiteSettings), so every feed below shares it.
|
||||||
|
configured_interval = SiteSettings.load().fetch_interval_minutes
|
||||||
due_feed_ids = [
|
due_feed_ids = [
|
||||||
feed.id
|
feed.id
|
||||||
for feed in Feed.objects.filter(is_active=True).only(
|
for feed in Feed.objects.filter(is_active=True).only(
|
||||||
"id", "last_fetched_at", "fetch_interval_minutes", "fetch_error_count"
|
"id", "last_fetched_at", "fetch_error_count"
|
||||||
)
|
)
|
||||||
if _is_due(feed)
|
if _is_due(feed, configured_interval)
|
||||||
]
|
]
|
||||||
claimed_ids = []
|
claimed_ids = []
|
||||||
for feed_id in due_feed_ids:
|
for feed_id in due_feed_ids:
|
||||||
@@ -57,10 +61,10 @@ def poll_due_feeds():
|
|||||||
return len(claimed_ids)
|
return len(claimed_ids)
|
||||||
|
|
||||||
|
|
||||||
def _is_due(feed: Feed) -> bool:
|
def _is_due(feed: Feed, configured_interval_minutes: int) -> bool:
|
||||||
if feed.last_fetched_at is None:
|
if feed.last_fetched_at is None:
|
||||||
return True
|
return True
|
||||||
interval = effective_interval_minutes(feed)
|
interval = effective_interval_minutes(feed, configured_interval_minutes)
|
||||||
return feed.last_fetched_at <= timezone.now() - timedelta(minutes=interval)
|
return feed.last_fetched_at <= timezone.now() - timedelta(minutes=interval)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import datetime as dt
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import requests
|
import requests
|
||||||
import responses
|
import responses
|
||||||
@@ -136,7 +138,7 @@ def test_unparseable_feed_records_error_and_backs_off(feed):
|
|||||||
|
|
||||||
assert result.status == Feed.STATUS_ERROR
|
assert result.status == Feed.STATUS_ERROR
|
||||||
assert feed.fetch_error_count == 1
|
assert feed.fetch_error_count == 1
|
||||||
assert effective_interval_minutes(feed) > feed.fetch_interval_minutes
|
assert effective_interval_minutes(feed, 60) > 60
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
@@ -204,6 +206,40 @@ def test_refetching_updated_content_does_not_reset_user_state():
|
|||||||
assert ArticleTag.objects.filter(user=user, article=article, tag=starred_tag).exists()
|
assert ArticleTag.objects.filter(user=user, article=article, tag=starred_tag).exists()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
@responses.activate
|
||||||
|
def test_refetching_picks_up_link_author_summary_and_published_at_changes():
|
||||||
|
"""Previously only title/content_html/content_hash were updated on
|
||||||
|
refetch (T6) — a feed correcting its link, author, summary, or
|
||||||
|
publication date without touching the title went unnoticed forever."""
|
||||||
|
feed = Feed.objects.create(feed_url=FEED_URL)
|
||||||
|
|
||||||
|
responses.add(responses.GET, FEED_URL, body=GOOD_FEED_XML, status=200)
|
||||||
|
fetch_and_ingest(feed)
|
||||||
|
feed.save()
|
||||||
|
|
||||||
|
article = Article.objects.get(feed=feed)
|
||||||
|
assert article.link == "https://example.com/1"
|
||||||
|
assert article.author == ""
|
||||||
|
|
||||||
|
edited_xml = GOOD_FEED_XML.replace(
|
||||||
|
"<link>https://example.com/1</link>",
|
||||||
|
"<link>https://example.com/1-moved</link>",
|
||||||
|
).replace(
|
||||||
|
"<pubDate>Mon, 01 Jan 2024 00:00:00 GMT</pubDate>",
|
||||||
|
"<pubDate>Tue, 02 Jan 2024 00:00:00 GMT</pubDate>\n <author>jane@example.com</author>",
|
||||||
|
)
|
||||||
|
responses.add(responses.GET, FEED_URL, body=edited_xml, status=200)
|
||||||
|
result = fetch_and_ingest(feed)
|
||||||
|
feed.save()
|
||||||
|
|
||||||
|
assert result.updated_article_ids == [article.pk]
|
||||||
|
article.refresh_from_db()
|
||||||
|
assert article.link == "https://example.com/1-moved"
|
||||||
|
assert article.author == "jane@example.com"
|
||||||
|
assert article.published_at == dt.datetime(2024, 1, 2, tzinfo=dt.timezone.utc)
|
||||||
|
|
||||||
|
|
||||||
def test_sanitize_html_caps_stored_output_length():
|
def test_sanitize_html_caps_stored_output_length():
|
||||||
huge = "<p>" + ("a" * (MAX_CONTENT_HTML_CHARS + 10_000)) + "</p>"
|
huge = "<p>" + ("a" * (MAX_CONTENT_HTML_CHARS + 10_000)) + "</p>"
|
||||||
cleaned = sanitize_html(huge)
|
cleaned = sanitize_html(huge)
|
||||||
|
|||||||
@@ -16,17 +16,14 @@ def test_poll_due_feeds_dispatches_only_due_feeds():
|
|||||||
recently_fetched = Feed.objects.create(
|
recently_fetched = Feed.objects.create(
|
||||||
feed_url="https://b.example.com/feed.xml",
|
feed_url="https://b.example.com/feed.xml",
|
||||||
last_fetched_at=timezone.now(),
|
last_fetched_at=timezone.now(),
|
||||||
fetch_interval_minutes=60,
|
|
||||||
)
|
)
|
||||||
overdue = Feed.objects.create(
|
overdue = Feed.objects.create(
|
||||||
feed_url="https://c.example.com/feed.xml",
|
feed_url="https://c.example.com/feed.xml",
|
||||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||||
fetch_interval_minutes=60,
|
|
||||||
)
|
)
|
||||||
inactive_but_overdue = Feed.objects.create(
|
inactive_but_overdue = Feed.objects.create(
|
||||||
feed_url="https://d.example.com/feed.xml",
|
feed_url="https://d.example.com/feed.xml",
|
||||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||||
fetch_interval_minutes=60,
|
|
||||||
is_active=False,
|
is_active=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -48,7 +45,6 @@ def test_poll_due_feeds_does_not_reclaim_a_feed_it_just_claimed():
|
|||||||
overdue = Feed.objects.create(
|
overdue = Feed.objects.create(
|
||||||
feed_url="https://c.example.com/feed.xml",
|
feed_url="https://c.example.com/feed.xml",
|
||||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||||
fetch_interval_minutes=60,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
with patch("apps.feeds.tasks.fetch_feed.delay") as mock_delay:
|
with patch("apps.feeds.tasks.fetch_feed.delay") as mock_delay:
|
||||||
@@ -69,7 +65,6 @@ def test_poll_due_feeds_reclaims_a_stale_claim():
|
|||||||
overdue = Feed.objects.create(
|
overdue = Feed.objects.create(
|
||||||
feed_url="https://c.example.com/feed.xml",
|
feed_url="https://c.example.com/feed.xml",
|
||||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||||
fetch_interval_minutes=60,
|
|
||||||
claimed_at=timezone.now() - timedelta(minutes=CLAIM_STALE_MINUTES + 1),
|
claimed_at=timezone.now() - timedelta(minutes=CLAIM_STALE_MINUTES + 1),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+8
-3
@@ -54,7 +54,11 @@ GOOD_FEED_XML = """<?xml version="1.0"?>
|
|||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
@responses.activate
|
@responses.activate
|
||||||
def test_add_feed_view_subscribes_and_fetches_immediately(client, two_users):
|
def test_add_feed_view_subscribes_and_enqueues_the_initial_fetch(client, two_users):
|
||||||
|
"""The subscription is created synchronously; the first fetch is
|
||||||
|
dispatched via fetch_feed.delay() (T3) rather than run inline — in
|
||||||
|
tests CELERY_TASK_ALWAYS_EAGER still runs it immediately, so the
|
||||||
|
article it ingests is visible by the time the response returns."""
|
||||||
alice, _ = two_users
|
alice, _ = two_users
|
||||||
client.login(username="alice", password="pw-alice-123")
|
client.login(username="alice", password="pw-alice-123")
|
||||||
responses.add(responses.GET, "https://example.com/feed.xml", body=GOOD_FEED_XML, status=200)
|
responses.add(responses.GET, "https://example.com/feed.xml", body=GOOD_FEED_XML, status=200)
|
||||||
@@ -62,9 +66,10 @@ def test_add_feed_view_subscribes_and_fetches_immediately(client, two_users):
|
|||||||
response = client.post(reverse("feeds:add_feed"), {"feed_url": "https://example.com/feed.xml"})
|
response = client.post(reverse("feeds:add_feed"), {"feed_url": "https://example.com/feed.xml"})
|
||||||
|
|
||||||
assert response.status_code == 302
|
assert response.status_code == 302
|
||||||
assert Subscription.objects.filter(
|
subscription = Subscription.objects.get(
|
||||||
user=alice, feed__feed_url="https://example.com/feed.xml"
|
user=alice, feed__feed_url="https://example.com/feed.xml"
|
||||||
).exists()
|
)
|
||||||
|
assert subscription.feed.articles.filter(guid="guid-1").exists()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
|
|||||||
+11
-19
@@ -12,8 +12,7 @@ from apps.articles.models import SubscriptionTag, Tag
|
|||||||
from .forms import AddFeedForm, EditSubscriptionForm, OPMLImportForm
|
from .forms import AddFeedForm, EditSubscriptionForm, OPMLImportForm
|
||||||
from .models import Feed, Subscription
|
from .models import Feed, Subscription
|
||||||
from .opml import export_opml, extract_opml_bytes, import_opml, parse_opml
|
from .opml import export_opml, extract_opml_bytes, import_opml, parse_opml
|
||||||
from .services.fetcher import fetch_and_ingest
|
from .tasks import fetch_feed, import_opml_task
|
||||||
from .tasks import import_opml_task
|
|
||||||
|
|
||||||
OPML_ASYNC_THRESHOLD = 50
|
OPML_ASYNC_THRESHOLD = 50
|
||||||
|
|
||||||
@@ -39,23 +38,16 @@ def add_feed(request):
|
|||||||
user=request.user, subscription=subscription, tag=tag
|
user=request.user, subscription=subscription, tag=tag
|
||||||
)
|
)
|
||||||
|
|
||||||
# Fetch synchronously so the user sees results immediately; the
|
# Enqueue the initial fetch instead of running it inline (T3) — a
|
||||||
# periodic Celery poll takes over from here for subsequent fetches.
|
# slow or large feed would otherwise tie up a Gunicorn worker for
|
||||||
result = fetch_and_ingest(feed)
|
# the duration of the request; fetch_feed handles the save/error
|
||||||
feed.save()
|
# bookkeeping the same way the periodic poll's dispatch does.
|
||||||
|
fetch_feed.delay(feed.pk)
|
||||||
if result.status == Feed.STATUS_ERROR:
|
messages.success(
|
||||||
messages.warning(
|
request,
|
||||||
request,
|
f"Subscribed to {feed_url}. Fetching its articles now — "
|
||||||
f"Subscribed to {feed_url}, but the initial fetch failed: {result.error_message}",
|
"refresh in a few seconds if you don't see them yet.",
|
||||||
)
|
)
|
||||||
else:
|
|
||||||
article_count = len(result.new_article_ids)
|
|
||||||
messages.success(
|
|
||||||
request,
|
|
||||||
f"Subscribed to '{subscription.display_title}' — "
|
|
||||||
f"{article_count} article(s) fetched.",
|
|
||||||
)
|
|
||||||
return redirect("reader:stream")
|
return redirect("reader:stream")
|
||||||
|
|
||||||
return render(request, "feeds/add_feed.html", {"form": form})
|
return render(request, "feeds/add_feed.html", {"form": form})
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import re
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
@@ -188,3 +190,30 @@ def test_sidebar_shows_a_tags_total_unread_count(client, alice):
|
|||||||
# The only "7" on the page — the individual feeds show 3 and 4.
|
# The only "7" on the page — the individual feeds show 3 and 4.
|
||||||
content = response.content.decode()
|
content = response.content.decode()
|
||||||
assert '<span class="unread-count">7</span>' in content
|
assert '<span class="unread-count">7</span>' in content
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_article_rows_carry_their_utc_instant_for_client_side_date_grouping(client, alice):
|
||||||
|
"""The server still groups date headers in UTC, but ships each row's
|
||||||
|
raw UTC instant so date-groups.js can rebuild the headers using the
|
||||||
|
viewer's local calendar day instead."""
|
||||||
|
from django.utils import timezone
|
||||||
|
|
||||||
|
feed = Feed.objects.create(feed_url="https://example.com/feed.xml")
|
||||||
|
Subscription.objects.create(user=alice, feed=feed)
|
||||||
|
dated = Article.objects.create(
|
||||||
|
feed=feed, guid="dated", title="Dated", published_at=timezone.now()
|
||||||
|
)
|
||||||
|
undated = Article.objects.create(feed=feed, guid="undated", title="Undated")
|
||||||
|
|
||||||
|
client.login(username="alice", password="pw-alice-123")
|
||||||
|
response = client.get(reverse("reader:stream"), {"filter": "all"})
|
||||||
|
content = response.content.decode()
|
||||||
|
|
||||||
|
expected_iso = dated.published_at.isoformat()
|
||||||
|
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)
|
||||||
|
assert undated_row is not None
|
||||||
|
assert 'data-published-utc=""' in undated_row.group(0)
|
||||||
@@ -143,6 +143,10 @@ At minimum, set the following in `.env`:
|
|||||||
- `EVECTION_GUNICORN_BIND` — the `address:port` gunicorn listens on; see
|
- `EVECTION_GUNICORN_BIND` — the `address:port` gunicorn listens on; see
|
||||||
"Reverse proxy" below for how to pick this
|
"Reverse proxy" below for how to pick this
|
||||||
|
|
||||||
|
How often every feed is polled is a site-wide setting (Django admin → Site
|
||||||
|
settings), not a `.env` value — `EVECTION_MIN_FETCH_INTERVAL_MINUTES` only sets
|
||||||
|
a floor under it, so it can't be configured lower than that without editing `.env`.
|
||||||
|
|
||||||
Evection reads `config.settings.prod` when run via the commands below (see each
|
Evection reads `config.settings.prod` when run via the commands below (see each
|
||||||
systemd unit's `DJANGO_SETTINGS_MODULE`). That module turns on HTTPS-only cookies,
|
systemd unit's `DJANGO_SETTINGS_MODULE`). That module turns on HTTPS-only cookies,
|
||||||
HSTS, and a Content-Security-Policy header on top of the base settings, and
|
HSTS, and a Content-Security-Policy header on top of the base settings, and
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
(function () {
|
||||||
|
// The server groups articles into "Received today/yesterday/<date>"
|
||||||
|
// headers using UTC (config.settings.base TIME_ZONE), so an article
|
||||||
|
// published near UTC midnight can land in the wrong day group from the
|
||||||
|
// viewer's own perspective. Each article row carries its UTC instant in
|
||||||
|
// data-published-utc; this throws away the server's date-header <li>s
|
||||||
|
// and rebuilds them using the browser's local calendar day instead.
|
||||||
|
var MONTHS = [
|
||||||
|
"January", "February", "March", "April", "May", "June",
|
||||||
|
"July", "August", "September", "October", "November", "December",
|
||||||
|
];
|
||||||
|
|
||||||
|
function localDateOf(iso) {
|
||||||
|
if (!iso) return null;
|
||||||
|
var date = new Date(iso);
|
||||||
|
if (isNaN(date.getTime())) return null;
|
||||||
|
date.setHours(0, 0, 0, 0);
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
|
||||||
|
function labelFor(day, today) {
|
||||||
|
if (day === null) return "Undated";
|
||||||
|
var formatted = day.getDate() + " " + MONTHS[day.getMonth()] + " " + day.getFullYear();
|
||||||
|
var diffDays = Math.round((today - day) / 86400000);
|
||||||
|
if (diffDays === 0) return "Received today — " + formatted;
|
||||||
|
if (diffDays === 1) return "Received yesterday — " + formatted;
|
||||||
|
return "Received " + formatted;
|
||||||
|
}
|
||||||
|
|
||||||
|
function regroupDateHeaders(root) {
|
||||||
|
if (!root) return;
|
||||||
|
var list = root.matches && root.matches("ul.article-list") ? root : root.querySelector("ul.article-list");
|
||||||
|
if (!list || !list.querySelector("li.article-row[data-published-utc], li.article-row")) return;
|
||||||
|
|
||||||
|
list.querySelectorAll("li.date-header").forEach(function (el) {
|
||||||
|
el.parentNode.removeChild(el);
|
||||||
|
});
|
||||||
|
|
||||||
|
var today = new Date();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
var currentKey;
|
||||||
|
list.querySelectorAll("li.article-row").forEach(function (row) {
|
||||||
|
var day = localDateOf(row.getAttribute("data-published-utc"));
|
||||||
|
var key = day === null ? "undated" : day.getTime();
|
||||||
|
if (key !== currentKey) {
|
||||||
|
var header = document.createElement("li");
|
||||||
|
header.className = "date-header";
|
||||||
|
header.textContent = labelFor(day, today);
|
||||||
|
list.insertBefore(header, row);
|
||||||
|
currentKey = key;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
regroupDateHeaders(document);
|
||||||
|
|
||||||
|
document.body.addEventListener("htmx:afterSwap", function (event) {
|
||||||
|
regroupDateHeaders(event.target);
|
||||||
|
});
|
||||||
|
})();
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
(function () {
|
||||||
|
// Everything is stored and server-rendered in UTC (config.settings.base
|
||||||
|
// TIME_ZONE) — these <time datetime="..."> elements carry that UTC
|
||||||
|
// instant plus a UTC-formatted fallback as their initial text, and this
|
||||||
|
// reformats them using the browser's own timezone, client-side, so the
|
||||||
|
// server never needs to know (or guess) where the viewer actually is.
|
||||||
|
var SHORT_OPTIONS = { hour: "numeric", minute: "2-digit" };
|
||||||
|
var LONG_OPTIONS = {
|
||||||
|
year: "numeric",
|
||||||
|
month: "short",
|
||||||
|
day: "numeric",
|
||||||
|
hour: "2-digit",
|
||||||
|
minute: "2-digit",
|
||||||
|
};
|
||||||
|
|
||||||
|
function localizeTimesWithin(root) {
|
||||||
|
if (!root || typeof root.querySelectorAll !== "function") return;
|
||||||
|
root.querySelectorAll("time[data-local-format]").forEach(function (el) {
|
||||||
|
var iso = el.getAttribute("datetime");
|
||||||
|
if (!iso) return;
|
||||||
|
var date = new Date(iso);
|
||||||
|
if (isNaN(date.getTime())) return;
|
||||||
|
var options = el.dataset.localFormat === "short" ? SHORT_OPTIONS : LONG_OPTIONS;
|
||||||
|
try {
|
||||||
|
el.textContent = date.toLocaleString(undefined, options);
|
||||||
|
} catch (e) {
|
||||||
|
/* Intl unavailable or threw — leave the server-rendered UTC text as-is */
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
localizeTimesWithin(document);
|
||||||
|
|
||||||
|
// Article rows/content are frequently swapped in by htmx (pagination,
|
||||||
|
// the inline expand-article view, the dashboard's retry action) without
|
||||||
|
// a full page load, so every swap needs the same pass over just the
|
||||||
|
// new content.
|
||||||
|
document.body.addEventListener("htmx:afterSwap", function (event) {
|
||||||
|
localizeTimesWithin(event.target);
|
||||||
|
});
|
||||||
|
})();
|
||||||
@@ -53,6 +53,8 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<script src="{% static 'js/stream.js' %}" defer></script>
|
<script src="{% static 'js/stream.js' %}" defer></script>
|
||||||
|
<script src="{% static 'js/localize-times.js' %}" defer></script>
|
||||||
|
<script src="{% static 'js/date-groups.js' %}" defer></script>
|
||||||
{% if user.is_authenticated %}
|
{% if user.is_authenticated %}
|
||||||
<script src="{% static 'js/theme.js' %}" defer></script>
|
<script src="{% static 'js/theme.js' %}" defer></script>
|
||||||
<script src="{% static 'js/sidebar-state.js' %}" defer></script>
|
<script src="{% static 'js/sidebar-state.js' %}" defer></script>
|
||||||
|
|||||||
@@ -31,7 +31,13 @@
|
|||||||
<td>{{ feed.subscriber_count }}</td>
|
<td>{{ feed.subscriber_count }}</td>
|
||||||
<td>{{ feed.get_last_fetch_status_display }}</td>
|
<td>{{ feed.get_last_fetch_status_display }}</td>
|
||||||
<td>{{ feed.fetch_error_count }}</td>
|
<td>{{ feed.fetch_error_count }}</td>
|
||||||
<td>{{ feed.last_fetched_at|default:"never" }}</td>
|
<td>
|
||||||
|
{% if feed.last_fetched_at %}
|
||||||
|
<time datetime="{{ feed.last_fetched_at|date:"c" }}" data-local-format="long">{{ feed.last_fetched_at|date:"M j, Y H:i" }}</time>
|
||||||
|
{% else %}
|
||||||
|
never
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
<td>{{ feed.last_error_message|default:"—" }}</td>
|
<td>{{ feed.last_error_message|default:"—" }}</td>
|
||||||
<td>
|
<td>
|
||||||
<form method="post" action="{% url 'core:retry_feed' feed.id %}">
|
<form method="post" action="{% url 'core:retry_feed' feed.id %}">
|
||||||
|
|||||||
@@ -2,7 +2,10 @@
|
|||||||
<h2 class="article-content-title">{{ article.title|default:"(untitled)" }}</h2>
|
<h2 class="article-content-title">{{ article.title|default:"(untitled)" }}</h2>
|
||||||
<p class="article-meta">
|
<p class="article-meta">
|
||||||
{% if article.feed.favicon_url %}<img src="{{ article.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
|
{% if article.feed.favicon_url %}<img src="{{ article.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
|
||||||
{{ article.feed.title }} · {{ article.published_at|date:"M j, Y H:i" }}
|
{{ 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 %}
|
||||||
{% if article.author %} · {{ article.author }}{% endif %}
|
{% if article.author %} · {{ article.author }}{% endif %}
|
||||||
{% if article.link %} · <a href="{{ article.link }}" target="_blank" rel="noopener noreferrer">Original ↗</a>{% endif %}
|
{% if article.link %} · <a href="{{ article.link }}" target="_blank" rel="noopener noreferrer">Original ↗</a>{% endif %}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<li id="article-{{ article.pk }}" class="article-row{% if article.is_read %} is-read{% endif %}">
|
<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 %}">
|
||||||
<div class="article-row-main">
|
<div class="article-row-main">
|
||||||
{% include "reader/_article_actions.html" %}
|
{% include "reader/_article_actions.html" %}
|
||||||
{% if article.feed.favicon_url %}
|
{% if article.feed.favicon_url %}
|
||||||
@@ -8,7 +9,9 @@
|
|||||||
<a href="{% url 'reader:article_detail' article.pk %}" class="article-title"
|
<a href="{% url 'reader:article_detail' article.pk %}" class="article-title"
|
||||||
data-inline-url="{% url 'reader:article_inline' article.pk %}"
|
data-inline-url="{% url 'reader:article_inline' article.pk %}"
|
||||||
onclick="return toggleArticle(event, {{ article.pk }})">{{ article.title|default:"(untitled)" }}</a>
|
onclick="return toggleArticle(event, {{ article.pk }})">{{ article.title|default:"(untitled)" }}</a>
|
||||||
<span class="article-time">{{ article.published_at|date:"g:i A" }}</span>
|
{% if article.published_at %}
|
||||||
|
<time class="article-time" datetime="{{ article.published_at|date:"c" }}" data-local-format="short">{{ article.published_at|date:"g:i A" }}</time>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div id="article-body-{{ article.pk }}" class="article-inline-body" hidden></div>
|
<div id="article-body-{{ article.pk }}" class="article-inline-body" hidden></div>
|
||||||
</li>
|
</li>
|
||||||
Reference in new issue
Block a user