Merge branch 'main' into prop/preserve-state

3 files changed, 5 insertions, 5 deletions

diff --git a/src/channel/routes/channel/post.rs b/src/channel/routes/channel/post.rs
index b51e691..3f14d64 100644
--- a/src/channel/routes/channel/post.rs
+++ b/src/channel/routes/channel/post.rs
@@ -8,7 +8,7 @@ use crate::{
     app::App,
     clock::RequestedAt,
     error::{Internal, NotFound},
-    message::{app::SendError, Body, Message},
+    message::{Body, Message, app::SendError},
     token::extract::Identity,
 };
 
diff --git a/src/channel/routes/mod.rs b/src/channel/routes/mod.rs
index 696bd72..c917348 100644
--- a/src/channel/routes/mod.rs
+++ b/src/channel/routes/mod.rs
@@ -1,6 +1,6 @@
 use axum::{
-    routing::{delete, post},
     Router,
+    routing::{delete, post},
 };
 
 use crate::app::App;
@@ -14,6 +14,6 @@ mod test;
 pub fn router() -> Router<App> {
     Router::new()
         .route("/api/channels", post(post::handler))
-        .route("/api/channels/:channel", post(channel::post::handler))
-        .route("/api/channels/:channel", delete(channel::delete::handler))
+        .route("/api/channels/{channel}", post(channel::post::handler))
+        .route("/api/channels/{channel}", delete(channel::delete::handler))
 }
diff --git a/src/channel/routes/post.rs b/src/channel/routes/post.rs
index 2cf1cc0..72eaad6 100644
--- a/src/channel/routes/post.rs
+++ b/src/channel/routes/post.rs
@@ -6,7 +6,7 @@ use axum::{
 
 use crate::{
     app::App,
-    channel::{app, Channel},
+    channel::{Channel, app},
     clock::RequestedAt,
     error::Internal,
     name::Name,