refactor error handling

hanneskt · hanneskt · commit 5c13d9db9555 · 2025-08-24T08:30:28.000+02:00
diff --git a/src/error.rs b/src/error.rs
@@ -67,32 +67,31 @@ impl IntoResponse for AppError {
 
 impl AppError {
     fn error_page(&self) -> (StatusCode, Html<String>) {
-        match self {
+        let (status, msg) = match self {
             Self::NoFile => (
                 StatusCode::BAD_REQUEST,
-                Page::error("No file found in request."),
+                "No file found in request. Please select an image.",
             ),
             Self::Multipart(_) => (
                 StatusCode::BAD_REQUEST,
-                Page::error("There was a problem with your file upload. Please try again."),
+                "There was a problem with your file upload. Please try again.",
             ),
             Self::ImageResTooLarge => (
                 StatusCode::PAYLOAD_TOO_LARGE,
-                Page::error("The image resolution is too large. Maximum is 10k x 10k pixels."),
+                "The image resolution is too large. Maximum is 10k x 10k pixels.",
             ),
             Self::WrongFileType => (
                 StatusCode::BAD_REQUEST,
-                Page::error("Incorrect file type. Please upload a JPG, PNG, GIF, or WEBP file."),
-            ),
-            Self::ImageNotFound => (
-                StatusCode::NOT_FOUND,
-                Page::error("We couldn't find that image."),
+                "Incorrect file type. Please upload a JPG, PNG, GIF, or WEBP file.",
             ),
+            Self::ImageNotFound => (StatusCode::NOT_FOUND, "We couldn't find that image."),
 
             _ => (
                 StatusCode::INTERNAL_SERVER_ERROR,
-                Page::error("Please help I have internal errors."),
+                "Please help I have internal errors. D:",
             ),
-        }
+        };
+
+        (status, Page::error(status, msg))
     }
 }
diff --git a/src/main.rs b/src/main.rs
@@ -8,6 +8,7 @@ use axum::{
 };
 use error::AppError;
 use pages::Page;
+use reqwest::StatusCode;
 use tokio::io::{self};
 use tower_http::{services::ServeDir, trace::TraceLayer};
 use tower_sessions::{MemoryStore, Session, SessionManagerLayer, cookie::SameSite};
@@ -51,7 +52,10 @@ async fn main() -> Result<(), io::Error> {
         .route("/image", post(Image::post).delete(Image::delete))
         .route("/image/{id}", get(Image::get))
         .nest_service("/static", static_dir)
-        .route("/{*wildcard}", get(|| async { Page::error("404") }))
+        .route(
+            "/{*wildcard}",
+            get(|| async { Page::error(StatusCode::NOT_FOUND, "404") }),
+        )
         .layer(sess_mw)
         .layer(DefaultBodyLimit::max(10_485_760))
         .layer(TraceLayer::new_for_http());
diff --git a/src/pages.rs b/src/pages.rs
@@ -1,4 +1,5 @@
 use axum::response::Html;
+use reqwest::StatusCode;
 
 static LOGIN_HTML: &str = include_str!("../templates/login.html");
 static UPLOAD_HTML: &str = include_str!("../templates/upload.html");
@@ -19,7 +20,11 @@ impl Page {
         Html(LOGIN_HTML.to_string())
     }
 
-    pub fn error(msg: &str) -> Html<String> {
-        Html(ERROR_HTML.replace("{{error_message}}", msg))
+    pub fn error(status_code: StatusCode, msg: &str) -> Html<String> {
+        Html(
+            ERROR_HTML
+                .replace("{{error_message}}", msg)
+                .replace("{{status_code}}", &status_code.as_u16().to_string()),
+        )
     }
 }
diff --git a/templates/error.html b/templates/error.html
@@ -3,6 +3,7 @@
     <body>
         <div class="card">
             <div>Ono! An error!</div>
+            <div>{{status_code}}</div>
             <div style="font-size: 1rem">{{error_message}}</div>
             <a href="/">Go Back</a>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`use axum::response::Html;`
	`2`	`+use reqwest::StatusCode;`
`2`	`3`
`3`	`4`	`static LOGIN_HTML: &str = include_str!("../templates/login.html");`
`4`	`5`	`static UPLOAD_HTML: &str = include_str!("../templates/upload.html");`
`@@ -19,7 +20,11 @@ impl Page {`
`19`	`20`	`Html(LOGIN_HTML.to_string())`
`20`	`21`	`}`
`21`	`22`
`22`		`- pub fn error(msg: &str) -> Html<String> {`
`23`		`- Html(ERROR_HTML.replace("{{error_message}}", msg))`
	`23`	`+ pub fn error(status_code: StatusCode, msg: &str) -> Html<String> {`
	`24`	`+ Html(`
	`25`	`+ ERROR_HTML`
	`26`	`+ .replace("{{error_message}}", msg)`
	`27`	`+ .replace("{{status_code}}", &status_code.as_u16().to_string()),`
	`28`	`+ )`
`24`	`29`	`}`
`25`	`30`	`}`