Spaces:
Running
Running
ddotthomas
commited on
Commit
·
31c9c67
1
Parent(s):
ca96a76
Change get_safe_search_level logic back
Browse files- src/server/routes/search.rs +11 -8
src/server/routes/search.rs
CHANGED
@@ -68,8 +68,8 @@ pub async fn search(
|
|
68 |
)
|
69 |
});
|
70 |
|
71 |
-
get_safesearch_level(
|
72 |
-
&
|
73 |
¶ms.safesearch,
|
74 |
config.safe_search,
|
75 |
);
|
@@ -235,12 +235,15 @@ fn is_match_from_filter_list(
|
|
235 |
/// * `url_level` - Safe search level from the url.
|
236 |
/// * `safe_search` - User's cookie, or the safe search level set by the server
|
237 |
/// * `config_level` - Safe search level to fall back to
|
238 |
-
fn get_safesearch_level(
|
239 |
-
|
240 |
-
|
241 |
-
*
|
242 |
-
|
243 |
-
|
|
|
|
|
244 |
}
|
|
|
245 |
}
|
246 |
}
|
|
|
68 |
)
|
69 |
});
|
70 |
|
71 |
+
search_settings.safe_search_level = get_safesearch_level(
|
72 |
+
&Some(search_settings.safe_search_level),
|
73 |
¶ms.safesearch,
|
74 |
config.safe_search,
|
75 |
);
|
|
|
235 |
/// * `url_level` - Safe search level from the url.
|
236 |
/// * `safe_search` - User's cookie, or the safe search level set by the server
|
237 |
/// * `config_level` - Safe search level to fall back to
|
238 |
+
fn get_safesearch_level(cookie_level: &Option<u8>, url_level: &Option<u8>, config_level: u8) -> u8 {
|
239 |
+
match url_level {
|
240 |
+
Some(url_level) => {
|
241 |
+
if *url_level >= 3 {
|
242 |
+
config_level
|
243 |
+
} else {
|
244 |
+
*url_level
|
245 |
+
}
|
246 |
}
|
247 |
+
None => cookie_level.unwrap_or(config_level),
|
248 |
}
|
249 |
}
|