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

Fix subreddits and filters that were at the end and beginning of the cookies getting merged

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

3
src/subreddit.rs
View file

@ -336,7 +336,6 @@ 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
let mut subscriptions_number = 1;
@ -350,7 +349,7 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
}
} else {
let mut subscriptions_number = 1;
for list in join_until_size_limit(&sub_list) {
response.insert_cookie(
Cookie::build((format!("subscriptions{}", subscriptions_number), list))

14
src/utils.rs
View file

@ -809,8 +809,15 @@ pub fn setting(req: &Request<Body>, name: &str) -> String {
// While whatever subscriptionsNUMBER cookie we're looking at has a value
while req.cookie(&format!("subscriptions{}", subscriptions_number)).is_some() {
/* If we're pushing something other than the first subscription cookie add a + between them
to make sure we don't merge the last item of the last list and the first item of the next list */
if subscriptions_number != 1 {
subscriptions.push('+');
}
// Push whatever subscriptionsNUMBER cookie we're looking at into the subscriptions string
subscriptions.push_str(req.cookie(&format!("subscriptions{}", subscriptions_number)).unwrap().value());
// Increment subscription cookie number
subscriptions_number += 1;
}
@ -828,8 +835,15 @@ pub fn setting(req: &Request<Body>, name: &str) -> String {
// While whatever filtersNUMBER cookie we're looking at has a value
while req.cookie(&format!("filters{}", filters_number)).is_some() {
/* If we're pushing something other than the first filters cookie add a + between them
to make sure we don't merge the last item of the last list and the first item of the next list */
if filters_number != 1 {
filters.push('+');
}
// Push whatever filtersNUMBER cookie we're looking at into the filters string
filters.push_str(req.cookie(&format!("filters{}", filters_number)).unwrap().value());
// Increment filters cookie number
filters_number += 1;
}