Merge branch 'main' into feature-frontend

1 files changed, 10 insertions, 5 deletions

diff --git a/src/cli.rs b/src/cli.rs
index 132baf8..2d9f512 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -10,7 +10,7 @@ use clap::Parser;
 use sqlx::sqlite::SqlitePool;
 use tokio::net;
 
-use crate::{app::App, channel, clock, events, expire, login, repo::pool};
+use crate::{app::App, channel, clock, db, event, expire, login, message};
 
 /// Command-line entry point for running the `hi` server.
 ///
@@ -100,14 +100,19 @@ impl Args {
     }
 
     async fn pool(&self) -> sqlx::Result<SqlitePool> {
-        pool::prepare(&self.database_url).await
+        db::prepare(&self.database_url).await
     }
 }
 
 fn routers() -> Router<App> {
-    [channel::router(), events::router(), login::router()]
-        .into_iter()
-        .fold(Router::default(), Router::merge)
+    [
+        channel::router(),
+        event::router(),
+        login::router(),
+        message::router(),
+    ]
+    .into_iter()
+    .fold(Router::default(), Router::merge)
 }
 
 fn started_msg(listener: &net::TcpListener) -> io::Result<String> {