X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fapi%2Flist_posts.rs;h=c43e1381e7fb5d54d2d5e40fb288b18dda7a9949;hb=c8063f3267cf2b3622f1fdc69128c6b55feefbbc;hp=7a1f815c78f48fba77de0c1cb50409f240c9de2d;hpb=f02892b23b865e4e29b04c441754f87b4522077d;p=lemmy.git

diff --git a/crates/apub/src/api/list_posts.rs b/crates/apub/src/api/list_posts.rs
index 7a1f815c..c43e1381 100644
--- a/crates/apub/src/api/list_posts.rs
+++ b/crates/apub/src/api/list_posts.rs
@@ -1,93 +1,71 @@
 use crate::{
-  api::PerformApub,
+  api::listing_type_with_default,
   fetcher::resolve_actor_identifier,
   objects::community::ApubCommunity,
 };
-use actix_web::web::Data;
+use activitypub_federation::config::Data;
+use actix_web::web::{Json, Query};
 use lemmy_api_common::{
   context::LemmyContext,
   post::{GetPosts, GetPostsResponse},
-  utils::{
-    check_private_instance,
-    get_local_user_view_from_jwt_opt,
-    listing_type_with_site_default,
-  },
-};
-use lemmy_db_schema::{
-  source::{community::Community, local_site::LocalSite},
-  traits::DeleteableOrRemoveable,
+  utils::{check_private_instance, local_user_view_from_jwt_opt},
 };
+use lemmy_db_schema::source::{community::Community, local_site::LocalSite};
 use lemmy_db_views::post_view::PostQuery;
-use lemmy_utils::{error::LemmyError, ConnectionId};
-
-#[async_trait::async_trait(?Send)]
-impl PerformApub for GetPosts {
-  type Response = GetPostsResponse;
-
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<GetPostsResponse, LemmyError> {
-    let data: &GetPosts = self;
-    let local_user_view =
-      get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
-        .await?;
-    let local_site = LocalSite::read(context.pool()).await?;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
-    check_private_instance(&local_user_view, &local_site)?;
+#[tracing::instrument(skip(context))]
+pub async fn list_posts(
+  data: Query<GetPosts>,
+  context: Data<LemmyContext>,
+) -> Result<Json<GetPostsResponse>, LemmyError> {
+  let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), &context).await;
+  let local_site = LocalSite::read(&mut context.pool()).await?;
 
-    let is_logged_in = local_user_view.is_some();
+  check_private_instance(&local_user_view, &local_site)?;
 
-    let sort = data.sort;
-    let listing_type = listing_type_with_site_default(data.type_, &local_site)?;
+  let sort = data.sort;
 
-    let page = data.page;
-    let limit = data.limit;
-    let community_id = data.community_id;
-    let community_actor_id = if let Some(name) = &data.community_name {
-      resolve_actor_identifier::<ApubCommunity, Community>(name, context, true)
-        .await
-        .ok()
-        .map(|c| c.actor_id)
-    } else {
-      None
-    };
-    let saved_only = data.saved_only;
+  let page = data.page;
+  let limit = data.limit;
+  let community_id = if let Some(name) = &data.community_name {
+    Some(resolve_actor_identifier::<ApubCommunity, Community>(name, &context, &None, true).await?)
+      .map(|c| c.id)
+  } else {
+    data.community_id
+  };
+  let saved_only = data.saved_only.unwrap_or_default();
 
-    let mut posts = PostQuery::builder()
-      .pool(context.pool())
-      .local_user(local_user_view.map(|l| l.local_user).as_ref())
-      .listing_type(Some(listing_type))
-      .sort(sort)
-      .community_id(community_id)
-      .community_actor_id(community_actor_id)
-      .saved_only(saved_only)
-      .page(page)
-      .limit(limit)
-      .build()
-      .list()
-      .await
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_get_posts"))?;
+  let liked_only = data.liked_only.unwrap_or_default();
+  let disliked_only = data.disliked_only.unwrap_or_default();
+  if liked_only && disliked_only {
+    return Err(LemmyError::from(LemmyErrorType::ContradictingFilters));
+  }
 
-    // Blank out deleted or removed info for non-logged in users
-    if !is_logged_in {
-      for pv in posts
-        .iter_mut()
-        .filter(|p| p.post.deleted || p.post.removed)
-      {
-        pv.post = pv.clone().post.blank_out_deleted_or_removed_info();
-      }
+  let moderator_view = data.moderator_view.unwrap_or_default();
 
-      for pv in posts
-        .iter_mut()
-        .filter(|p| p.community.deleted || p.community.removed)
-      {
-        pv.community = pv.clone().community.blank_out_deleted_or_removed_info();
-      }
-    }
+  let listing_type = Some(listing_type_with_default(
+    data.type_,
+    &local_site,
+    community_id,
+  )?);
 
-    Ok(GetPostsResponse { posts })
+  let posts = PostQuery {
+    local_user: local_user_view.as_ref(),
+    listing_type,
+    sort,
+    community_id,
+    saved_only,
+    liked_only,
+    disliked_only,
+    moderator_view,
+    page,
+    limit,
+    ..Default::default()
   }
+  .list(&mut context.pool())
+  .await
+  .with_lemmy_type(LemmyErrorType::CouldntGetPosts)?;
+
+  Ok(Json(GetPostsResponse { posts }))
 }