diff options
author | metamuffin <metamuffin@disroot.org> | 2023-08-06 12:52:42 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-08-06 12:52:42 +0200 |
commit | 8551bf2e34d9543fa41a83fae785ed81d6a6c10f (patch) | |
tree | aaa79d1572b253c35576685945280438fe68f4d4 /server/src/routes/ui/assets.rs | |
parent | cd366dfdfad18b38c4e542e6db61ced3929d42f9 (diff) | |
download | jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar.bz2 jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar.zst |
move shared server code to own crate
Diffstat (limited to 'server/src/routes/ui/assets.rs')
-rw-r--r-- | server/src/routes/ui/assets.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/src/routes/ui/assets.rs b/server/src/routes/ui/assets.rs index c00749f..8a14133 100644 --- a/server/src/routes/ui/assets.rs +++ b/server/src/routes/ui/assets.rs @@ -6,9 +6,9 @@ use crate::{ database::Database, routes::ui::{account::session::Session, error::MyError, CacheControlFile}, - CONF, }; use anyhow::anyhow; +use jellybase::CONF; use jellycommon::AssetLocation; use log::info; use rocket::{get, http::ContentType, FromFormField, State, UriDisplayQuery}; @@ -23,12 +23,13 @@ pub enum AssetRole { Backdrop, } -#[get("/n/<id>/asset?<role>")] +#[get("/n/<id>/asset?<role>&<width>")] pub async fn r_item_assets( _sess: Session, + db: &State<Database>, id: String, role: AssetRole, - db: &State<Database>, + width: Option<u32>, ) -> Result<(ContentType, CacheControlFile), MyError> { let node = db.node.get(&id)?.ok_or(anyhow!("node does not exist"))?; let mut asset = match role { |