Files
ksmithandClaude Sonnet 5 fd8eeb605e Scope backlog re-apply per-feed and always queue it through Celery (T5, S5)
Completes the T5 fix: reapply_rules_for_user_backlog now computes each
feed's subscription-tag ids up front and passes them to
evaluate_rules_for_article per article, so a feed/tag-scoped rule from
a different feed can't fire on this backlog (see the previous commit's
rule_in_scope() in apps.rules.engine).

Also completes S5's second half: the "Re-apply" view now always
dispatches reapply_rules_for_user.delay() instead of calling the
backlog function inline from the request — a large backlog or a
regex that outruns the new timeout guard no longer risks tying up a
web worker.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-10-31 12:20:25 -06:00

57 lines
2.0 KiB
Python

from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.shortcuts import get_object_or_404, redirect, render
from django.views.decorators.http import require_POST
from .forms import FilterRuleForm
from .models import FilterRule
from .tasks import reapply_rules_for_user
@login_required
def rule_list(request):
rules = FilterRule.objects.filter(user=request.user).select_related("feed", "tag")
return render(request, "rules/rule_list.html", {"rules": rules})
@login_required
def create_rule(request):
form = FilterRuleForm(request.POST or None, user=request.user)
if request.method == "POST" and form.is_valid():
form.save()
messages.success(request, "Rule created.")
return redirect("rules:rule_list")
return render(request, "rules/rule_form.html", {"form": form})
@login_required
def edit_rule(request, rule_id):
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
form = FilterRuleForm(request.POST or None, instance=rule, user=request.user)
if request.method == "POST" and form.is_valid():
form.save()
messages.success(request, "Rule updated.")
return redirect("rules:rule_list")
return render(request, "rules/rule_form.html", {"form": form, "rule": rule})
@login_required
@require_POST
def delete_rule(request, rule_id):
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
rule.delete()
messages.success(request, "Rule deleted.")
return redirect("rules:rule_list")
@login_required
@require_POST
def reapply_rule(request, rule_id):
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
# Always queued, never run inline from the request/response cycle —
# a large backlog or a pathological regex could otherwise tie up a
# web worker for a long time (see apps.rules.tasks).
reapply_rules_for_user.delay(rule.pk)
messages.success(request, "Re-applying your rules to your unread backlog…")
return redirect("rules:rule_list")