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

2 files changed, 46 insertions, 28 deletions

diff --git a/src/conversation/handlers/create/mod.rs b/src/conversation/handlers/create/mod.rs
index 18eca1f..2b7fa39 100644
--- a/src/conversation/handlers/create/mod.rs
+++ b/src/conversation/handlers/create/mod.rs
@@ -5,9 +5,8 @@ use axum::{
 };
 
 use crate::{
-    app::App,
     clock::RequestedAt,
-    conversation::{Conversation, app},
+    conversation::{Conversation, app, app::Conversations},
     error::Internal,
     name::Name,
     token::extract::Identity,
@@ -17,13 +16,12 @@ use crate::{
 mod test;
 
 pub async fn handler(
-    State(app): State<App>,
+    State(conversations): State<Conversations>,
     _: Identity, // requires auth, but doesn't actually care who you are
     RequestedAt(created_at): RequestedAt,
     Json(request): Json<Request>,
 ) -> Result<Response, Error> {
-    let conversation = app
-        .conversations()
+    let conversation = conversations
         .create(&request.name, &created_at)
         .await
         .map_err(Error)?;
diff --git a/src/conversation/handlers/create/test.rs b/src/conversation/handlers/create/test.rs
index bc05b00..380bb13 100644
--- a/src/conversation/handlers/create/test.rs
+++ b/src/conversation/handlers/create/test.rs
@@ -22,10 +22,14 @@ async fn new_conversation() {
 
     let name = fixtures::conversation::propose();
     let request = super::Request { name: name.clone() };
-    let super::Response(response) =
-        super::handler(State(app.clone()), creator, fixtures::now(), Json(request))
-            .await
-            .expect("creating a conversation in an empty app succeeds");
+    let super::Response(response) = super::handler(
+        State(app.conversations()),
+        creator,
+        fixtures::now(),
+        Json(request),
+    )
+    .await
+    .expect("creating a conversation in an empty app succeeds");
 
     // Verify the structure of the response
 
@@ -77,10 +81,14 @@ async fn duplicate_name() {
     let request = super::Request {
         name: conversation.name.clone(),
     };
-    let super::Error(error) =
-        super::handler(State(app.clone()), creator, fixtures::now(), Json(request))
-            .await
-            .expect_err("duplicate conversation name should fail the request");
+    let super::Error(error) = super::handler(
+        State(app.conversations()),
+        creator,
+        fixtures::now(),
+        Json(request),
+    )
+    .await
+    .expect_err("duplicate conversation name should fail the request");
 
     // Verify the structure of the response
 
@@ -110,10 +118,14 @@ async fn conflicting_canonical_name() {
     let request = super::Request {
         name: conflicting_name.clone(),
     };
-    let super::Error(error) =
-        super::handler(State(app.clone()), creator, fixtures::now(), Json(request))
-            .await
-            .expect_err("duplicate conversation name should fail the request");
+    let super::Error(error) = super::handler(
+        State(app.conversations()),
+        creator,
+        fixtures::now(),
+        Json(request),
+    )
+    .await
+    .expect_err("duplicate conversation name should fail the request");
 
     // Verify the structure of the response
 
@@ -135,7 +147,7 @@ async fn invalid_name() {
     let name = fixtures::conversation::propose_invalid_name();
     let request = super::Request { name: name.clone() };
     let super::Error(error) = crate::conversation::handlers::create::handler(
-        State(app.clone()),
+        State(app.conversations()),
         creator,
         fixtures::now(),
         Json(request),
@@ -163,7 +175,7 @@ async fn name_reusable_after_delete() {
 
     let request = super::Request { name: name.clone() };
     let super::Response(response) = super::handler(
-        State(app.clone()),
+        State(app.conversations()),
         creator.clone(),
         fixtures::now(),
         Json(request),
@@ -181,10 +193,14 @@ async fn name_reusable_after_delete() {
     // Call the endpoint (second time)
 
     let request = super::Request { name: name.clone() };
-    let super::Response(response) =
-        super::handler(State(app.clone()), creator, fixtures::now(), Json(request))
-            .await
-            .expect("creation succeeds after original conversation deleted");
+    let super::Response(response) = super::handler(
+        State(app.conversations()),
+        creator,
+        fixtures::now(),
+        Json(request),
+    )
+    .await
+    .expect("creation succeeds after original conversation deleted");
 
     // Verify the structure of the response
 
@@ -212,7 +228,7 @@ async fn name_reusable_after_expiry() {
 
     let request = super::Request { name: name.clone() };
     let super::Response(_) = super::handler(
-        State(app.clone()),
+        State(app.conversations()),
         creator.clone(),
         fixtures::ancient(),
         Json(request),
@@ -230,10 +246,14 @@ async fn name_reusable_after_expiry() {
     // Call the endpoint (second time)
 
     let request = super::Request { name: name.clone() };
-    let super::Response(response) =
-        super::handler(State(app.clone()), creator, fixtures::now(), Json(request))
-            .await
-            .expect("creation succeeds after original conversation expired");
+    let super::Response(response) = super::handler(
+        State(app.conversations()),
+        creator,
+        fixtures::now(),
+        Json(request),
+    )
+    .await
+    .expect("creation succeeds after original conversation expired");
 
     // Verify the structure of the response