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

3 files changed, 17 insertions, 15 deletions

diff --git a/src/message/app.rs b/src/message/app.rs
index 647152e..cbcbff9 100644
--- a/src/message/app.rs
+++ b/src/message/app.rs
@@ -13,13 +13,13 @@ use crate::{
     user::{self, repo::Provider as _},
 };
 
-pub struct Messages<'a> {
-    db: &'a SqlitePool,
-    events: &'a Broadcaster,
+pub struct Messages {
+    db: SqlitePool,
+    events: Broadcaster,
 }
 
-impl<'a> Messages<'a> {
-    pub const fn new(db: &'a SqlitePool, events: &'a Broadcaster) -> Self {
+impl Messages {
+    pub const fn new(db: SqlitePool, events: Broadcaster) -> Self {
         Self { db, events }
     }
 
diff --git a/src/message/handlers/delete/mod.rs b/src/message/handlers/delete/mod.rs
index 3e9a212..c09a752 100644
--- a/src/message/handlers/delete/mod.rs
+++ b/src/message/handlers/delete/mod.rs
@@ -5,10 +5,12 @@ use axum::{
 };
 
 use crate::{
-    app::App,
     clock::RequestedAt,
     error::{Internal, NotFound},
-    message::{self, app::DeleteError},
+    message::{
+        self,
+        app::{DeleteError, Messages},
+    },
     token::extract::Identity,
 };
 
@@ -16,12 +18,12 @@ use crate::{
 mod test;
 
 pub async fn handler(
-    State(app): State<App>,
+    State(messages): State<Messages>,
     Path(message): Path<message::Id>,
     RequestedAt(deleted_at): RequestedAt,
     identity: Identity,
 ) -> Result<Response, Error> {
-    app.messages()
+    messages
         .delete(&identity.login, &message, &deleted_at)
         .await?;
 
diff --git a/src/message/handlers/delete/test.rs b/src/message/handlers/delete/test.rs
index 05d9344..198728b 100644
--- a/src/message/handlers/delete/test.rs
+++ b/src/message/handlers/delete/test.rs
@@ -16,7 +16,7 @@ pub async fn delete_message() {
     // Send the request
 
     let response = super::handler(
-        State(app.clone()),
+        State(app.messages()),
         Path(message.id.clone()),
         fixtures::now(),
         sender,
@@ -52,7 +52,7 @@ pub async fn delete_invalid_message_id() {
     let deleter = fixtures::identity::create(&app, &fixtures::now()).await;
     let message = fixtures::message::fictitious();
     let super::Error(error) = super::handler(
-        State(app.clone()),
+        State(app.messages()),
         Path(message.clone()),
         fixtures::now(),
         deleter,
@@ -83,7 +83,7 @@ pub async fn delete_deleted() {
     // Send the request
 
     let super::Error(error) = super::handler(
-        State(app.clone()),
+        State(app.messages()),
         Path(message.id.clone()),
         fixtures::now(),
         sender,
@@ -114,7 +114,7 @@ pub async fn delete_expired() {
     // Send the request
 
     let super::Error(error) = super::handler(
-        State(app.clone()),
+        State(app.messages()),
         Path(message.id.clone()),
         fixtures::now(),
         sender,
@@ -150,7 +150,7 @@ pub async fn delete_purged() {
 
     let deleter = fixtures::identity::create(&app, &fixtures::now()).await;
     let super::Error(error) = super::handler(
-        State(app.clone()),
+        State(app.messages()),
         Path(message.id.clone()),
         fixtures::now(),
         deleter,
@@ -176,7 +176,7 @@ pub async fn delete_not_sender() {
 
     let deleter = fixtures::identity::create(&app, &fixtures::now()).await;
     let super::Error(error) = super::handler(
-        State(app.clone()),
+        State(app.messages()),
         Path(message.id.clone()),
         fixtures::now(),
         deleter.clone(),