mirrors/redlib
1
0
Fork 0
mirror of https://github.com/redlib-org/redlib.git synced 2025-04-04 13:37:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make join_until_size_limit take the +'s into account when calculating length

Browse source
This commit is contained in:
Butter Cat 2024-10-11 22:46:20 -04:00
parent 554c9f5d56
commit ea855b70d6
No known key found for this signature in database
GPG key ID: FF37BE4FDDB74419
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/subreddit.rs
View file

@ -209,7 +209,7 @@ pub fn can_access_quarantine(req: &Request<Body>, sub: &str) -> bool {
setting(req, &format!("allow_quaran_{}", sub.to_lowercase())).parse().unwrap_or_default()
}
// Join items in chunks of 3500 bytes in length for cookies
// Join items in chunks of 4000 bytes in length for cookies
fn join_until_size_limit<T: std::fmt::Display>(vec: &[T]) -> Vec<std::string::String> {
let mut result = Vec::new();
let mut list = String::new();
@ -218,14 +218,13 @@ fn join_until_size_limit<T: std::fmt::Display>(vec: &[T]) -> Vec<std::string::St
for item in vec {
// Size in bytes
let item_size = item.to_string().len();
// Use 3500 bytes to leave us some headroom because the name and options of the cookie count towards the 4096 byte cap
if current_size + item_size > 3500 {
// Use 4000 bytes to leave us some headroom because the name and options of the cookie count towards the 4096 byte cap
if current_size + item_size > 4000 {
// Push current list to result vector
result.push(list);
// Do a reset of the variables required to continue
// Reset the list variable so we can continue with only new items
list = String::new();
current_size = 0;
}
// Add separator if not the first item
if !list.is_empty() {
@ -233,7 +232,7 @@ fn join_until_size_limit<T: std::fmt::Display>(vec: &[T]) -> Vec<std::string::St
}
// Add current item to list
list.push_str(&item.to_string());
current_size += item_size;
current_size = list.len() + item_size;
}
// Make sure to push whatever the remaining subreddits are there into the result vector
result.push(list);