Add language tags for comments

[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 33fd72c545c0320c00f75ea4a0bb222c75d3eef8..81dba6e66719ec6adb818b30bd3e8d5deabbc1f2 100644 (file)
--- a/crates/db_schema/src/source/comment.rs
+++ b/crates/db_schema/src/source/comment.rs
@@ -1,15 +1,9 @@
-use crate::newtypes::{CommentId, DbUrl, PersonId, PostId};
+use crate::newtypes::{CommentId, DbUrl, LanguageId, LtreeDef, PersonId, PostId};
+use diesel_ltree::Ltree;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "full")]
-use crate::schema::{comment, comment_alias_1, comment_like, comment_saved};
-
-// WITH RECURSIVE MyTree AS (
-//     SELECT * FROM comment WHERE parent_id IS NULL
-//     UNION ALL
-//     SELECT m.* FROM comment AS m JOIN MyTree AS t ON m.parent_id = t.id
-// )
-// SELECT * FROM MyTree;
+use crate::schema::{comment, comment_like, comment_saved};
 
 #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
@@ -19,34 +13,17 @@ pub struct Comment {
   pub id: CommentId,
   pub creator_id: PersonId,
   pub post_id: PostId,
-  pub parent_id: Option<CommentId>,
-  pub content: String,
-  pub removed: bool,
-  pub read: bool, // Whether the recipient has read the comment or not
-  pub published: chrono::NaiveDateTime,
-  pub updated: Option<chrono::NaiveDateTime>,
-  pub deleted: bool,
-  pub ap_id: DbUrl,
-  pub local: bool,
-}
-
-#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
-#[cfg_attr(feature = "full", belongs_to(crate::source::post::Post))]
-#[cfg_attr(feature = "full", table_name = "comment_alias_1")]
-pub struct CommentAlias1 {
-  pub id: CommentId,
-  pub creator_id: PersonId,
-  pub post_id: PostId,
-  pub parent_id: Option<CommentId>,
   pub content: String,
   pub removed: bool,
-  pub read: bool, // Whether the recipient has read the comment or not
   pub published: chrono::NaiveDateTime,
   pub updated: Option<chrono::NaiveDateTime>,
   pub deleted: bool,
   pub ap_id: DbUrl,
   pub local: bool,
+  #[serde(with = "LtreeDef")]
+  pub path: Ltree,
+  pub distinguished: bool,
+  pub language_id: LanguageId,
 }
 
 #[derive(Clone, Default)]
@@ -56,14 +33,14 @@ pub struct CommentForm {
   pub creator_id: PersonId,
   pub post_id: PostId,
   pub content: String,
-  pub parent_id: Option<CommentId>,
   pub removed: Option<bool>,
-  pub read: Option<bool>,
   pub published: Option<chrono::NaiveDateTime>,
   pub updated: 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, Debug, Clone)]