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

Start cookies without number to be backwards compatible

Browse source
This commit is contained in:
Butter Cat 2024-10-12 10:11:13 -04:00
parent ea855b70d6
commit d27420b62e
No known key found for this signature in database
GPG key ID: FF37BE4FDDB74419
2 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/subreddit.rs
View file

@ -335,7 +335,10 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
// Delete cookie if empty, else set
if sub_list.is_empty() {
// Start with first subscriptions cookie
// Remove subscriptions cookie
response.remove_cookie("subscriptions".to_string());
// Start with first numbered subscriptions cookie
let mut subscriptions_number = 1;
// While whatever subscriptionsNUMBER cookie we're looking at has a value
@ -347,21 +350,28 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
subscriptions_number += 1;
}
} else {
let mut subscriptions_number = 1;
// Starting at 0 so we handle the subscription cookie without a number first
for (subscriptions_number, list) in join_until_size_limit(&sub_list).into_iter().enumerate() {
let subcriptions_cookie = if subscriptions_number == 0 {
"subscriptions".to_string()
} else {
format!("subscriptions{}", subscriptions_number)
};
for list in join_until_size_limit(&sub_list) {
response.insert_cookie(
Cookie::build((format!("subscriptions{}", subscriptions_number), list))
Cookie::build((subcriptions_cookie, list))
.path("/")
.http_only(true)
.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
.into(),
);
subscriptions_number += 1;
}
}
if filters.is_empty() {
// Start with first filters cookie
// Remove filters cookie
response.remove_cookie("filters".to_string());
// Start with first numbered filters cookie
let mut filters_number = 1;
// While whatever filtersNUMBER cookie we're looking at has a value
@ -373,16 +383,20 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
filters_number += 1;
}
} else {
let mut filters_number = 1;
for list in join_until_size_limit(&filters) {
for (filters_number, list) in join_until_size_limit(&filters).into_iter().enumerate() {
let filters_cookie = if filters_number == 0 {
"filters".to_string()
} else {
format!("filters{}", filters_number)
};
response.insert_cookie(
Cookie::build((format!("filters{}", filters_number), list))
Cookie::build((filters_cookie, list))
.path("/")
.http_only(true)
.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
.into(),
);
filters_number += 1;
}
}

22
src/utils.rs
View file

@ -799,12 +799,17 @@ pub fn param(path: &str, value: &str) -> Option<String> {
pub fn setting(req: &Request<Body>, name: &str) -> String {
// Parse a cookie value from request
// If this was called with "subscriptions" and the "subscriptions1" cookie has a value
if name == "subscriptions" && req.cookie("subscriptions1").is_some() {
// If this was called with "subscriptions" and the "subscriptions" cookie has a value
if name == "subscriptions" && req.cookie("subscriptions").is_some() {
// Create subscriptions string
let mut subscriptions = String::new();
// Start with first subscription cookie
// Default subscriptions cookie
if req.cookie("subscriptions").is_some() {
subscriptions.push_str(req.cookie("subscriptions").unwrap().value());
}
// Start with first numbered subscription cookie
let mut subscriptions_number = 1;
// While whatever subscriptionsNUMBER cookie we're looking at has a value
@ -825,12 +830,17 @@ pub fn setting(req: &Request<Body>, name: &str) -> String {
// Return the subscriptions cookies as one large string
subscriptions
}
// If this was called with "filters" and the "filters1" cookie has a value
else if name == "filters" && req.cookie("filters1").is_some() {
// If this was called with "filters" and the "filters" cookie has a value
else if name == "filters" && req.cookie("filters").is_some() {
// Create filters string
let mut filters = String::new();
// Start with first filters cookie
// Default filters cookie
if req.cookie("filters").is_some() {
filters.push_str(req.cookie("filters").unwrap().value());
}
// Start with first numbered filters cookie
let mut filters_number = 1;
// While whatever filtersNUMBER cookie we're looking at has a value