AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

removing some old garbage

Browse source
This commit is contained in:
Jakub Doka 2024-10-17 16:08:29 +02:00
parent f5ef62c6bb
commit da58a5926d
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
depell/src/main.rs
View file

@ -3,7 +3,7 @@ use {
argon2::{password_hash::SaltString, PasswordVerifier}, argon2::{password_hash::SaltString, PasswordVerifier},
axum::{ axum::{
body::Bytes, body::Bytes,
extract::{OriginalUri, Path}, extract::Path,
http::{header::COOKIE, request::Parts}, http::{header::COOKIE, request::Parts},
response::{AppendHeaders, Html}, response::{AppendHeaders, Html},
}, },
@ -349,16 +349,8 @@ impl Profile {
Profile { other: Some(name) }.render(&session) Profile { other: Some(name) }.render(&session)
} }
async fn get_other_page( async fn get_other_page(session: Session, Path(name): Path<String>) -> Html<String> {
session: Session, base(|b| Profile { other: Some(name) }.render_to_buf(&session, b), Some(&session))
path: axum::extract::OriginalUri,
Path(name): Path<String>,
) -> Html<String> {
base(
|b| Profile { other: Some(name) }.render_to_buf(&session, b),
path.path(),
Some(&session),
)
} }
} }
@ -542,7 +534,7 @@ impl Signup {
} }
} }
fn base(body: impl FnOnce(&mut String), path: &str, session: Option<&Session>) -> Html<String> { fn base(body: impl FnOnce(&mut String), session: Option<&Session>) -> Html<String> {
let username = session.map(|s| &s.name); let username = session.map(|s| &s.name);
let nav_button = |f: &mut String, name: &str| { let nav_button = |f: &mut String, name: &str| {
@ -761,8 +753,8 @@ trait PublicPage: Default {
Self::default().render() Self::default().render()
} }
async fn page(uri: OriginalUri, session: Option<Session>) -> Html<String> { async fn page(session: Option<Session>) -> Html<String> {
base(|s| Self::default().render_to_buf(s), uri.path(), session.as_ref()) base(|s| Self::default().render_to_buf(s), session.as_ref())
} }
} }
@ -779,13 +771,10 @@ trait Page: Default {
Self::default().render(&session) Self::default().render(&session)
} }
async fn page( async fn page(session: Option<Session>) -> Result<Html<String>, axum::response::Redirect> {
uri: OriginalUri,
session: Option<Session>,
) -> Result<Html<String>, axum::response::Redirect> {
match session { match session {
Some(session) => { Some(session) => {
Ok(base(|f| Self::default().render_to_buf(&session, f), uri.path(), Some(&session))) Ok(base(|f| Self::default().render_to_buf(&session, f), Some(&session)))
} }
None => Err(axum::response::Redirect::permanent("/login")), None => Err(axum::response::Redirect::permanent("/login")),
} }