Adding Combined modlog

crates/api/src/post/feature.rs

@@ -60,8 +60,8 @@ pub async fn feature_post(
   let form = ModFeaturePostForm {
     mod_person_id: local_user_view.person.id,
     post_id: data.post_id,
-    featured: data.featured,
-    is_featured_community: data.feature_type == PostFeatureType::Community,
+    featured: Some(data.featured),
+    is_featured_community: Some(data.feature_type == PostFeatureType::Community),
   };
 
   ModFeaturePost::create(&mut context.pool(), &form).await?;

crates/api/src/site/admin_allow_instance.rs

@@ -7,10 +7,13 @@ use lemmy_api_common::{
   LemmyErrorType,
   SuccessResponse,
 };
-use lemmy_db_schema::source::{
-  federation_allowlist::{FederationAllowList, FederationAllowListForm},
-  instance::Instance,
-  mod_log::admin::{AdminAllowInstance, AdminAllowInstanceForm},
+use lemmy_db_schema::{
+  source::{
+    federation_allowlist::{FederationAllowList, FederationAllowListForm},
+    instance::Instance,
+    mod_log::admin::{AdminAllowInstance, AdminAllowInstanceForm},
+  },
+  traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
@@ -47,7 +50,7 @@ pub async fn admin_allow_instance(
     reason: data.reason.clone(),
     allowed: data.allow,
   };
-  AdminAllowInstance::insert(&mut context.pool(), &mod_log_form).await?;
+  AdminAllowInstance::create(&mut context.pool(), &mod_log_form).await?;
 
   Ok(Json(SuccessResponse::default()))
 }

crates/api/src/site/admin_block_instance.rs

@@ -7,10 +7,13 @@ use lemmy_api_common::{
   LemmyErrorType,
   SuccessResponse,
 };
-use lemmy_db_schema::source::{
-  federation_blocklist::{FederationBlockList, FederationBlockListForm},
-  instance::Instance,
-  mod_log::admin::{AdminBlockInstance, AdminBlockInstanceForm},
+use lemmy_db_schema::{
+  source::{
+    federation_blocklist::{FederationBlockList, FederationBlockListForm},
+    instance::Instance,
+    mod_log::admin::{AdminBlockInstance, AdminBlockInstanceForm},
+  },
+  traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
@@ -48,9 +51,8 @@ pub async fn admin_block_instance(
     admin_person_id: local_user_view.person.id,
     blocked: data.block,
     reason: data.reason.clone(),
-    when_: data.expires,
   };
-  AdminBlockInstance::insert(&mut context.pool(), &mod_log_form).await?;
+  AdminBlockInstance::create(&mut context.pool(), &mod_log_form).await?;
 
   Ok(Json(SuccessResponse::default()))
 }

crates/api/src/site/mod_log.rs

@@ -4,30 +4,10 @@ use lemmy_api_common::{
   site::{GetModlog, GetModlogResponse},
   utils::{check_community_mod_of_any_or_admin_action, check_private_instance},
 };
-use lemmy_db_schema::{source::local_site::LocalSite, ModlogActionType};
+use lemmy_db_schema::source::local_site::LocalSite;
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_db_views_moderator::structs::{
-  AdminAllowInstanceView,
-  AdminBlockInstanceView,
-  AdminPurgeCommentView,
-  AdminPurgeCommunityView,
-  AdminPurgePersonView,
-  AdminPurgePostView,
-  ModAddCommunityView,
-  ModAddView,
-  ModBanFromCommunityView,
-  ModBanView,
-  ModFeaturePostView,
-  ModHideCommunityView,
-  ModLockPostView,
-  ModRemoveCommentView,
-  ModRemoveCommunityView,
-  ModRemovePostView,
-  ModTransferCommunityView,
-  ModlogListParams,
-};
+use lemmy_db_views_moderator::{self, modlog_combined_view::ModlogCombinedQuery};
 use lemmy_utils::error::LemmyResult;
-use ModlogActionType::*;
 
 #[tracing::instrument(skip(context))]
 pub async fn get_mod_log(
@@ -39,7 +19,7 @@ pub async fn get_mod_log(
 
   check_private_instance(&local_user_view, &local_site)?;
 
-  let type_ = data.type_.unwrap_or(All);
+  let type_ = data.type_;
   let community_id = data.community_id;
 
   let is_mod_or_admin = if let Some(local_user_view) = local_user_view {
@@ -56,150 +36,31 @@ pub async fn get_mod_log(
   } else {
     data.mod_person_id
   };
-  let other_person_id = data.other_person_id;
+  let modded_person_id = data.modded_person_id;
   let post_id = data.post_id;
   let comment_id = data.comment_id;
 
-  let params = ModlogListParams {
+  // 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 modlog = ModlogCombinedQuery {
+    type_,
     community_id,
     mod_person_id,
-    other_person_id,
+    modded_person_id,
     post_id,
     comment_id,
-    page: data.page,
-    limit: data.limit,
-    hide_modlog_names,
-  };
-  let removed_posts = match type_ {
-    All | ModRemovePost => ModRemovePostView::list(&mut context.pool(), params).await?,
-    _ => Default::default(),
-  };
-
-  let locked_posts = match type_ {
-    All | ModLockPost => ModLockPostView::list(&mut context.pool(), params).await?,
-    _ => Default::default(),
-  };
-
-  let featured_posts = match type_ {
-    All | ModFeaturePost => ModFeaturePostView::list(&mut context.pool(), params).await?,
-    _ => Default::default(),
-  };
-
-  let removed_comments = match type_ {
-    All | ModRemoveComment => ModRemoveCommentView::list(&mut context.pool(), params).await?,
-    _ => Default::default(),
-  };
-
-  let banned_from_community = match type_ {
-    All | ModBanFromCommunity => ModBanFromCommunityView::list(&mut context.pool(), params).await?,
-    _ => Default::default(),
-  };
-
-  let added_to_community = match type_ {
-    All | ModAddCommunity => ModAddCommunityView::list(&mut context.pool(), params).await?,
-    _ => Default::default(),
-  };
-
-  let transferred_to_community = match type_ {
-    All | ModTransferCommunity => {
-      ModTransferCommunityView::list(&mut context.pool(), params).await?
-    }
-    _ => Default::default(),
-  };
-
-  let hidden_communities = match type_ {
-    All | ModHideCommunity if other_person_id.is_none() => {
-      ModHideCommunityView::list(&mut context.pool(), params).await?
-    }
-    _ => Default::default(),
-  };
-
-  // These arrays are only for the full modlog, when a community isn't given
-  let (
-    banned,
-    added,
-    removed_communities,
-    admin_purged_persons,
-    admin_purged_communities,
-    admin_purged_posts,
-    admin_purged_comments,
-    admin_block_instance,
-    admin_allow_instance,
-  ) = if data.community_id.is_none() {
-    (
-      match type_ {
-        All | ModBan => ModBanView::list(&mut context.pool(), params).await?,
-        _ => Default::default(),
-      },
-      match type_ {
-        All | ModAdd => ModAddView::list(&mut context.pool(), params).await?,
-        _ => Default::default(),
-      },
-      match type_ {
-        All | ModRemoveCommunity if other_person_id.is_none() => {
-          ModRemoveCommunityView::list(&mut context.pool(), params).await?
-        }
-        _ => Default::default(),
-      },
-      match type_ {
-        All | AdminPurgePerson if other_person_id.is_none() => {
-          AdminPurgePersonView::list(&mut context.pool(), params).await?
-        }
-        _ => Default::default(),
-      },
-      match type_ {
-        All | AdminPurgeCommunity if other_person_id.is_none() => {
-          AdminPurgeCommunityView::list(&mut context.pool(), params).await?
-        }
-        _ => Default::default(),
-      },
-      match type_ {
-        All | AdminPurgePost if other_person_id.is_none() => {
-          AdminPurgePostView::list(&mut context.pool(), params).await?
-        }
-        _ => Default::default(),
-      },
-      match type_ {
-        All | AdminPurgeComment if other_person_id.is_none() => {
-          AdminPurgeCommentView::list(&mut context.pool(), params).await?
-        }
-        _ => Default::default(),
-      },
-      match type_ {
-        All | AdminBlockInstance if other_person_id.is_none() => {
-          AdminBlockInstanceView::list(&mut context.pool(), params).await?
-        }
-        _ => Default::default(),
-      },
-      match type_ {
-        All | AdminAllowInstance if other_person_id.is_none() => {
-          AdminAllowInstanceView::list(&mut context.pool(), params).await?
-        }
-        _ => Default::default(),
-      },
-    )
-  } else {
-    Default::default()
-  };
+    hide_modlog_names: Some(hide_modlog_names),
+    page_after,
+    page_back,
+  }
+  .list(&mut context.pool())
+  .await?;
 
-  // Return the jwt
-  Ok(Json(GetModlogResponse {
-    removed_posts,
-    locked_posts,
-    featured_posts,
-    removed_comments,
-    removed_communities,
-    banned_from_community,
-    banned,
-    added_to_community,
-    added,
-    transferred_to_community,
-    admin_purged_persons,
-    admin_purged_communities,
-    admin_purged_posts,
-    admin_purged_comments,
-    hidden_communities,
-    admin_block_instance,
-    admin_allow_instance,
-  }))
+  Ok(Json(GetModlogResponse { modlog }))
 }

crates/api_common/src/site.rs

@@ -42,25 +42,7 @@ use lemmy_db_views_actor::structs::{
   CommunityView,
   PersonView,
 };
-use lemmy_db_views_moderator::structs::{
-  AdminAllowInstanceView,
-  AdminBlockInstanceView,
-  AdminPurgeCommentView,
-  AdminPurgeCommunityView,
-  AdminPurgePersonView,
-  AdminPurgePostView,
-  ModAddCommunityView,
-  ModAddView,
-  ModBanFromCommunityView,
-  ModBanView,
-  ModFeaturePostView,
-  ModHideCommunityView,
-  ModLockPostView,
-  ModRemoveCommentView,
-  ModRemoveCommunityView,
-  ModRemovePostView,
-  ModTransferCommunityView,
-};
+use lemmy_db_views_moderator::structs::{ModlogCombinedPaginationCursor, ModlogCombinedView};
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 #[cfg(feature = "full")]
@@ -139,7 +121,7 @@ pub struct ResolveObjectResponse {
 }
 
 #[skip_serializing_none]
-#[derive(Debug, Serialize, Deserialize, Clone, Copy, Default, PartialEq, Eq, Hash)]
+#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "full", derive(TS))]
 #[cfg_attr(feature = "full", ts(export))]
 /// Fetches the modlog.
@@ -149,17 +131,17 @@ pub struct GetModlog {
   #[cfg_attr(feature = "full", ts(optional))]
   pub community_id: Option<CommunityId>,
   #[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 type_: Option<ModlogActionType>,
   #[cfg_attr(feature = "full", ts(optional))]
-  pub other_person_id: Option<PersonId>,
+  pub modded_person_id: Option<PersonId>,
   #[cfg_attr(feature = "full", ts(optional))]
   pub post_id: Option<PostId>,
   #[cfg_attr(feature = "full", ts(optional))]
   pub comment_id: Option<CommentId>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub page_cursor: Option<ModlogCombinedPaginationCursor>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub page_back: Option<bool>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -168,23 +150,7 @@ pub struct GetModlog {
 /// The modlog fetch response.
 // TODO this should be redone as a list of tagged enums
 pub struct GetModlogResponse {
-  pub removed_posts: Vec<ModRemovePostView>,
-  pub locked_posts: Vec<ModLockPostView>,
-  pub featured_posts: Vec<ModFeaturePostView>,
-  pub removed_comments: Vec<ModRemoveCommentView>,
-  pub removed_communities: Vec<ModRemoveCommunityView>,
-  pub banned_from_community: Vec<ModBanFromCommunityView>,
-  pub banned: Vec<ModBanView>,
-  pub added_to_community: Vec<ModAddCommunityView>,
-  pub transferred_to_community: Vec<ModTransferCommunityView>,
-  pub added: Vec<ModAddView>,
-  pub admin_purged_persons: Vec<AdminPurgePersonView>,
-  pub admin_purged_communities: Vec<AdminPurgeCommunityView>,
-  pub admin_purged_posts: Vec<AdminPurgePostView>,
-  pub admin_purged_comments: Vec<AdminPurgeCommentView>,
-  pub hidden_communities: Vec<ModHideCommunityView>,
-  pub admin_block_instance: Vec<AdminBlockInstanceView>,
-  pub admin_allow_instance: Vec<AdminAllowInstanceView>,
+  pub modlog: Vec<ModlogCombinedView>,
 }
 
 #[skip_serializing_none]