From be2e2f55527f91553ba21e527c360c469d0c8087 Mon Sep 17 00:00:00 2001
From: Mia <mia@parakeet.at>
Date: Mon, 7 Jul 2025 12:06:11 +0100
Subject: [PATCH] fix(lexica): move to DateTime<Utc> for most dates

---
 lexica/src/app_bsky/actor.rs              |  2 +-
 lexica/src/app_bsky/embed.rs              |  4 ++--
 lexica/src/app_bsky/feed.rs               |  8 ++++----
 lexica/src/app_bsky/graph.rs              |  8 ++++----
 lexica/src/app_bsky/labeler.rs            |  4 ++--
 parakeet-db/src/models.rs                 | 22 +++++++++++-----------
 parakeet/src/hydration/feedgen.rs         |  2 +-
 parakeet/src/hydration/labeler.rs         |  4 ++--
 parakeet/src/hydration/list.rs            |  4 ++--
 parakeet/src/hydration/profile.rs         |  2 +-
 parakeet/src/hydration/starter_packs.rs   |  4 ++--
 parakeet/src/xrpc/app_bsky/feed/likes.rs  |  2 +-
 parakeet/src/xrpc/app_bsky/graph/lists.rs |  2 +-
 13 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lexica/src/app_bsky/actor.rs b/lexica/src/app_bsky/actor.rs
index 8c6914e4..97e4aee7 100644
--- a/lexica/src/app_bsky/actor.rs
+++ b/lexica/src/app_bsky/actor.rs
@@ -171,7 +171,7 @@ pub struct VerificationView {
     pub issuer: String,
     pub uri: String,
     pub is_valid: bool,
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, Serialize)]
diff --git a/lexica/src/app_bsky/embed.rs b/lexica/src/app_bsky/embed.rs
index 35223a13..1705799a 100644
--- a/lexica/src/app_bsky/embed.rs
+++ b/lexica/src/app_bsky/embed.rs
@@ -4,7 +4,7 @@ use crate::app_bsky::graph::ListView;
 use crate::app_bsky::labeler::LabelerView;
 use crate::app_bsky::RecordStats;
 use crate::com_atproto::label::Label;
