Replace TypedBuilder with Default in update forms (#3814)

[lemmy.git] / crates / db_schema / src / source / comment.rs

diff --git a/crates/db_schema/src/source/comment.rs b/crates/db_schema/src/source/comment.rs
index d9117bae134270b4d2ed3f78a5b9bab6b66d207c..f76e2fba77ddb97b1ca2d66f2f7dd4a0aecba764 100644 (file)
--- a/crates/db_schema/src/source/comment.rs
+++ b/crates/db_schema/src/source/comment.rs
@@ -1,37 +1,60 @@
-use crate::newtypes::{CommentId, DbUrl, LanguageId, LtreeDef, PersonId, PostId};
+#[cfg(feature = "full")]
+use crate::newtypes::LtreeDef;
+use crate::newtypes::{CommentId, DbUrl, LanguageId, PersonId, PostId};
+#[cfg(feature = "full")]
+use crate::schema::{comment, comment_like, comment_saved};
+#[cfg(feature = "full")]
 use diesel_ltree::Ltree;
 use serde::{Deserialize, Serialize};
-
+use serde_with::skip_serializing_none;
 #[cfg(feature = "full")]
-use crate::schema::{comment, comment_like, comment_saved};
+use ts_rs::TS;
+use typed_builder::TypedBuilder;
 
+#[skip_serializing_none]
 #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
+#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable, TS))]
+#[cfg_attr(feature = "full", ts(export))]
 #[cfg_attr(feature = "full", diesel(belongs_to(crate::source::post::Post)))]
 #[cfg_attr(feature = "full", diesel(table_name = comment))]
+/// A comment.
 pub struct Comment {
   pub id: CommentId,
   pub creator_id: PersonId,
   pub post_id: PostId,
   pub content: String,
+  /// Whether the comment has been removed.
   pub removed: bool,
   pub published: chrono::NaiveDateTime,
   pub updated: Option<chrono::NaiveDateTime>,
+  /// Whether the comment has been deleted by its creator.
   pub deleted: bool,
+  /// The federated activity id / ap_id.
   pub ap_id: DbUrl,
+  /// Whether the comment is local.
   pub local: bool,
-  #[serde(with = "LtreeDef")]
+  #[cfg(feature = "full")]
+  #[cfg_attr(feature = "full", serde(with = "LtreeDef"))]
+  #[cfg_attr(feature = "full", ts(type = "string"))]
+  /// The path / tree location of a comment, separated by dots, ending with the comment's id. Ex: 0.24.27
   pub path: Ltree,
+  #[cfg(not(feature = "full"))]
+  pub path: String,
+  /// Whether the comment has been distinguished(speaking officially) by a mod.
   pub distinguished: bool,
   pub language_id: LanguageId,
 }
 
-#[derive(Clone, Default)]
+#[derive(Debug, Clone, TypedBuilder)]
+#[builder(field_defaults(default))]
 #[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
 #[cfg_attr(feature = "full", diesel(table_name = comment))]
-pub struct CommentForm {
+pub struct CommentInsertForm {
+  #[builder(!default)]
   pub creator_id: PersonId,
+  #[builder(!default)]
   pub post_id: PostId,
+  #[builder(!default)]
   pub content: String,
   pub removed: Option<bool>,
   pub published: Option<chrono::NaiveDateTime>,
@@ -43,6 +66,21 @@ pub struct CommentForm {
   pub language_id: Option<LanguageId>,
 }
 
+#[derive(Debug, Clone, Default)]
+#[cfg_attr(feature = "full", derive(AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = comment))]
+pub struct CommentUpdateForm {
+  pub content: Option<String>,
+  pub removed: Option<bool>,
+  // Don't use a default naive_now here, because the create function does a lot of comment updates
+  pub updated: Option<Option<chrono::NaiveDateTime>>,
+  pub deleted: Option<bool>,
+  pub ap_id: Option<DbUrl>,
+  pub local: Option<bool>,
+  pub distinguished: Option<bool>,
+  pub language_id: Option<LanguageId>,
+}
+
 #[derive(PartialEq, Eq, Debug, Clone)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
 #[cfg_attr(feature = "full", diesel(belongs_to(crate::source::comment::Comment)))]