|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
use plume_models::{notifications::*, users::User, Connection, PlumeRocket};
|
|
|
|
|
|
|
|
|
|
use crate::templates::Html;
|
|
|
|
|
use rocket::http::{Method, Status};
|
|
|
|
|
use rocket::http::{Header, Method, Status};
|
|
|
|
|
use rocket::request::Request;
|
|
|
|
|
use rocket::response::{self, content::Html as HtmlCt, Responder, Response};
|
|
|
|
|
use rocket_i18n::Catalog;
|
|
|
|
@ -52,28 +52,32 @@ impl IntoContext for PlumeRocket {
|
|
|
|
|
pub struct Ructe(pub Vec<u8>);
|
|
|
|
|
|
|
|
|
|
impl<'r> Responder<'r> for Ructe {
|
|
|
|
|
fn respond_to(self, r: &Request<'_>) -> response::Result<'r> {
|
|
|
|
|
//if method is not Get or page contain a form, no caching
|
|
|
|
|
if r.method() != Method::Get || self.0.windows(6).any(|w| w == b"<form ") {
|
|
|
|
|
return HtmlCt(self.0).respond_to(r);
|
|
|
|
|
}
|
|
|
|
|
let mut hasher = DefaultHasher::new();
|
|
|
|
|
hasher.write(&self.0);
|
|
|
|
|
let etag = format!("{:x}", hasher.finish());
|
|
|
|
|
if r.headers()
|
|
|
|
|
.get("If-None-Match")
|
|
|
|
|
.any(|s| s[1..s.len() - 1] == etag)
|
|
|
|
|
{
|
|
|
|
|
Response::build()
|
|
|
|
|
.status(Status::NotModified)
|
|
|
|
|
.header("ETag", etag)
|
|
|
|
|
.ok()
|
|
|
|
|
} else {
|
|
|
|
|
Response::build()
|
|
|
|
|
.merge(HtmlCt(self.0).respond_to(r)?)
|
|
|
|
|
.header("ETag", etag)
|
|
|
|
|
.ok()
|
|
|
|
|
}
|
|
|
|
|
fn respond_to(self, r: &'r Request) -> response::ResultFuture<'r> {
|
|
|
|
|
Box::pin(async move {
|
|
|
|
|
//if method is not Get or page contain a form, no caching
|
|
|
|
|
if r.method() != Method::Get || self.0.windows(6).any(|w| w == b"<form ") {
|
|
|
|
|
return HtmlCt(self.0).respond_to(r).await;
|
|
|
|
|
}
|
|
|
|
|
let mut hasher = DefaultHasher::new();
|
|
|
|
|
hasher.write(&self.0);
|
|
|
|
|
let etag = format!("{:x}", hasher.finish());
|
|
|
|
|
if r.headers()
|
|
|
|
|
.get("If-None-Match")
|
|
|
|
|
.any(|s| s[1..s.len() - 1] == etag)
|
|
|
|
|
{
|
|
|
|
|
Response::build()
|
|
|
|
|
.status(Status::NotModified)
|
|
|
|
|
.header(Header::new("ETag", etag))
|
|
|
|
|
.ok()
|
|
|
|
|
.await
|
|
|
|
|
} else {
|
|
|
|
|
Response::build()
|
|
|
|
|
.merge(HtmlCt(self.0).respond_to(r).await.ok().unwrap())
|
|
|
|
|
.header(Header::new("ETag", etag))
|
|
|
|
|
.ok()
|
|
|
|
|
.await
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|