bad pagination

5 files changed, 10 insertions, 33 deletions

diff --git a/server/src/request_info.rs b/server/src/request_info.rs
index 0adfe96..55dde0d 100644
--- a/server/src/request_info.rs
+++ b/server/src/request_info.rs
@@ -26,6 +26,7 @@ pub struct RequestInfo<'a> {
     pub debug: &'a str,
     pub user: Option<Box<User>>,
     pub state: Arc<State>,
+    pub no_scaffold: bool,
     pub flash: Option<FlashMessage<'a>>,
 }
 
@@ -48,6 +49,7 @@ impl<'a> RequestInfo<'a> {
             accept: Accept::from_request_ut(request),
             user: user_from_request(state, request)?,
             state: state.clone(),
+            no_scaffold: request.query_value::<bool>("no_scaff").is_some(),
             debug: request
                 .query_value::<&str>("debug")
                 .transpose()
@@ -78,7 +80,11 @@ impl<'a> RequestInfo<'a> {
         }
     }
     pub fn respond_ui(&self, page: &dyn Page) -> RawHtml<String> {
-        RawHtml(Scaffold { page }.to_string())
+        if self.no_scaffold {
+            RawHtml(page.render().to_string())
+        } else {
+            RawHtml(Scaffold { page }.to_string())
+        }
     }
 }
 
diff --git a/server/src/responders/cache.rs b/server/src/responders/cache.rs
index a943de8..078de20 100644
--- a/server/src/responders/cache.rs
+++ b/server/src/responders/cache.rs
@@ -6,9 +6,9 @@
 
 use log::debug;
 use rocket::{
+    Request, Response,
     http::{Header, Status},
     response::{self, Responder},
-    Request, Response,
 };
 use std::{
     hash::{DefaultHasher, Hash, Hasher},
diff --git a/server/src/responders/cors.rs b/server/src/responders/cors.rs
index 875b1e5..46a5987 100644
--- a/server/src/responders/cors.rs
+++ b/server/src/responders/cors.rs
@@ -5,9 +5,9 @@
 */
 
 use rocket::{
+    Request,
     http::Header,
     response::{self, Responder},
-    Request,
 };
 
 pub struct Cors<T>(pub T);
diff --git a/server/src/ui/assets.rs b/server/src/ui/assets.rs
index 5903b83..089f293 100644
--- a/server/src/ui/assets.rs
+++ b/server/src/ui/assets.rs
@@ -51,32 +51,3 @@ pub async fn r_image_fallback_person(
         })?;
     Ok(Redirect::found(u_image(&path, size.unwrap_or(2048))))
 }
-
-// #[get("/n/<id>/image/<slot>?<size>")]
-// pub async fn r_item_poster(
-//     session: A<Session>,
-//     id: A<NodeID>,
-//     slot: &str,
-//     size: Option<usize>,
-// ) -> MyResult<Redirect> {
-//     let slot = PictureSlot::from_str(slot).map_err(|_| anyhow!("slot invalid"))?;
-//     let node = get_node(&session.0, id.0, false, false, NodeFilterSort::default())?;
-//     let picture = node
-//         .node
-//         .pictures
-//         .get(&slot)
-//         .cloned()
-//         .ok_or(anyhow!("no pic todo"))?;
-//     Ok(Redirect::permanent(rocket::uri!(r_image(picture, size))))
-// }
-
-// #[get("/n/<id>/thumbnail?<t>&<size>")]
-// pub async fn r_node_thumbnail(
-//     session: A<Session>,
-//     id: A<NodeID>,
-//     t: f64,
-//     size: Option<usize>,
-// ) -> MyResult<Redirect> {
-//     let picture = get_node_thumbnail(&session.0, id.0, t).await?;
-//     Ok(Redirect::permanent(rocket::uri!(r_image(picture, size))))
-// }
diff --git a/server/src/ui/mod.rs b/server/src/ui/mod.rs
index 6cb3cd2..2dab076 100644
--- a/server/src/ui/mod.rs
+++ b/server/src/ui/mod.rs
@@ -15,10 +15,10 @@ pub mod admin;
 pub mod assets;
 pub mod error;
 pub mod home;
+pub mod items;
 pub mod node;
 pub mod player;
 pub mod style;
-pub mod items;
 
 #[get("/")]
 pub async fn r_index(ri: RequestInfo<'_>) -> MyResult<Redirect> {