4 files changed, 19 insertions, 19 deletions

diff --git a/src/boot/app.rs b/src/boot/app.rs
index 909f7d8..f531afe 100644
--- a/src/boot/app.rs
+++ b/src/boot/app.rs
@@ -4,9 +4,9 @@ use super::Snapshot;
 use crate::{
     channel::{self, repo::Provider as _},
     event::repo::Provider as _,
-    login::{self, repo::Provider as _},
     message::repo::Provider as _,
     name,
+    user::{self, repo::Provider as _},
 };
 
 pub struct Boot<'a> {
@@ -22,15 +22,15 @@ impl<'a> Boot<'a> {
         let mut tx = self.db.begin().await?;
         let resume_point = tx.sequence().current().await?;
 
-        let logins = tx.logins().all(resume_point).await?;
+        let users = tx.users().all(resume_point).await?;
         let channels = tx.channels().all(resume_point).await?;
         let messages = tx.messages().all(resume_point).await?;
 
         tx.commit().await?;
 
-        let logins = logins
+        let users = users
             .into_iter()
-            .filter_map(|login| login.as_of(resume_point))
+            .filter_map(|user| user.as_of(resume_point))
             .collect();
 
         let channels = channels
@@ -45,7 +45,7 @@ impl<'a> Boot<'a> {
 
         Ok(Snapshot {
             resume_point,
-            logins,
+            users,
             channels,
             messages,
         })
@@ -59,9 +59,9 @@ pub enum Error {
     Database(#[from] sqlx::Error),
 }
 
-impl From<login::repo::LoadError> for Error {
-    fn from(error: login::repo::LoadError) -> Self {
-        use login::repo::LoadError;
+impl From<user::repo::LoadError> for Error {
+    fn from(error: user::repo::LoadError) -> Self {
+        use user::repo::LoadError;
         match error {
             LoadError::Name(error) => error.into(),
             LoadError::Database(error) => error.into(),
diff --git a/src/boot/mod.rs b/src/boot/mod.rs
index ed4764a..c52b088 100644
--- a/src/boot/mod.rs
+++ b/src/boot/mod.rs
@@ -1,14 +1,14 @@
 pub mod app;
 mod routes;
 
-use crate::{channel::Channel, event::Sequence, login::Login, message::Message};
+use crate::{channel::Channel, event::Sequence, message::Message, user::User};
 
 pub use self::routes::router;
 
 #[derive(serde::Serialize)]
 pub struct Snapshot {
     pub resume_point: Sequence,
-    pub logins: Vec<Login>,
+    pub users: Vec<User>,
     pub channels: Vec<Channel>,
     pub messages: Vec<Message>,
 }
diff --git a/src/boot/routes/get.rs b/src/boot/routes/get.rs
index 563fbf1..4873b7a 100644
--- a/src/boot/routes/get.rs
+++ b/src/boot/routes/get.rs
@@ -3,19 +3,19 @@ use axum::{
     response::{self, IntoResponse},
 };
 
-use crate::{app::App, boot::Snapshot, error::Internal, login::Login, token::extract::Identity};
+use crate::{app::App, boot::Snapshot, error::Internal, token::extract::Identity, user::User};
 
 pub async fn handler(State(app): State<App>, identity: Identity) -> Result<Response, Internal> {
     let snapshot = app.boot().snapshot().await?;
     Ok(Response {
-        login: identity.login,
+        user: identity.user,
         snapshot,
     })
 }
 
 #[derive(serde::Serialize)]
 pub struct Response {
-    pub login: Login,
+    pub user: User,
     #[serde(flatten)]
     pub snapshot: Snapshot,
 }
diff --git a/src/boot/routes/test.rs b/src/boot/routes/test.rs
index 202dcb9..55802fe 100644
--- a/src/boot/routes/test.rs
+++ b/src/boot/routes/test.rs
@@ -12,20 +12,20 @@ async fn returns_identity() {
         .await
         .expect("boot always succeeds");
 
-    assert_eq!(viewer.login, response.login);
+    assert_eq!(viewer.user, response.user);
 }
 
 #[tokio::test]
 async fn includes_logins() {
     let app = fixtures::scratch_app().await;
-    let spectator = fixtures::login::create(&app, &fixtures::now()).await;
+    let spectator = fixtures::user::create(&app, &fixtures::now()).await;
 
     let viewer = fixtures::identity::fictitious();
     let response = get::handler(State(app), viewer)
         .await
         .expect("boot always succeeds");
 
-    assert!(response.snapshot.logins.contains(&spectator));
+    assert!(response.snapshot.users.contains(&spectator));
 }
 
 #[tokio::test]
@@ -44,7 +44,7 @@ async fn includes_channels() {
 #[tokio::test]
 async fn includes_messages() {
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
 
@@ -59,7 +59,7 @@ async fn includes_messages() {
 #[tokio::test]
 async fn excludes_expired_messages() {
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
     let channel = fixtures::channel::create(&app, &fixtures::ancient()).await;
     let expired_message =
         fixtures::message::send(&app, &channel, &sender, &fixtures::ancient()).await;
@@ -80,7 +80,7 @@ async fn excludes_expired_messages() {
 #[tokio::test]
 async fn excludes_deleted_messages() {
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
     let deleted_message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;