Moving settings to Database. (#2492)

[lemmy.git] / crates / api / src / site / search.rs

diff --git a/crates/api/src/site/search.rs b/crates/api/src/site/search.rs
index 4c27ef8930d63df78756d9d01449c2d00c593b11..6c02f9ac9e689a5898226a58c5a5208da56dd5ae 100644 (file)
--- a/crates/api/src/site/search.rs
+++ b/crates/api/src/site/search.rs
@@ -6,7 +6,7 @@ use lemmy_api_common::{
 };
 use lemmy_apub::{fetcher::resolve_actor_identifier, objects::community::ApubCommunity};
 use lemmy_db_schema::{
-  source::community::Community,
+  source::{community::Community, local_site::LocalSite},
   traits::DeleteableOrRemoveable,
   utils::post_to_comment_sort_type,
   SearchType,
@@ -31,7 +31,9 @@ impl Perform for Search {
     let local_user_view =
       get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
         .await?;
-    check_private_instance(&local_user_view, context.pool()).await?;
+    let local_site = blocking(context.pool(), LocalSite::read).await??;
+
+    check_private_instance(&local_user_view, &local_site)?;
 
     let person_id = local_user_view.as_ref().map(|u| u.person.id);
     let local_user = local_user_view.map(|l| l.local_user);
@@ -51,7 +53,7 @@ impl Perform for Search {
     let search_type = data.type_.unwrap_or(SearchType::All);
     let community_id = data.community_id;
     let community_actor_id = if let Some(name) = &data.community_name {
-      resolve_actor_identifier::<ApubCommunity, Community>(name, context)
+      resolve_actor_identifier::<ApubCommunity, Community>(name, context, false)
         .await
         .ok()
         .map(|c| c.actor_id)