feat(discord): add configuration for internal Discord token management and enhance date handling in exports

Author: leostar0412

config/test_settings.py

@@ -108,3 +108,8 @@
 
 # Tests patch a single subprocess.Popen for DiscordChatExporter.
 DISCORD_CHAT_EXPORTER_SEQUENTIAL_EXPORT = False
+
+# Tests set DISCORD_USER_TOKEN via monkeypatch; do not inherit internal-token mode
+# from developer .env (get_or_load_discord_user_token would ignore env token).
+ALLOW_INTERNAL_DISCORD_TOKENS = False
+DISCORD_USER_TOKEN = ""

discord_activity_tracker/management/commands/run_discord_activity_tracker.py

@@ -223,7 +223,7 @@ def task_discord_sync(
             user_token=user_token,
             guild_id=guild_id,
             output_dir=staging,
-            after_date=after_date,
+            after_date=after_date if not per_channel_incremental else None,
             before_date=before_date,
             channel_ids=channel_ids or None,
             per_channel_incremental=per_channel_incremental,

discord_activity_tracker/sync/chat_exporter.py

@@ -549,7 +549,7 @@ def _export_guild_by_channel_day(
             "--channels filter, token access, or INCLUDE_VC if you need voice channels)."
         )
 
-    explicit_after = after_date if not per_channel_incremental else None
+    explicit_after = after_date
     results: List[ChannelDayExport] = []
     for ch_id in ids:
         ch_after = resolve_channel_export_after(

discord_activity_tracker/sync/exporter_window.py

@@ -99,7 +99,13 @@ def iter_channel_export_days(
     else:
         now = now.astimezone(timezone.utc)
 
-    upper = before.astimezone(timezone.utc) if before is not None else now
+    upper = now
+    if before is not None:
+        upper = (
+            before.astimezone(timezone.utc)
+            if before.tzinfo is not None
+            else before.replace(tzinfo=timezone.utc)
+        )
 
     if after is None:
         first_day = utc_day_start(now)

discord_activity_tracker/tests/test_exporter_window.py

@@ -195,6 +195,20 @@ def test_resolve_channel_export_after_honors_explicit_since():
     assert resolve_channel_export_after(1, 2, explicit_after=explicit) == explicit
 
 
+def test_iter_channel_export_days_naive_before_treated_as_utc():
+    after = datetime(2026, 6, 1, 10, 0, 0, tzinfo=timezone.utc)
+    before_naive = datetime(2026, 6, 3, 8, 0, 0)
+    before_aware = datetime(2026, 6, 3, 8, 0, 0, tzinfo=timezone.utc)
+    naive_days = iter_channel_export_days(
+        after=after, before=before_naive, now=before_aware
+    )
+    aware_days = iter_channel_export_days(
+        after=after, before=before_aware, now=before_aware
+    )
+    assert naive_days == aware_days
+    assert [d[0] for d in naive_days] == ["2026-06-01", "2026-06-02", "2026-06-03"]
+
+
 def test_iter_channel_export_days_clips_partial_last_day():
     after = datetime(2026, 6, 2, 22, 0, 0, tzinfo=timezone.utc)
     now = datetime(2026, 6, 2, 23, 30, 0, tzinfo=timezone.utc)