From 0707fc27187384c3397637220e85b2638abfe381 Mon Sep 17 00:00:00 2001
From: stumpylog <797416+stumpylog@users.noreply.github.com>
Date: Thu, 29 Oct 2026 14:59:23 -0700
Subject: [PATCH] Fix: parse datetime strings in the format_datetime filter and
 reject invalid ones

---
 src/documents/templating/filters.py |  5 ++++-
 src/documents/tests/test_filters.py | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/documents/templating/filters.py b/src/documents/templating/filters.py
index 698746c76..1af3c65c5 100644
--- a/src/documents/templating/filters.py
+++ b/src/documents/templating/filters.py
@@ -44,7 +44,10 @@ def localize_date(value: date | datetime | str, format: str, locale: str) -> str
 
 def format_datetime(value: str | datetime, format: str) -> str:
     if isinstance(value, str):
-        value = parse_date(value)
+        parsed = parse_datetime(value) or parse_date(value)
+        if parsed is None:
+            raise ValueError(f"Invalid date or datetime string: {value!r}")
+        value = parsed
     return value.strftime(format=format)
 
 
diff --git a/src/documents/tests/test_filters.py b/src/documents/tests/test_filters.py
index a7ecbf1ce..7625b474e 100644
--- a/src/documents/tests/test_filters.py
+++ b/src/documents/tests/test_filters.py
@@ -4,6 +4,7 @@ from typing import Literal
 
 import pytest
 
+from documents.templating.filters import format_datetime
 from documents.templating.filters import localize_date
 
 
@@ -294,3 +295,23 @@ class TestDateLocalization:
         Tests `localize_date` with `date` string across different locales and formats.
         """
         assert localize_date(value, format_style, locale_str) == expected_output
+
+
+class TestFormatDatetime:
+    @pytest.mark.parametrize(
+        ("value", "expected"),
+        [
+            pytest.param("2026-09-21", "2026-09-21 00:00", id="date"),
+            pytest.param(
+                "2026-09-21T13:45:00+00:00",
+                "2026-09-21 13:45",
+                id="datetime",
+            ),
+        ],
+    )
+    def test_parses_iso_strings(self, value: str, expected: str) -> None:
+        assert format_datetime(value, "%Y-%m-%d %H:%M") == expected
+
+    def test_rejects_unparseable_string(self) -> None:
+        with pytest.raises(ValueError, match="not a date"):
+            format_datetime("not a date", "%Y")