move all direct database access to logic crate

1 files changed, 3 insertions, 4 deletions

diff --git a/server/src/ui/search.rs b/server/src/ui/search.rs
index 750c8bd..e4afdd8 100644
--- a/server/src/ui/search.rs
+++ b/server/src/ui/search.rs
@@ -8,18 +8,17 @@ use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A};
 use anyhow::anyhow;
 use jellycommon::api::ApiSearchResponse;
 use jellyimport::is_importing;
-use jellylogic::{search::search, session::Session, Database};
+use jellylogic::{search::search, session::Session};
 use jellyui::{
     render_page,
     scaffold::{RenderInfo, SessionInfo},
     search::SearchPage,
 };
-use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State};
+use rocket::{get, response::content::RawHtml, serde::json::Json, Either};
 
 #[get("/search?<query>&<page>")]
 pub async fn r_search<'a>(
     session: A<Session>,
-    db: &State<Database>,
     aj: AcceptJson,
     query: Option<&str>,
     page: Option<usize>,
@@ -28,7 +27,7 @@ pub async fn r_search<'a>(
     let AcceptLanguage(lang) = lang;
 
     let r = query
-        .map(|query| search(db, &session.0, query, page))
+        .map(|query| search(&session.0, query, page))
         .transpose()?;
 
     Ok(if *aj {