Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / apub / src / api / resolve_object.rs

diff --git a/crates/apub/src/api/resolve_object.rs b/crates/apub/src/api/resolve_object.rs
index f0cb15e36e6929a21c7c87161e4bd8317f53733f..d86c28d60b05038c129c6d8d1f029262225791db 100644 (file)
--- a/crates/apub/src/api/resolve_object.rs
+++ b/crates/apub/src/api/resolve_object.rs
@@ -1,49 +1,40 @@
-use crate::{
-  api::PerformApub,
-  fetcher::search::{search_query_to_object_id, SearchableObjects},
-};
+use crate::fetcher::search::{search_query_to_object_id, SearchableObjects};
 use activitypub_federation::config::Data;
+use actix_web::web::{Json, Query};
 use diesel::NotFound;
 use lemmy_api_common::{
   context::LemmyContext,
   site::{ResolveObject, ResolveObjectResponse},
-  utils::{check_private_instance, get_local_user_view_from_jwt},
+  utils::{check_private_instance, local_user_view_from_jwt},
 };
 use lemmy_db_schema::{newtypes::PersonId, source::local_site::LocalSite, utils::DbPool};
 use lemmy_db_views::structs::{CommentView, PostView};
 use lemmy_db_views_actor::structs::{CommunityView, PersonView};
-use lemmy_utils::{error::LemmyError, ConnectionId};
-
-#[async_trait::async_trait]
-impl PerformApub for ResolveObject {
-  type Response = ResolveObjectResponse;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt2, LemmyErrorType};
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<ResolveObjectResponse, LemmyError> {
-    let local_user_view =
-      get_local_user_view_from_jwt(&self.auth, context.pool(), context.secret()).await?;
-    let local_site = LocalSite::read(context.pool()).await?;
-    let person_id = local_user_view.person.id;
-    check_private_instance(&Some(local_user_view), &local_site)?;
+#[tracing::instrument(skip(context))]
+pub async fn resolve_object(
+  data: Query<ResolveObject>,
+  context: Data<LemmyContext>,
+) -> Result<Json<ResolveObjectResponse>, LemmyError> {
+  let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
+  let local_site = LocalSite::read(&mut context.pool()).await?;
+  let person_id = local_user_view.person.id;
+  check_private_instance(&Some(local_user_view), &local_site)?;
 
-    let res = search_query_to_object_id(&self.q, context)
-      .await
-      .map_err(|e| e.with_message("couldnt_find_object"))?;
-    convert_response(res, person_id, context.pool())
-      .await
-      .map_err(|e| e.with_message("couldnt_find_object"))
-  }
+  let res = search_query_to_object_id(&data.q, &context)
+    .await
+    .with_lemmy_type(LemmyErrorType::CouldntFindObject)?;
+  convert_response(res, person_id, &mut context.pool())
+    .await
+    .with_lemmy_type(LemmyErrorType::CouldntFindObject)
 }
 
 async fn convert_response(
   object: SearchableObjects,
   user_id: PersonId,
-  pool: &DbPool,
-) -> Result<ResolveObjectResponse, LemmyError> {
+  pool: &mut DbPool<'_>,
+) -> Result<Json<ResolveObjectResponse>, LemmyError> {
   use SearchableObjects::*;
   let removed_or_deleted;
   let mut res = ResolveObjectResponse::default();
@@ -69,5 +60,5 @@ async fn convert_response(
   if removed_or_deleted {
     return Err(NotFound {}.into());
   }
-  Ok(res)
+  Ok(Json(res))
 }