return the next largest image for size query param

fixes #18

Author: hannes-dev

README.md

@@ -24,8 +24,8 @@ You can give any optional query parameters to change what reply you receive:
 | placeholder | `true` / `false`             | return a placeholder when user has no image | `false` |
 | size        | `64` / `128` / `256` / `512` | square resolution of the image              | `256`   |
 
-> [!WARNING]
-> The placeholder will always be returned as a 500x500 sized image
+> [!INFO]
+> `size` will return the next largest image if requested value is not available
 
 # config
 

src/image.rs

@@ -11,16 +11,16 @@ use axum::{
     response::{IntoResponse, Response},
 };
 
-use rand::{Rng, SeedableRng, rngs::SmallRng, seq::IndexedRandom};
+use rand::{SeedableRng, rngs::SmallRng, seq::IndexedRandom};
 use reqwest::header::CONTENT_TYPE;
 use svg::{
     Document,
-    node::element::{Definitions, Group, Mask, Polygon, Polyline, Rectangle, Use, tag::Rectangle},
+    node::element::{Definitions, Group, Mask, Polygon, Polyline, Rectangle, Use},
 };
 use tokio::{fs::File, process::Command, task::JoinSet};
 use tokio_util::io::ReaderStream;
 
-use crate::{PLACEHOLDER, error::AppError, format::SupportedFormat};
+use crate::{error::AppError, format::SupportedFormat};
 
 static IMAGE_PATH: LazyLock<String> =
     LazyLock::new(|| env::var("IMAGE_PATH").expect("IMAGE_PATH not present"));

src/main.rs

@@ -32,8 +32,6 @@ mod pages;
 static LOG_LEVEL: LazyLock<String> =
     LazyLock::new(|| env::var("LOG_LEVEL").unwrap_or("INFO".into()));
 
-static PLACEHOLDER: &[u8] = include_bytes!("../templates/placeholder.jpg");
-
 static SIZES: &[u32] = &[64, 128, 256, 512];
 
 #[tokio::main]
@@ -102,18 +100,25 @@ pub async fn post_image(session: Session, mut multipart: Multipart) -> Result<Re
 }
 
 #[derive(Deserialize)]
-pub struct PlaceholderQuery {
+pub struct GetImageQuery {
     placeholder: Option<bool>,
     size: Option<u32>,
 }
 
 pub async fn get_image(
-    Query(params): Query<PlaceholderQuery>,
+    Query(params): Query<GetImageQuery>,
     Path(user_id): Path<u32>,
     if_none_match: Option<TypedHeader<IfNoneMatch>>,
 ) -> Result<Response, AppError> {
     // default size
-    let size = params.size.unwrap_or(256);
+    let requested_size = params.size.unwrap_or(256);
+    // get closest size that is bigger, or largest
+    let size = *SIZES
+        .iter()
+        .filter(|x| **x > requested_size)
+        .min()
+        .unwrap_or(SIZES.iter().max().unwrap());
+    dbg!(size);
     let profile = ProfileImage::new(user_id);
     let etag_opt = file_modified_etag(&profile.path(size)).await?;