Merge pull request #222 from LemmyNet/main

[pull] master from LemmyNet:main

crates/api/src/comment/save.rs

@@ -16,10 +16,7 @@ pub async fn save_comment(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommentResponse>> {
-  let comment_saved_form = CommentSavedForm {
-    comment_id: data.comment_id,
-    person_id: local_user_view.person.id,
-  };
+  let comment_saved_form = CommentSavedForm::new(data.comment_id, local_user_view.person.id);
 
   if data.save {
     CommentSaved::save(&mut context.pool(), &comment_saved_form)

crates/api/src/local_user/list_saved.rs

@@ -0,0 +1,42 @@
+use activitypub_federation::config::Data;
+use actix_web::web::{Json, Query};
+use lemmy_api_common::{
+  context::LemmyContext,
+  person::{ListPersonSaved, ListPersonSavedResponse},
+  utils::check_private_instance,
+};
+use lemmy_db_views::{
+  person_saved_combined_view::PersonSavedCombinedQuery,
+  structs::{LocalUserView, SiteView},
+};
+use lemmy_utils::error::LemmyResult;
+
+#[tracing::instrument(skip(context))]
+pub async fn list_person_saved(
+  data: Query<ListPersonSaved>,
+  context: Data<LemmyContext>,
+  local_user_view: LocalUserView,
+) -> LemmyResult<Json<ListPersonSavedResponse>> {
+  let local_site = SiteView::read_local(&mut context.pool()).await?;
+
+  check_private_instance(&Some(local_user_view.clone()), &local_site.local_site)?;
+
+  // parse pagination token
+  let page_after = if let Some(pa) = &data.page_cursor {
+    Some(pa.read(&mut context.pool()).await?)
+  } else {
+    None
+  };
+  let page_back = data.page_back;
+  let type_ = data.type_;
+
+  let saved = PersonSavedCombinedQuery {
+    type_,
+    page_after,
+    page_back,
+  }
+  .list(&mut context.pool(), &local_user_view)
+  .await?;
+
+  Ok(Json(ListPersonSavedResponse { saved }))
+}

crates/api/src/local_user/mod.rs

@@ -8,6 +8,7 @@ pub mod get_captcha;
 pub mod list_banned;
 pub mod list_logins;
 pub mod list_media;
+pub mod list_saved;
 pub mod login;
 pub mod logout;
 pub mod notifications;

crates/api_common/src/comment.rs

@@ -131,8 +131,6 @@ pub struct GetComments {
   #[cfg_attr(feature = "full", ts(optional))]
   pub parent_id: Option<CommentId>,
   #[cfg_attr(feature = "full", ts(optional))]
-  pub saved_only: Option<bool>,
-  #[cfg_attr(feature = "full", ts(optional))]
   pub liked_only: Option<bool>,
   #[cfg_attr(feature = "full", ts(optional))]
   pub disliked_only: Option<bool>,

crates/api_common/src/person.rs

@@ -4,10 +4,16 @@ use lemmy_db_schema::{
   source::{login_token::LoginToken, site::Site},
   CommentSortType,
   ListingType,
+  PersonContentType,
   PostListingMode,
   PostSortType,
 };
-use lemmy_db_views::structs::{CommentView, LocalImageView, PostView};
+use lemmy_db_views::structs::{
+  LocalImageView,
+  PersonContentCombinedPaginationCursor,
+  PersonContentCombinedView,
+  PersonSavedCombinedPaginationCursor,
+};
 use lemmy_db_views_actor::structs::{
   CommentReplyView,
   CommunityModeratorView,
@@ -222,16 +228,6 @@ pub struct GetPersonDetails {
   /// Example: dessalines , or [email protected]
   #[cfg_attr(feature = "full", ts(optional))]
   pub username: Option<String>,
-  #[cfg_attr(feature = "full", ts(optional))]
-  pub sort: Option<PostSortType>,
-  #[cfg_attr(feature = "full", ts(optional))]
-  pub page: Option<i64>,
-  #[cfg_attr(feature = "full", ts(optional))]
-  pub limit: Option<i64>,
-  #[cfg_attr(feature = "full", ts(optional))]
-  pub community_id: Option<CommunityId>,
-  #[cfg_attr(feature = "full", ts(optional))]
-  pub saved_only: Option<bool>,
 }
 
 #[skip_serializing_none]
@@ -243,11 +239,62 @@ pub struct GetPersonDetailsResponse {
   pub person_view: PersonView,
   #[cfg_attr(feature = "full", ts(optional))]
   pub site: Option<Site>,
-  pub comments: Vec<CommentView>,
-  pub posts: Vec<PostView>,
   pub moderates: Vec<CommunityModeratorView>,
 }
 
+#[skip_serializing_none]
+#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// Gets a person's content (posts and comments)
+///
+/// Either person_id, or username are required.
+pub struct ListPersonContent {
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub type_: Option<PersonContentType>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub person_id: Option<PersonId>,
+  /// Example: dessalines , or [email protected]
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub username: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub page_cursor: Option<PersonContentCombinedPaginationCursor>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub page_back: Option<bool>,
+}
+
+#[skip_serializing_none]
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// A person's content response.
+pub struct ListPersonContentResponse {
+  pub content: Vec<PersonContentCombinedView>,
+}
+
+#[skip_serializing_none]
+#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// Gets your saved posts and comments
+pub struct ListPersonSaved {
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub type_: Option<PersonContentType>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub page_cursor: Option<PersonSavedCombinedPaginationCursor>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub page_back: Option<bool>,
+}
+
+#[skip_serializing_none]
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// A person's saved content response.
+pub struct ListPersonSavedResponse {
+  pub saved: Vec<PersonContentCombinedView>,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, Default, PartialEq, Eq)]
 #[cfg_attr(feature = "full", derive(TS))]
 #[cfg_attr(feature = "full", ts(export))]

crates/api_common/src/site.rs

@@ -94,8 +94,6 @@ pub struct Search {
   #[cfg_attr(feature = "full", ts(optional))]
   pub post_url_only: Option<bool>,
   #[cfg_attr(feature = "full", ts(optional))]
-  pub saved_only: Option<bool>,
-  #[cfg_attr(feature = "full", ts(optional))]
   pub liked_only: Option<bool>,
   #[cfg_attr(feature = "full", ts(optional))]
   pub disliked_only: Option<bool>,

crates/apub/src/api/list_comments.rs

@@ -46,7 +46,6 @@ pub async fn list_comments(
     &site_view.local_site,
   ));
   let max_depth = data.max_depth;
-  let saved_only = data.saved_only;
 
   let liked_only = data.liked_only;
   let disliked_only = data.disliked_only;
@@ -78,7 +77,6 @@ pub async fn list_comments(
     listing_type,
     sort,
     max_depth,
-    saved_only,
     liked_only,
     disliked_only,
     community_id,

crates/apub/src/api/list_person_content.rs

@@ -0,0 +1,52 @@
+use super::resolve_person_id_from_id_or_username;
+use activitypub_federation::config::Data;
+use actix_web::web::{Json, Query};
+use lemmy_api_common::{
+  context::LemmyContext,
+  person::{ListPersonContent, ListPersonContentResponse},
+  utils::check_private_instance,
+};
+use lemmy_db_views::{
+  person_content_combined_view::PersonContentCombinedQuery,
+  structs::{LocalUserView, SiteView},
+};
+use lemmy_utils::error::LemmyResult;
+
+#[tracing::instrument(skip(context))]
+pub async fn list_person_content(
+  data: Query<ListPersonContent>,
+  context: Data<LemmyContext>,
+  local_user_view: Option<LocalUserView>,
+) -> LemmyResult<Json<ListPersonContentResponse>> {
+  let local_site = SiteView::read_local(&mut context.pool()).await?;
+
+  check_private_instance(&local_user_view, &local_site.local_site)?;
+
+  let person_details_id = resolve_person_id_from_id_or_username(
+    &data.person_id,
+    &data.username,
+    &context,
+    &local_user_view,
+  )
+  .await?;
+
+  // parse pagination token
+  let page_after = if let Some(pa) = &data.page_cursor {
+    Some(pa.read(&mut context.pool()).await?)
+  } else {
+    None
+  };
+  let page_back = data.page_back;
+  let type_ = data.type_;
+
+  let content = PersonContentCombinedQuery {
+    creator_id: person_details_id,
+    type_,
+    page_after,
+    page_back,
+  }
+  .list(&mut context.pool(), &local_user_view)
+  .await?;
+
+  Ok(Json(ListPersonContentResponse { content }))
+}

crates/apub/src/api/list_posts.rs

@@ -41,7 +41,6 @@ pub async fn list_posts(
   } else {
     data.community_id
   };
-  let saved_only = data.saved_only;
   let read_only = data.read_only;
   let show_hidden = data.show_hidden;
   let show_read = data.show_read;
@@ -78,7 +77,6 @@ pub async fn list_posts(
     listing_type,
     sort,
     community_id,
-    saved_only,
     read_only,
     liked_only,
     disliked_only,

crates/apub/src/api/mod.rs

@@ -1,12 +1,18 @@
+use crate::{fetcher::resolve_actor_identifier, objects::person::ApubPerson};
+use activitypub_federation::config::Data;
+use lemmy_api_common::{context::LemmyContext, LemmyErrorType};
 use lemmy_db_schema::{
-  newtypes::CommunityId,
-  source::{local_site::LocalSite, local_user::LocalUser},
+  newtypes::{CommunityId, PersonId},
+  source::{local_site::LocalSite, local_user::LocalUser, person::Person},
   CommentSortType,
   ListingType,
   PostSortType,
 };
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_utils::error::LemmyResult;
 
 pub mod list_comments;
+pub mod list_person_content;
 pub mod list_posts;
 pub mod read_community;
 pub mod read_person;
@@ -61,3 +67,28 @@ fn comment_sort_type_with_default(
       .unwrap_or(local_site.default_comment_sort_type),
   )
 }
+
+async fn resolve_person_id_from_id_or_username(
+  person_id: &Option<PersonId>,
+  username: &Option<String>,
+  context: &Data<LemmyContext>,
+  local_user_view: &Option<LocalUserView>,
+) -> LemmyResult<PersonId> {
+  // Check to make sure a person name or an id is given
+  if username.is_none() && person_id.is_none() {
+    Err(LemmyErrorType::NoIdGiven)?
+  }
+
+  Ok(match person_id {
+    Some(id) => *id,
+    None => {
+      if let Some(username) = username {
+        resolve_actor_identifier::<ApubPerson, Person>(username, context, local_user_view, true)
+          .await?
+          .id
+      } else {
+        Err(LemmyErrorType::NotFound)?
+      }
+    }
+  })
+}