1 files changed, 2 insertions, 7 deletions
diff --git a/src/cli.rs b/src/cli.rs
index 4232c00..042141d 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -15,12 +15,7 @@ use clap::{CommandFactory, Parser};
 use sqlx::sqlite::SqlitePool;
 use tokio::net;
 
-use crate::{
-    app::App,
-    boot, channel, clock, db, event, expire, invite, message,
-    setup::{self, middleware::setup_required},
-    ui, user,
-};
+use crate::{app::App, boot, channel, clock, db, event, expire, invite, message, setup, ui, user};
 
 /// Command-line entry point for running the `pilcrow` server.
 ///
@@ -152,7 +147,7 @@ fn routers(app: &App) -> Router<App> {
             app.clone(),
             expire::middleware,
         ))
-        .route_layer(middleware::from_fn_with_state(app.clone(), setup_required)),
+        .route_layer(setup::Required::or_unavailable(app.clone())),
         // API endpoints that handle setup
         setup::router(),
         // The UI (handles setup state itself)