-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};
+use crate::schema::{comment, 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;
-
-#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+#[derive(Clone, PartialEq, Eq, 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")]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::post::Post)))]
+#[cfg_attr(feature = "full", diesel(table_name = comment))]
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)]
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
-#[cfg_attr(feature = "full", table_name = "comment")]
+#[cfg_attr(feature = "full", diesel(table_name = comment))]
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)]
+#[derive(PartialEq, Eq, Debug, Clone)]
#[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Comment))]
-#[cfg_attr(feature = "full", table_name = "comment_like")]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::comment::Comment)))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_like))]
pub struct CommentLike {
pub id: i32,
pub person_id: PersonId,
#[derive(Clone)]
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
-#[cfg_attr(feature = "full", table_name = "comment_like")]
+#[cfg_attr(feature = "full", diesel(table_name = comment_like))]
pub struct CommentLikeForm {
pub person_id: PersonId,
pub comment_id: CommentId,
pub score: i16,
}
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
#[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Comment))]
-#[cfg_attr(feature = "full", table_name = "comment_saved")]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::comment::Comment)))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_saved))]
pub struct CommentSaved {
pub id: i32,
pub comment_id: CommentId,
}
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
-#[cfg_attr(feature = "full", table_name = "comment_saved")]
+#[cfg_attr(feature = "full", diesel(table_name = comment_saved))]
pub struct CommentSavedForm {
pub comment_id: CommentId,
pub person_id: PersonId,