-use chrono::NaiveDateTime;
+use chrono::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -106,7 +106,7 @@ pub struct RecordView {
     pub stats: RecordStats,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub embeds: Option<Vec<Embed>>,
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, Serialize)]
diff --git a/lexica/src/app_bsky/feed.rs b/lexica/src/app_bsky/feed.rs
index d363a98f..487a7c95 100644
--- a/lexica/src/app_bsky/feed.rs
+++ b/lexica/src/app_bsky/feed.rs
@@ -28,7 +28,7 @@ pub struct PostView {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub threadgate: Option<ThreadgateView>,
 
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Debug, Serialize)]
@@ -78,7 +78,7 @@ pub enum FeedViewPostReason {
     Repost {
         by: ProfileViewBasic,
         #[serde(rename = "indexedAt")]
-        indexed_at: NaiveDateTime,
+        indexed_at: DateTime<Utc>,
     },
     #[serde(rename = "app.bsky.feed.defs#reasonPin")]
     Pin,
@@ -146,7 +146,7 @@ pub struct GeneratorView {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub content_mode: Option<GeneratorContentMode>,
 
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Copy, Clone, Debug, Serialize)]
@@ -183,5 +183,5 @@ pub struct ThreadgateView {
 pub struct Like {
     pub actor: ProfileView,
     pub created_at: DateTime<Utc>,
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
diff --git a/lexica/src/app_bsky/graph.rs b/lexica/src/app_bsky/graph.rs
index ebbfbad6..af5814ac 100644
--- a/lexica/src/app_bsky/graph.rs
+++ b/lexica/src/app_bsky/graph.rs
@@ -23,7 +23,7 @@ pub struct ListViewBasic {
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub labels: Vec<Label>,
 
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, Serialize)]
@@ -49,7 +49,7 @@ pub struct ListView {
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub labels: Vec<Label>,
 
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, Serialize)]
@@ -105,7 +105,7 @@ pub struct StarterPackView {
 
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub labels: Vec<Label>,
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, Serialize)]
@@ -122,5 +122,5 @@ pub struct StarterPackViewBasic {
 
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub labels: Vec<Label>,
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
diff --git a/lexica/src/app_bsky/labeler.rs b/lexica/src/app_bsky/labeler.rs
index 671d158e..ce6c1f39 100644
--- a/lexica/src/app_bsky/labeler.rs
+++ b/lexica/src/app_bsky/labeler.rs
@@ -16,7 +16,7 @@ pub struct LabelerView {
     // pub viewer: Option<()>,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub labels: Vec<Label>,
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, Serialize)]
@@ -39,7 +39,7 @@ pub struct LabelerViewDetailed {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub subject_collections: Option<Vec<String>>,
 
-    pub indexed_at: NaiveDateTime,
+    pub indexed_at: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
diff --git a/parakeet-db/src/models.rs b/parakeet-db/src/models.rs
index 621ce029..473ffef4 100644
--- a/parakeet-db/src/models.rs
+++ b/parakeet-db/src/models.rs
@@ -1,5 +1,5 @@
 use crate::types::*;
-use chrono::NaiveDateTime;
+use chrono::prelude::*;
 use diesel::prelude::*;
 
 #[derive(Debug, Queryable, Selectable, Identifiable)]
@@ -111,7 +111,7 @@ pub struct List {
     pub description_facets: Option<serde_json::Value>,
     pub avatar_cid: Option<String>,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -143,7 +143,7 @@ pub struct ListBlock {
     pub did: String,
     pub list_uri: String,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -169,7 +169,7 @@ pub struct ListItem {
     pub list_uri: String,
     pub subject: String,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -204,7 +204,7 @@ pub struct FeedGen {
     pub avatar_cid: Option<String>,
     pub accepts_interactions: bool,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -279,7 +279,7 @@ pub struct Post {
     pub embed: Option<String>,
     pub embed_subtype: Option<String>,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -459,7 +459,7 @@ pub struct Postgate {
     pub detached: Vec<Option<String>>,
     pub rules: Vec<Option<String>>,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -493,7 +493,7 @@ pub struct Threadgate {
 
     pub record: serde_json::Value,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -561,7 +561,7 @@ pub struct StaterPack {
     pub list: String,
     pub feeds: Option<Vec<Option<String>>>,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -698,7 +698,7 @@ pub struct VerificationEntry {
     pub handle: String,
     pub display_name: String,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
 
@@ -736,6 +736,6 @@ pub struct Status {
     pub thumb_mime_type: Option<String>,
     pub thumb_cid: Option<String>,
 
-    pub created_at: NaiveDateTime,
+    pub created_at: DateTime<Utc>,
     pub indexed_at: NaiveDateTime,
 }
diff --git a/parakeet/src/hydration/feedgen.rs b/parakeet/src/hydration/feedgen.rs
index 0f61698a..265df021 100644
--- a/parakeet/src/hydration/feedgen.rs
+++ b/parakeet/src/hydration/feedgen.rs
@@ -36,7 +36,7 @@ fn build_feedgen(
         accepts_interactions: feedgen.accepts_interactions,
         labels: map_labels(labels),
         content_mode,
-        indexed_at: feedgen.indexed_at,
+        indexed_at: feedgen.created_at,
     }
 }
 
diff --git a/parakeet/src/hydration/labeler.rs b/parakeet/src/hydration/labeler.rs
index e414bc96..e80d1f62 100644
--- a/parakeet/src/hydration/labeler.rs
+++ b/parakeet/src/hydration/labeler.rs
@@ -19,7 +19,7 @@ fn build_view(
         creator,
         like_count: likes.unwrap_or_default() as i64,
         labels: map_labels(labels),
-        indexed_at: labeler.indexed_at,
+        indexed_at: labeler.indexed_at.and_utc(),
     }
 }
 
@@ -85,7 +85,7 @@ fn build_view_detailed(
         subject_types,
         subject_collections,
         labels: map_labels(labels),
-        indexed_at: labeler.indexed_at,
+        indexed_at: labeler.indexed_at.and_utc(),
     }
 }
 
diff --git a/parakeet/src/hydration/list.rs b/parakeet/src/hydration/list.rs
index 149b2869..5a716933 100644
--- a/parakeet/src/hydration/list.rs
+++ b/parakeet/src/hydration/list.rs
@@ -23,7 +23,7 @@ fn build_basic(
         avatar,
         list_item_count,
         labels: map_labels(labels),
-        indexed_at: list.indexed_at,
+        indexed_at: list.created_at,
     })
 }
 
@@ -52,7 +52,7 @@ fn build_listview(
         avatar,
         list_item_count,
         labels: map_labels(labels),
-        indexed_at: list.indexed_at,
+        indexed_at: list.created_at,
     })
 }
 
diff --git a/parakeet/src/hydration/profile.rs b/parakeet/src/hydration/profile.rs
index 3be5487b..32c33963 100644
--- a/parakeet/src/hydration/profile.rs
+++ b/parakeet/src/hydration/profile.rs
@@ -135,7 +135,7 @@ fn build_status(status: models::Status, cdn: &BskyCdn) -> Option<StatusView> {
     let expires_at = status
         .duration
         .map(|v| TimeDelta::seconds(v as i64))
-        .map(|v| (status.created_at + v).and_utc());
+        .map(|v| status.created_at + v);
     let is_active = expires_at.map(|v| Utc::now() < v);
 
     Some(StatusView {
diff --git a/parakeet/src/hydration/starter_packs.rs b/parakeet/src/hydration/starter_packs.rs
index 6d5f3ca3..bb149afc 100644
--- a/parakeet/src/hydration/starter_packs.rs
+++ b/parakeet/src/hydration/starter_packs.rs
@@ -20,7 +20,7 @@ fn build_basic(
         joined_week_count: 0,
         joined_all_time_count: 0,
         labels: map_labels(labels),
-        indexed_at: starter_pack.indexed_at,
+        indexed_at: starter_pack.created_at,
     }
 }
 
@@ -45,7 +45,7 @@ fn build_spview(
         joined_week_count: 0,
         joined_all_time_count: 0,
         labels: map_labels(labels),
-        indexed_at: starter_pack.indexed_at,
+        indexed_at: starter_pack.created_at,
     }
 }
 
diff --git a/parakeet/src/xrpc/app_bsky/feed/likes.rs b/parakeet/src/xrpc/app_bsky/feed/likes.rs
index 87ac4b79..147bba0d 100644
--- a/parakeet/src/xrpc/app_bsky/feed/likes.rs
+++ b/parakeet/src/xrpc/app_bsky/feed/likes.rs
@@ -142,7 +142,7 @@ pub async fn get_likes(
             Some(Like {
                 actor,
                 created_at,
-                indexed_at,
+                indexed_at: indexed_at.and_utc(),
             })
         })
         .collect();
diff --git a/parakeet/src/xrpc/app_bsky/graph/lists.rs b/parakeet/src/xrpc/app_bsky/graph/lists.rs
index 07577999..137c955f 100644
--- a/parakeet/src/xrpc/app_bsky/graph/lists.rs
+++ b/parakeet/src/xrpc/app_bsky/graph/lists.rs
@@ -111,7 +111,7 @@ pub async fn get_list(
 
     let cursor = results
         .last()
-        .map(|last| last.created_at.and_utc().timestamp_millis().to_string());
+        .map(|last| last.created_at.timestamp_millis().to_string());
 
     let dids = results.iter().map(|item| item.subject.clone()).collect();
 
-- 
2.51.2