From 4e3d5ccac99b24934c972e088cd7eb02bb95df06 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Tue, 17 Jun 2025 02:11:45 -0400 Subject: 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. --- src/ui/routes/ch/channel.rs | 60 --------------------------------------------- src/ui/routes/ch/mod.rs | 1 - 2 files changed, 61 deletions(-) delete mode 100644 src/ui/routes/ch/channel.rs delete mode 100644 src/ui/routes/ch/mod.rs (limited to 'src/ui/routes/ch') 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, - identity: Option, - Path(channel): Path, - ) -> Result { - 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 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; -- cgit v1.2.3