mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-10-31 17:50:01 +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>
83 lines
2.6 KiB
Rust
83 lines
2.6 KiB
Rust
use crate::newtypes::{DbUrl, PersonId};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[cfg(feature = "full")]
|
|
use crate::schema::person;
|
|
|
|
#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = person))]
|
|
pub struct Person {
|
|
pub id: PersonId,
|
|
pub name: String,
|
|
pub display_name: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub private_key: Option<String>,
|
|
pub public_key: String,
|
|
pub last_refreshed_at: chrono::NaiveDateTime,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
pub inbox_url: DbUrl,
|
|
pub shared_inbox_url: Option<DbUrl>,
|
|
pub matrix_user_id: Option<String>,
|
|
pub admin: bool,
|
|
pub bot_account: bool,
|
|
pub ban_expires: Option<chrono::NaiveDateTime>,
|
|
}
|
|
|
|
/// A safe representation of person, without the sensitive info
|
|
#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = person))]
|
|
pub struct PersonSafe {
|
|
pub id: PersonId,
|
|
pub name: String,
|
|
pub display_name: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
pub inbox_url: DbUrl,
|
|
pub shared_inbox_url: Option<DbUrl>,
|
|
pub matrix_user_id: Option<String>,
|
|
pub admin: bool,
|
|
pub bot_account: bool,
|
|
pub ban_expires: Option<chrono::NaiveDateTime>,
|
|
}
|
|
|
|
#[derive(Clone, Default)]
|
|
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = person))]
|
|
pub struct PersonForm {
|
|
pub name: String,
|
|
pub display_name: Option<Option<String>>,
|
|
pub avatar: Option<Option<DbUrl>>,
|
|
pub banned: Option<bool>,
|
|
pub published: Option<chrono::NaiveDateTime>,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub actor_id: Option<DbUrl>,
|
|
pub bio: Option<Option<String>>,
|
|
pub local: Option<bool>,
|
|
pub private_key: Option<Option<String>>,
|
|
pub public_key: Option<String>,
|
|
pub last_refreshed_at: Option<chrono::NaiveDateTime>,
|
|
pub banner: Option<Option<DbUrl>>,
|
|
pub deleted: Option<bool>,
|
|
pub inbox_url: Option<DbUrl>,
|
|
pub shared_inbox_url: Option<Option<DbUrl>>,
|
|
pub matrix_user_id: Option<Option<String>>,
|
|
pub admin: Option<bool>,
|
|
pub bot_account: Option<bool>,
|
|
pub ban_expires: Option<Option<chrono::NaiveDateTime>>,
|
|
}
|