Convert the `Messages` component to a freestanding struct.

2 files changed, 9 insertions, 8 deletions

diff --git a/src/conversation/handlers/send/mod.rs b/src/conversation/handlers/send/mod.rs
index c8be59c..ff63652 100644
--- a/src/conversation/handlers/send/mod.rs
+++ b/src/conversation/handlers/send/mod.rs
@@ -5,11 +5,13 @@ use axum::{
 };
 
 use crate::{
-    app::App,
     clock::RequestedAt,
     conversation::handlers::PathInfo,
     error::{Internal, NotFound},
-    message::{Body, Message, app::SendError},
+    message::{
+        Body, Message,
+        app::{Messages, SendError},
+    },
     token::extract::Identity,
 };
 
@@ -17,14 +19,13 @@ use crate::{
 mod test;
 
 pub async fn handler(
-    State(app): State<App>,
+    State(messages): State<Messages>,
     Path(conversation): Path<PathInfo>,
     RequestedAt(sent_at): RequestedAt,
     identity: Identity,
     Json(request): Json<Request>,
 ) -> Result<Response, Error> {
-    let message = app
-        .messages()
+    let message = messages
         .send(&conversation, &identity.login, &sent_at, &request.body)
         .await?;
 
diff --git a/src/conversation/handlers/send/test.rs b/src/conversation/handlers/send/test.rs
index 8863090..013aaa4 100644
--- a/src/conversation/handlers/send/test.rs
+++ b/src/conversation/handlers/send/test.rs
@@ -28,7 +28,7 @@ async fn messages_in_order() {
         let request = super::Request { body: body.clone() };
 
         let _ = super::handler(
-            State(app.clone()),
+            State(app.messages()),
             Path(conversation.id.clone()),
             sent_at.clone(),
             sender.clone(),
@@ -75,7 +75,7 @@ async fn nonexistent_conversation() {
         body: fixtures::message::propose(),
     };
     let super::Error(error) = super::handler(
-        State(app),
+        State(app.messages()),
         Path(conversation.clone()),
         sent_at,
         sender,
@@ -112,7 +112,7 @@ async fn deleted_conversation() {
         body: fixtures::message::propose(),
     };
     let super::Error(error) = super::handler(
-        State(app),
+        State(app.messages()),
         Path(conversation.id.clone()),
         sent_at,
         sender,