From 05b33f0243775f25b83076a5504e0958d9e53f0a Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Thu, 5 Jun 2025 16:20:31 -0700
Subject: [PATCH] fix naming convention

---
 ingestor/src/collections.rs                            | 10 ++++------
 .../{app_bsky_post.rs => app_bsky_feed_post.rs}        |  2 +-
 .../{my_spoor_activity.rs => my_spoor_log_activity.rs} |  2 +-
 .../{my_spoor_session.rs => my_spoor_log_session.rs}   |  2 +-
 ingestor/src/main.rs                                   |  7 +++----
 5 files changed, 10 insertions(+), 13 deletions(-)
 rename ingestor/src/collections/{app_bsky_post.rs => app_bsky_feed_post.rs} (86%)
 rename ingestor/src/collections/{my_spoor_activity.rs => my_spoor_log_activity.rs} (88%)
 rename ingestor/src/collections/{my_spoor_session.rs => my_spoor_log_session.rs} (88%)

diff --git a/ingestor/src/collections.rs b/ingestor/src/collections.rs
index bf5d5c6..3b9cd5d 100644
--- a/ingestor/src/collections.rs
+++ b/ingestor/src/collections.rs
@@ -70,12 +70,10 @@ macro_rules! create_commit_collection {
   );
 }
 
-pub mod my_spoor_session;
-pub use my_spoor_session::MySpoorSession;
-pub mod my_spoor_activity;
-pub use my_spoor_activity::MySpoorActivity;
-pub mod app_bsky_post;
-pub use app_bsky_post::AppBskyPost;
+pub mod my_spoor_log_session;
+pub use my_spoor_log_session::MySpoorLogSession;
+pub mod my_spoor_log_activity;
+pub use my_spoor_log_activity::MySpoorLogActivity;
 
 struct CommitIngestorState;
 
diff --git a/ingestor/src/collections/app_bsky_post.rs b/ingestor/src/collections/app_bsky_feed_post.rs
similarity index 86%
rename from ingestor/src/collections/app_bsky_post.rs
rename to ingestor/src/collections/app_bsky_feed_post.rs
index 45c740d..d57bb1d 100644
--- a/ingestor/src/collections/app_bsky_post.rs
+++ b/ingestor/src/collections/app_bsky_feed_post.rs
@@ -20,7 +20,7 @@ async fn handle_delete(
   Ok(())
 }
 
-create_commit_collection!(AppBskyPost, "app.bsky.feed.post".to_string(),
+create_commit_collection!(AppBskyFeedPost, "app.bsky.feed.post".to_string(),
   change => handle_change,
   delete => handle_delete,
 );
diff --git a/ingestor/src/collections/my_spoor_activity.rs b/ingestor/src/collections/my_spoor_log_activity.rs
similarity index 88%
rename from ingestor/src/collections/my_spoor_activity.rs
rename to ingestor/src/collections/my_spoor_log_activity.rs
index 3544cfb..b664220 100644
--- a/ingestor/src/collections/my_spoor_activity.rs
+++ b/ingestor/src/collections/my_spoor_log_activity.rs
@@ -24,7 +24,7 @@ async fn handle_delete(
   Ok(())
 }
 
-create_commit_collection!(MySpoorActivity, Activity::NSID.to_string(),
+create_commit_collection!(MySpoorLogActivity, Activity::NSID.to_string(),
   change => handle_change,
   delete => handle_delete,
 );
diff --git a/ingestor/src/collections/my_spoor_session.rs b/ingestor/src/collections/my_spoor_log_session.rs
similarity index 88%
rename from ingestor/src/collections/my_spoor_session.rs
rename to ingestor/src/collections/my_spoor_log_session.rs
index 25ba380..c90e7de 100644
--- a/ingestor/src/collections/my_spoor_session.rs
+++ b/ingestor/src/collections/my_spoor_log_session.rs
@@ -24,7 +24,7 @@ async fn handle_delete(
   Ok(())
 }
 
-create_commit_collection!(MySpoorSession, Session::NSID.to_string(),
+create_commit_collection!(MySpoorLogSession, Session::NSID.to_string(),
   change => handle_change,
   delete => handle_delete,
 );
diff --git a/ingestor/src/main.rs b/ingestor/src/main.rs
index 18a3541..08af557 100644
--- a/ingestor/src/main.rs
+++ b/ingestor/src/main.rs
@@ -1,7 +1,7 @@
 use crate::{
   collections::{
     Collection,
-    MySpoorActivity, MySpoorSession, AppBskyPost,
+    MySpoorLogActivity, MySpoorLogSession,
   },
   ingestor::Ingestor,
 };
@@ -15,8 +15,7 @@ async fn main() {
   let _ = tracing::subscriber::set_global_default(subscriber);
 
   let mut ingestor = Ingestor::new();
-  ingestor.add_collection(MySpoorActivity::new());
-  ingestor.add_collection(MySpoorSession::new());
-  ingestor.add_collection(AppBskyPost::new());
+  ingestor.add_collection(MySpoorLogActivity::new());
+  ingestor.add_collection(MySpoorLogSession::new());
   ingestor.start().await;
 }