Merge remote-tracking branch 'codeberg/main' into push-notify

3 files changed, 18 insertions, 15 deletions

diff --git a/src/boot/app.rs b/src/boot/app.rs
index 543429f..8da3e90 100644
--- a/src/boot/app.rs
+++ b/src/boot/app.rs
@@ -12,12 +12,12 @@ use crate::{
     vapid::{self, repo::Provider as _},
 };
 
-pub struct Boot<'a> {
-    db: &'a SqlitePool,
+pub struct Boot {
+    db: SqlitePool,
 }
 
-impl<'a> Boot<'a> {
-    pub const fn new(db: &'a SqlitePool) -> Self {
+impl Boot {
+    pub const fn new(db: SqlitePool) -> Self {
         Self { db }
     }
 
diff --git a/src/boot/handlers/boot/mod.rs b/src/boot/handlers/boot/mod.rs
index 3e022b1..5ff7802 100644
--- a/src/boot/handlers/boot/mod.rs
+++ b/src/boot/handlers/boot/mod.rs
@@ -7,15 +7,18 @@ use axum::{
 use serde::Serialize;
 
 use crate::{
-    app::App, boot::Snapshot, error::Internal, event::Heartbeat, login::Login,
+    boot::{Snapshot, app::Boot},
+    error::Internal,
+    event::Heartbeat,
+    login::Login,
     token::extract::Identity,
 };
 
 #[cfg(test)]
 mod test;
 
-pub async fn handler(State(app): State<App>, identity: Identity) -> Result<Response, Internal> {
-    let snapshot = app.boot().snapshot().await?;
+pub async fn handler(State(boot): State<Boot>, identity: Identity) -> Result<Response, Internal> {
+    let snapshot = boot.snapshot().await?;
     let heartbeat = Heartbeat::TIMEOUT;
 
     Ok(Response {
diff --git a/src/boot/handlers/boot/test.rs b/src/boot/handlers/boot/test.rs
index 3c09b0f..7eb4e52 100644
--- a/src/boot/handlers/boot/test.rs
+++ b/src/boot/handlers/boot/test.rs
@@ -8,7 +8,7 @@ async fn returns_identity() {
     let app = fixtures::scratch_app().await;
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer.clone())
+    let response = super::handler(State(app.boot()), viewer.clone())
         .await
         .expect("boot always succeeds");
 
@@ -21,7 +21,7 @@ async fn includes_users() {
     let spectator = fixtures::user::create(&app, &fixtures::now()).await;
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");
 
@@ -42,7 +42,7 @@ async fn includes_conversations() {
     let conversation = fixtures::conversation::create(&app, &fixtures::now()).await;
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");
 
@@ -65,7 +65,7 @@ async fn includes_messages() {
     let message = fixtures::message::send(&app, &conversation, &sender, &fixtures::now()).await;
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");
 
@@ -162,7 +162,7 @@ async fn includes_expired_messages() {
         .expect("expiry never fails");
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");
 
@@ -204,7 +204,7 @@ async fn includes_deleted_messages() {
         .expect("deleting valid message succeeds");
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");
 
@@ -243,7 +243,7 @@ async fn includes_expired_conversations() {
         .expect("expiry never fails");
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");
 
@@ -282,7 +282,7 @@ async fn includes_deleted_conversations() {
         .expect("deleting a valid conversation succeeds");
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");