|
3 | 3 | use crate::{config, utils}; |
4 | 4 | // CRATES |
5 | 5 | use crate::utils::{ |
6 | | - catch_random, error, filter_posts, format_num, format_url, info, nsfw_landing, param, redirect, rewrite_urls, setting, template, val, Post, Preferences, Subreddit, |
| 6 | + catch_random, error, filter_posts, format_num, format_url, info, nsfw_landing, param, redirect, rewrite_urls, setting, setting_or_default, template, val, Post, Preferences, Subreddit, |
7 | 7 | }; |
8 | 8 | use crate::{client::json, server::RequestExt, server::ResponseExt}; |
9 | 9 | use askama::Template; |
@@ -68,7 +68,7 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> { |
68 | 68 | let subscribed = setting(&req, "subscriptions"); |
69 | 69 | let front_page = setting(&req, "front_page"); |
70 | 70 | let remove_default_feeds = setting(&req, "remove_default_feeds") == "on"; |
71 | | - let post_sort = req.cookie("post_sort").map_or_else(|| "hot".to_string(), |c| c.value().to_string()); |
| 71 | + let post_sort = setting_or_default(&req, "post_sort", "hot".to_string()); |
72 | 72 | let sort = req.param("sort").unwrap_or_else(|| req.param("id").unwrap_or(post_sort)); |
73 | 73 |
|
74 | 74 | let sub_name = req.param("sub").unwrap_or(if front_page == "default" || front_page.is_empty() { |
@@ -600,7 +600,7 @@ pub async fn rss(req: Request<Body>) -> Result<Response<Body>, String> { |
600 | 600 |
|
601 | 601 | // Get subreddit |
602 | 602 | let sub = req.param("sub").unwrap_or_default(); |
603 | | - let post_sort = req.cookie("post_sort").map_or_else(|| "hot".to_string(), |c| c.value().to_string()); |
| 603 | + let post_sort = setting_or_default(&req, "post_sort", "hot".to_string()); |
604 | 604 | let sort = req.param("sort").unwrap_or_else(|| req.param("id").unwrap_or(post_sort)); |
605 | 605 |
|
606 | 606 | // Get path |
|
0 commit comments