diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/public/file.rs | 10 | ||||
| -rw-r--r-- | src/types/extract.rs | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/public/file.rs b/src/public/file.rs index b54ef25..7c118a6 100644 --- a/src/public/file.rs +++ b/src/public/file.rs @@ -7,25 +7,23 @@ use serde::Deserialize; use crate::types::http::ResponseCode; -use super::console; - pub async fn js(Path(path): Path<String>) -> Response { - let path = format!("/js/{}", path); + let path = format!("/js/{path}"); super::serve(&path).await } pub async fn css(Path(path): Path<String>) -> Response { - let path = format!("/css/{}", path); + let path = format!("/css/{path}"); super::serve(&path).await } pub async fn fonts(Path(path): Path<String>) -> Response { - let path = format!("/fonts/{}", path); + let path = format!("/fonts/{path}"); super::serve(&path).await } pub async fn image(Path(path): Path<String>) -> Response { - let path = format!("/image/{}", path); + let path = format!("/image/{path}"); super::serve(&path).await } diff --git a/src/types/extract.rs b/src/types/extract.rs index 1258ef9..8292da7 100644 --- a/src/types/extract.rs +++ b/src/types/extract.rs @@ -48,7 +48,7 @@ where }); if let Some(forwardedfor) = forwardedfor { - return Ok(RequestIp(forwardedfor)); + return Ok(Self(forwardedfor)); } let realip = headers @@ -57,7 +57,7 @@ where .and_then(|s| s.parse::<IpAddr>().ok()); if let Some(realip) = realip { - return Ok(RequestIp(realip)); + return Ok(Self(realip)); } let realip = headers @@ -66,13 +66,13 @@ where .and_then(|s| s.parse::<IpAddr>().ok()); if let Some(realip) = realip { - return Ok(RequestIp(realip)); + return Ok(Self(realip)); } let info = parts.extensions.get::<ConnectInfo<SocketAddr>>(); if let Some(info) = info { - return Ok(RequestIp(info.0.ip())); + return Ok(Self(info.0.ip())); } Err(ResponseCode::Forbidden.text("You have no ip")) |