|
@@ -7,6 +7,8 @@ use crate::{
|
|
|
};
|
|
};
|
|
|
use askama::Template;
|
|
use askama::Template;
|
|
|
use hyper::{Body, Request, Response};
|
|
use hyper::{Body, Request, Response};
|
|
|
|
|
+use once_cell::sync::Lazy;
|
|
|
|
|
+use regex::Regex;
|
|
|
|
|
|
|
|
// STRUCTS
|
|
// STRUCTS
|
|
|
struct SearchParams {
|
|
struct SearchParams {
|
|
@@ -47,11 +49,15 @@ struct SearchTemplate {
|
|
|
no_posts: bool,
|
|
no_posts: bool,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+// Regex matched against search queries to determine if they are reddit urls.
|
|
|
|
|
+static REDDIT_URL_MATCH: Lazy<Regex> = Lazy::new(|| Regex::new(r"^https?://([^\./]+\.)*reddit.com/").unwrap());
|
|
|
|
|
+
|
|
|
// SERVICES
|
|
// SERVICES
|
|
|
pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
|
|
pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
|
|
|
let nsfw_results = if setting(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
|
|
let nsfw_results = if setting(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
|
|
|
let path = format!("{}.json?{}{}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default(), nsfw_results);
|
|
let path = format!("{}.json?{}{}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default(), nsfw_results);
|
|
|
- let query = param(&path, "q").unwrap_or_default();
|
|
|
|
|
|
|
+ let mut query = param(&path, "q").unwrap_or_default();
|
|
|
|
|
+ query = REDDIT_URL_MATCH.replace(&query, "").to_string();
|
|
|
|
|
|
|
|
if query.is_empty() {
|
|
if query.is_empty() {
|
|
|
return Ok(redirect("/".to_string()));
|
|
return Ok(redirect("/".to_string()));
|
gmnsii