diff --git a/public/templates/user_interface_tab.html b/public/templates/user_interface_tab.html
index 51b3237..7de0f06 100644
--- a/public/templates/user_interface_tab.html
+++ b/public/templates/user_interface_tab.html
@@ -1,4 +1,5 @@
+
User Interface
select theme
Select the theme from the available themes to be used in user interface
diff --git a/src/models/aggregation_models.rs b/src/models/aggregation_models.rs
index 656297f..bab7e62 100644
--- a/src/models/aggregation_models.rs
+++ b/src/models/aggregation_models.rs
@@ -122,6 +122,8 @@ pub struct SearchResults {
/// search query was filtered when the safe search level set to 3 and it
/// was present in the `Blocklist` file.
pub filtered: bool,
+ /// Stores the safe search level `safesearch` provided in the search url.
+ pub safe_search_level: u8,
}
impl SearchResults {
@@ -147,6 +149,7 @@ impl SearchResults {
engine_errors_info: engine_errors_info.to_owned(),
disallowed: Default::default(),
filtered: Default::default(),
+ safe_search_level: Default::default(),
}
}
@@ -178,4 +181,9 @@ impl SearchResults {
pub fn results(&mut self) -> Vec {
self.results.clone()
}
+
+ /// A setter function to set the current page safe search level.
+ pub fn set_safe_search_level(&mut self, safe_search_level: u8) {
+ self.safe_search_level = safe_search_level;
+ }
}
diff --git a/src/models/server_models.rs b/src/models/server_models.rs
index c9ed350..4772b98 100644
--- a/src/models/server_models.rs
+++ b/src/models/server_models.rs
@@ -26,4 +26,6 @@ pub struct Cookie<'a> {
pub colorscheme: &'a str,
/// It stores the user selected upstream search engines selected from the UI.
pub engines: Vec<&'a str>,
+ /// It stores the user selected safe search level from the UI.
+ pub safe_search_level: u8,
}
diff --git a/src/server/routes/search.rs b/src/server/routes/search.rs
index dc327d6..9abbb56 100644
--- a/src/server/routes/search.rs
+++ b/src/server/routes/search.rs
@@ -67,61 +67,48 @@ pub async fn search(
None => 1,
};
- let safe_search: u8 = match config.safe_search {
- 3..=4 => config.safe_search,
- _ => match ¶ms.safesearch {
- Some(safesearch) => match safesearch {
- 0..=2 => *safesearch,
- _ => 1,
- },
- None => config.safe_search,
- },
- };
-
let (_, results, _) = join!(
results(
format!(
- "http://{}:{}/search?q={}&page={}&safesearch={}",
+ "http://{}:{}/search?q={}&page={}&safesearch=",
config.binding_ip,
config.port,
query,
page - 1,
- safe_search
),
&config,
&cache,
query,
page - 1,
req.clone(),
- safe_search
+ ¶ms.safesearch
),
results(
format!(
- "http://{}:{}/search?q={}&page={}&safesearch={}",
- config.binding_ip, config.port, query, page, safe_search
+ "http://{}:{}/search?q={}&page={}&safesearch=",
+ config.binding_ip, config.port, query, page
),
&config,
&cache,
query,
page,
req.clone(),
- safe_search
+ ¶ms.safesearch
),
results(
format!(
- "http://{}:{}/search?q={}&page={}&safesearch={}",
+ "http://{}:{}/search?q={}&page={}&safesearch=",
config.binding_ip,
config.port,
query,
page + 1,
- safe_search
),
&config,
&cache,
query,
page + 1,
req.clone(),
- safe_search
+ ¶ms.safesearch
)
);
@@ -156,7 +143,7 @@ async fn results(
query: &str,
page: u32,
req: HttpRequest,
- safe_search: u8,
+ safe_search: &Option,
) -> Result> {
// fetch the cached results json.
let cached_results = cache.cached_json(&url).await;
@@ -165,7 +152,18 @@ async fn results(
match cached_results {
Ok(results) => Ok(results),
Err(_) => {
- if safe_search == 4 {
+ let mut safe_search_level: u8 = match config.safe_search {
+ 3..=4 => config.safe_search,
+ _ => match safe_search {
+ Some(safesearch) => match safesearch {
+ 0..=2 => *safesearch,
+ _ => config.safe_search,
+ },
+ None => config.safe_search,
+ },
+ };
+
+ if safe_search_level == 4 {
let mut results: SearchResults = SearchResults::default();
let mut _flag: bool =
is_match_from_filter_list(file_path(FileType::BlockList)?, query)?;
@@ -176,6 +174,7 @@ async fn results(
results.add_style(&config.style);
results.set_page_query(query);
cache.cache_results(&results, &url).await?;
+ results.set_safe_search_level(safe_search_level);
return Ok(results);
}
}
@@ -195,6 +194,17 @@ async fn results(
.filter_map(|name| EngineHandler::new(name))
.collect();
+ safe_search_level = match config.safe_search {
+ 3..=4 => config.safe_search,
+ _ => match safe_search {
+ Some(safesearch) => match safesearch {
+ 0..=2 => *safesearch,
+ _ => config.safe_search,
+ },
+ None => cookie_value.safe_search_level,
+ },
+ };
+
aggregate(
query,
page,
@@ -202,7 +212,7 @@ async fn results(
config.debug,
&engines,
config.request_timeout,
- safe_search,
+ safe_search_level,
)
.await?
}
@@ -214,7 +224,7 @@ async fn results(
config.debug,
&config.upstream_search_engines,
config.request_timeout,
- safe_search,
+ safe_search_level,
)
.await?
}
@@ -223,7 +233,10 @@ async fn results(
results.set_filtered();
}
results.add_style(&config.style);
- cache.cache_results(&results, &url).await?;
+ cache
+ .cache_results(&results, &(format!("{url}{safe_search_level}")))
+ .await?;
+ results.set_safe_search_level(safe_search_level);
Ok(results)
}
}