From 8fd7bb145feee65a281d391a6fdda80dae8f1ce3 Mon Sep 17 00:00:00 2001 From: Lin Yihai Date: Fri, 1 Dec 2023 23:44:52 +0800 Subject: [PATCH] chore: inline the function `retrive_sort_from_paginate` --- src/web/releases.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/web/releases.rs b/src/web/releases.rs index 6c2e855d5..82968436e 100644 --- a/src/web/releases.rs +++ b/src/web/releases.rs @@ -499,13 +499,6 @@ impl_axum_webpage! { status = |search| search.status, } -fn retrive_sort_from_paginate(query: &str) -> String { - static RE: Lazy = Lazy::new(|| Regex::new(r"[?&]sort=([^&]+)").unwrap()); - let cap = RE.captures(query).unwrap(); - cap.get(1) - .map_or("relevance".to_string(), |v| v.as_str().to_string()) -} - pub(crate) async fn search_handler( mut conn: DbConnection, Extension(pool): Extension, @@ -586,7 +579,13 @@ pub(crate) async fn search_handler( ); return Err(AxumNope::NoResults); } - sort_by = retrive_sort_from_paginate(&query_params); + + static RE: Lazy = Lazy::new(|| Regex::new(r"[?&]sort=([^&]+)").unwrap()); + let cap = RE.captures(&query_params).unwrap(); + sort_by = cap + .get(1) + .map_or("relevance".to_string(), |v| v.as_str().to_string()); + get_search_results(&mut conn, &config, &query_params).await? } else if !query.is_empty() { let query_params: String = form_urlencoded::Serializer::new(String::new())