Handlers are _named operations_, which can be exposed via routes.

Each domain module that exposes handlers does so through a `handlers` child module, ideally as a top-level symbol that can be plugged directly into Axum's `MethodRouter`. Modules could make exceptions to this - kill the doctrinaire inside yourself, after all - but none of the API modules that actually exist need such exceptions, and consistency is useful.

The related details of request types, URL types, response types, errors, &c &c are then organized into modules under `handlers`, along with their respective tests.

10 files changed, 0 insertions, 251 deletions

diff --git a/src/ui/routes/ch/channel.rs b/src/ui/routes/ch/channel.rs
deleted file mode 100644
index a854f14..0000000
--- a/src/ui/routes/ch/channel.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-pub mod get {
-    use axum::{
-        extract::{Path, State},
-        response::{self, IntoResponse, Redirect},
-    };
-
-    use crate::{
-        app::App,
-        channel::{self, app},
-        error::Internal,
-        token::extract::Identity,
-        ui::{
-            assets::{Asset, Assets},
-            error::NotFound,
-        },
-    };
-
-    pub async fn handler(
-        State(app): State<App>,
-        identity: Option<Identity>,
-        Path(channel): Path<channel::Id>,
-    ) -> Result<Asset, Error> {
-        let _ = identity.ok_or(Error::NotLoggedIn)?;
-        app.channels().get(&channel).await.map_err(Error::from)?;
-
-        Assets::index().map_err(Error::Internal)
-    }
-
-    #[derive(Debug, thiserror::Error)]
-    pub enum Error {
-        #[error("channel not found")]
-        NotFound,
-        #[error("not logged in")]
-        NotLoggedIn,
-        #[error("{0}")]
-        Internal(Internal),
-    }
-
-    impl From<app::Error> for Error {
-        fn from(error: app::Error) -> Self {
-            match error {
-                app::Error::NotFound(_) | app::Error::Deleted(_) => Self::NotFound,
-                other => Self::Internal(other.into()),
-            }
-        }
-    }
-
-    impl IntoResponse for Error {
-        fn into_response(self) -> response::Response {
-            match self {
-                Self::NotFound => match Assets::index() {
-                    Ok(asset) => NotFound(asset).into_response(),
-                    Err(internal) => internal.into_response(),
-                },
-                Self::NotLoggedIn => Redirect::temporary("/login").into_response(),
-                Self::Internal(error) => error.into_response(),
-            }
-        }
-    }
-}
diff --git a/src/ui/routes/ch/mod.rs b/src/ui/routes/ch/mod.rs
deleted file mode 100644
index ff02972..0000000
--- a/src/ui/routes/ch/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod channel;
diff --git a/src/ui/routes/get.rs b/src/ui/routes/get.rs
deleted file mode 100644
index 2fcb51c..0000000
--- a/src/ui/routes/get.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use axum::response::{self, IntoResponse, Redirect};
-
-use crate::{
-    error::Internal,
-    token::extract::Identity,
-    ui::assets::{Asset, Assets},
-};
-
-pub async fn handler(identity: Option<Identity>) -> Result<Asset, Error> {
-    let _ = identity.ok_or(Error::NotLoggedIn)?;
-
-    Assets::index().map_err(Error::Internal)
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error("not logged in")]
-    NotLoggedIn,
-    #[error("{0}")]
-    Internal(Internal),
-}
-
-impl IntoResponse for Error {
-    fn into_response(self) -> response::Response {
-        match self {
-            Self::NotLoggedIn => Redirect::temporary("/login").into_response(),
-            Self::Internal(error) => error.into_response(),
-        }
-    }
-}
diff --git a/src/ui/routes/invite/invite.rs b/src/ui/routes/invite/invite.rs
deleted file mode 100644
index 06e5792..0000000
--- a/src/ui/routes/invite/invite.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-pub mod get {
-    use axum::{
-        extract::{Path, State},
-        response::{self, IntoResponse},
-    };
-
-    use crate::{
-        app::App,
-        error::Internal,
-        invite,
-        ui::{
-            assets::{Asset, Assets},
-            error::NotFound,
-        },
-    };
-
-    pub async fn handler(
-        State(app): State<App>,
-        Path(invite): Path<invite::Id>,
-    ) -> Result<Asset, Error> {
-        app.invites()
-            .get(&invite)
-            .await
-            .map_err(Error::internal)?
-            .ok_or(Error::NotFound)?;
-
-        Assets::index().map_err(Error::Internal)
-    }
-
-    #[derive(Debug, thiserror::Error)]
-    pub enum Error {
-        #[error("invite not found")]
-        NotFound,
-        #[error("{0}")]
-        Internal(Internal),
-    }
-
-    impl Error {
-        fn internal(err: impl Into<Internal>) -> Self {
-            Self::Internal(err.into())
-        }
-    }
-
-    impl IntoResponse for Error {
-        fn into_response(self) -> response::Response {
-            match self {
-                Self::NotFound => match Assets::index() {
-                    Ok(asset) => NotFound(asset).into_response(),
-                    Err(internal) => internal.into_response(),
-                },
-                Self::Internal(error) => error.into_response(),
-            }
-        }
-    }
-}
diff --git a/src/ui/routes/invite/mod.rs b/src/ui/routes/invite/mod.rs
deleted file mode 100644
index 50af8be..0000000
--- a/src/ui/routes/invite/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// In this case, the first redundant `invite` is a literal path segment, and the
-// second `invite` reflects a placeholder.
-#[allow(clippy::module_inception)]
-pub mod invite;
diff --git a/src/ui/routes/login.rs b/src/ui/routes/login.rs
deleted file mode 100644
index 39d45b9..0000000
--- a/src/ui/routes/login.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub mod get {
-    use crate::{
-        error::Internal,
-        ui::assets::{Asset, Assets},
-    };
-
-    pub async fn handler() -> Result<Asset, Internal> {
-        Assets::index()
-    }
-}
diff --git a/src/ui/routes/me.rs b/src/ui/routes/me.rs
deleted file mode 100644
index f1f118f..0000000
--- a/src/ui/routes/me.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-pub mod get {
-    use axum::response::{self, IntoResponse, Redirect};
-
-    use crate::{
-        error::Internal,
-        token::extract::Identity,
-        ui::assets::{Asset, Assets},
-    };
-
-    pub async fn handler(identity: Option<Identity>) -> Result<Asset, Error> {
-        let _ = identity.ok_or(Error::NotLoggedIn)?;
-
-        Assets::index().map_err(Error::Internal)
-    }
-
-    #[derive(Debug, thiserror::Error)]
-    pub enum Error {
-        #[error("not logged in")]
-        NotLoggedIn,
-        #[error("{0}")]
-        Internal(Internal),
-    }
-
-    impl IntoResponse for Error {
-        fn into_response(self) -> response::Response {
-            match self {
-                Self::NotLoggedIn => Redirect::temporary("/login").into_response(),
-                Self::Internal(error) => error.into_response(),
-            }
-        }
-    }
-}
diff --git a/src/ui/routes/mod.rs b/src/ui/routes/mod.rs
deleted file mode 100644
index 2390802..0000000
--- a/src/ui/routes/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod ch;
-pub mod get;
-pub mod invite;
-pub mod login;
-pub mod me;
-pub mod path;
-pub mod setup;
diff --git a/src/ui/routes/path.rs b/src/ui/routes/path.rs
deleted file mode 100644
index a387552..0000000
--- a/src/ui/routes/path.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod get {
-    use axum::extract::Path;
-
-    use crate::ui::assets::{Asset, Assets, Error};
-
-    pub async fn handler(Path(path): Path<String>) -> Result<Asset, Error> {
-        Assets::load(path)
-    }
-}
diff --git a/src/ui/routes/setup.rs b/src/ui/routes/setup.rs
deleted file mode 100644
index 649cc5f..0000000
--- a/src/ui/routes/setup.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-pub mod get {
-    use axum::{
-        extract::State,
-        response::{self, IntoResponse, Redirect},
-    };
-
-    use crate::{
-        app::App,
-        error::Internal,
-        ui::assets::{Asset, Assets},
-    };
-
-    pub async fn handler(State(app): State<App>) -> Result<Asset, Error> {
-        if app
-            .setup()
-            .completed()
-            .await
-            .map_err(Internal::from)
-            .map_err(Error::Internal)?
-        {
-            Err(Error::SetupCompleted)
-        } else {
-            Assets::index().map_err(Error::Internal)
-        }
-    }
-
-    #[derive(Debug, thiserror::Error)]
-    pub enum Error {
-        #[error("setup already completed")]
-        SetupCompleted,
-        #[error("{0}")]
-        Internal(Internal),
-    }
-
-    impl IntoResponse for Error {
-        fn into_response(self) -> response::Response {
-            match self {
-                Self::SetupCompleted => Redirect::to("/login").into_response(),
-                Self::Internal(error) => error.into_response(),
-            }
-        }
-    }
-}