summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/app.rs10
-rw-r--r--src/boot/mod.rs4
-rw-r--r--src/boot/routes/get.rs6
-rw-r--r--src/boot/routes/test.rs2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/boot/app.rs b/src/boot/app.rs
index 909f7d8..9c2559e 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,7 +22,7 @@ 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 logins = tx.users().all(resume_point).await?;
let channels = tx.channels().all(resume_point).await?;
let messages = tx.messages().all(resume_point).await?;
@@ -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..d614df5 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 logins: 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..c04c6b3 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,
+ login: identity.user,
snapshot,
})
}
#[derive(serde::Serialize)]
pub struct Response {
- pub login: Login,
+ pub login: User,
#[serde(flatten)]
pub snapshot: Snapshot,
}
diff --git a/src/boot/routes/test.rs b/src/boot/routes/test.rs
index 202dcb9..5bd9f66 100644
--- a/src/boot/routes/test.rs
+++ b/src/boot/routes/test.rs
@@ -12,7 +12,7 @@ async fn returns_identity() {
.await
.expect("boot always succeeds");
- assert_eq!(viewer.login, response.login);
+ assert_eq!(viewer.user, response.login);
}
#[tokio::test]