aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extend 404 handler to handle all the requests our custom_ routes dont

Browse Source
This commit is contained in:
Igor Galić 2019-05-28 23:02:13 +02:00 committed by Igor Galić
parent 6253adf768
commit 92fbd174eb
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/routes/errors.rs
View File

@ -1,6 +1,6 @@
use plume_models::{Error, PlumeRocket}; use plume_models::{instance::Instance, Error, PlumeRocket};
use rocket::{ use rocket::{
response::{self, Responder}, response::{self, Redirect, Responder},
Request, Request,
}; };
use template_utils::{IntoContext, Ructe}; use template_utils::{IntoContext, Ructe};
@ -29,9 +29,26 @@ impl<'r> Responder<'r> for ErrorPage {
} }
#[catch(404)] #[catch(404)]
pub fn not_found(req: &Request) -> Ructe { pub fn not_found(req: &Request) -> Result<Ructe, Redirect> {
let rockets = req.guard::<PlumeRocket>().unwrap(); let rockets = req.guard::<PlumeRocket>().unwrap();
render!(errors::not_found(&rockets.to_context())) if req
.uri()
.segments()
.next()
.map(|path| path == "custom_domains")
.unwrap_or(false)
{
let path = req
.uri()
.segments()
.skip(2)
.collect::<Vec<&str>>()
.join("/");
let public_domain = Instance::get_local().unwrap().public_domain;
Err(Redirect::to(format!("https://{}/{}", public_domain, path)))
} else {
Ok(render!(errors::not_found(&rockets.to_context())))
}
} }
#[catch(422)] #[catch(422)]