mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-24 05:11:18 +00:00
c9f1407429
* Initial commit to bump diesel to 2.0.0-rc.0 and see what happens * Add chrono feature from diesel * db_schema crate is close to building? * Upgrade diesel-derive-newtype * Mostly modifying references to connections to be mutable ones; also used new way to do migrations as suggested by the migration guide; a lot more compiles now, though I can't figure out this tricky ToSql issue at the moment * Running clippy --fix * Trying to fix drone clippy 1 * Fix clippy * Upgrade clux-musl * Trying to fix drone clippy 2 * Trying to fix drone clippy 3 * Trying to fix drone clippy 5 * Adding diesel table aliases, removing sql view hack. Fixes #2101 Co-authored-by: Steven Chu <stevenc1@gmail.com> Co-authored-by: Nutomic <me@nutomic.com>
85 lines
2.8 KiB
Rust
85 lines
2.8 KiB
Rust
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_like, comment_saved};
|
|
|
|
#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
|
|
#[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 content: String,
|
|
pub removed: bool,
|
|
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", diesel(table_name = comment))]
|
|
pub struct CommentForm {
|
|
pub creator_id: PersonId,
|
|
pub post_id: PostId,
|
|
pub content: String,
|
|
pub removed: 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, Eq, Debug, Clone)]
|
|
#[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
|
|
#[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,
|
|
pub comment_id: CommentId,
|
|
pub post_id: PostId, // TODO this is redundant
|
|
pub score: i16,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = comment_like))]
|
|
pub struct CommentLikeForm {
|
|
pub person_id: PersonId,
|
|
pub comment_id: CommentId,
|
|
pub post_id: PostId, // TODO this is redundant
|
|
pub score: i16,
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Debug)]
|
|
#[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
|
|
#[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,
|
|
pub person_id: PersonId,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = comment_saved))]
|
|
pub struct CommentSavedForm {
|
|
pub comment_id: CommentId,
|
|
pub person_id: PersonId,
|
|
}
|