fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-08 09:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy

Browse source
This commit is contained in:
Felix Ableitner 2023-12-01 11:24:31 +01:00
parent a339d9a6d6
commit 51505b86db
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/lint.sh
View file

@ -5,7 +5,7 @@ CWD="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
cd $CWD/../ cd $CWD/../
cargo clippy --workspace --fix --allow-staged --allow-dirty --tests --all-targets --all-features -- -D warnings cargo clippy --workspace --fix --allow-staged --allow-dirty --tests --all-targets -- -D warnings
# Format rust files # Format rust files
cargo +nightly fmt cargo +nightly fmt

7
src/session_middleware.rs
View file

@ -76,7 +76,7 @@ where
if let Err(e) = &local_user_view { if let Err(e) = &local_user_view {
warn!("Failed to handle user login: {e}"); warn!("Failed to handle user login: {e}");
} }
if let Some(local_user_view) = local_user_view.ok() { if let Ok(local_user_view) = local_user_view {
req.extensions_mut().insert(local_user_view); req.extensions_mut().insert(local_user_view);
} }
} }
@ -86,9 +86,8 @@ where
// Add cache-control header. If user is authenticated, mark as private. Otherwise cache // Add cache-control header. If user is authenticated, mark as private. Otherwise cache
// up to one minute. // up to one minute.
let cache_value = if jwt.is_some() { let disable_cache = context.settings().disable_cache_control.unwrap_or(false);
"private" let cache_value = if jwt.is_some() || disable_cache {
} else if context.settings().disable_cache_control.unwrap_or(false) {
"private" "private"
} else { } else {
"public, max-age=60" "public, max-age=60"