-use crate::{
- schema::{person, person_alias_1, person_alias_2},
- Url,
-};
-use serde::Serialize;
+use crate::newtypes::{DbUrl, PersonId};
+use serde::{Deserialize, Serialize};
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person"]
+#[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: i32,
- pub name: String,
- pub preferred_username: Option<String>,
- pub avatar: Option<String>,
- pub banned: bool,
- pub published: chrono::NaiveDateTime,
- pub updated: Option<chrono::NaiveDateTime>,
- pub actor_id: Url,
- pub bio: Option<String>,
- pub local: bool,
- pub private_key: Option<String>,
- pub public_key: Option<String>,
- pub last_refreshed_at: chrono::NaiveDateTime,
- pub banner: Option<String>,
- pub deleted: bool,
- pub inbox_url: Url,
- pub shared_inbox_url: Option<Url>,
+ 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 user, without the sensitive info
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person"]
+/// 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: i32,
- pub name: String,
- pub preferred_username: Option<String>,
- pub avatar: Option<String>,
- pub banned: bool,
- pub published: chrono::NaiveDateTime,
- pub updated: Option<chrono::NaiveDateTime>,
- pub actor_id: Url,
- pub bio: Option<String>,
- pub local: bool,
- pub last_refreshed_at: chrono::NaiveDateTime,
- pub banner: Option<String>,
- pub deleted: bool,
- pub inbox_url: Url,
- pub shared_inbox_url: Option<Url>,
-}
-
-
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_1"]
-pub struct PersonAlias1 {
- pub id: i32,
- pub name: String,
- pub preferred_username: Option<String>,
- pub avatar: Option<String>,
- pub banned: bool,
- pub published: chrono::NaiveDateTime,
- pub updated: Option<chrono::NaiveDateTime>,
- pub actor_id: Url,
- pub bio: Option<String>,
- pub local: bool,
- pub private_key: Option<String>,
- pub public_key: Option<String>,
- pub last_refreshed_at: chrono::NaiveDateTime,
- pub banner: Option<String>,
- pub deleted: bool,
- pub inbox_url: Url,
- pub shared_inbox_url: Option<Url>,
-}
-
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_1"]
-pub struct PersonSafeAlias1 {
- pub id: i32,
- pub name: String,
- pub preferred_username: Option<String>,
- pub avatar: Option<String>,
- pub banned: bool,
- pub published: chrono::NaiveDateTime,
- pub updated: Option<chrono::NaiveDateTime>,
- pub actor_id: Url,
- pub bio: Option<String>,
- pub local: bool,
- pub last_refreshed_at: chrono::NaiveDateTime,
- pub banner: Option<String>,
- pub deleted: bool,
- pub inbox_url: Url,
- pub shared_inbox_url: Option<Url>,
-}
-
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_2"]
-pub struct PersonAlias2 {
- pub id: i32,
- pub name: String,
- pub preferred_username: Option<String>,
- pub avatar: Option<String>,
- pub banned: bool,
- pub published: chrono::NaiveDateTime,
- pub updated: Option<chrono::NaiveDateTime>,
- pub actor_id: Url,
- pub bio: Option<String>,
- pub local: bool,
- pub private_key: Option<String>,
- pub public_key: Option<String>,
- pub last_refreshed_at: chrono::NaiveDateTime,
- pub banner: Option<String>,
- pub deleted: bool,
- pub inbox_url: Url,
- pub shared_inbox_url: Option<Url>,
-}
-
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_1"]
-pub struct PersonSafeAlias2 {
- pub id: i32,
- pub name: String,
- pub preferred_username: Option<String>,
- pub avatar: Option<String>,
- pub banned: bool,
- pub published: chrono::NaiveDateTime,
- pub updated: Option<chrono::NaiveDateTime>,
- pub actor_id: Url,
- pub bio: Option<String>,
- pub local: bool,
- pub last_refreshed_at: chrono::NaiveDateTime,
- pub banner: Option<String>,
- pub deleted: bool,
- pub inbox_url: Url,
- pub shared_inbox_url: Option<Url>,
+ 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(Insertable, AsChangeset, Clone)]
-#[table_name = "person"]
+#[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 preferred_username: Option<Option<String>>,
- pub avatar: Option<Option<String>>,
- pub banned: Option<bool>,
+ 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<Url>,
- pub bio: Option<Option<String>>,
- pub local: Option<bool>,
- pub private_key: Option<Option<String>>,
- pub public_key: Option<Option<String>>,
+ 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<String>>,
- pub deleted: Option<bool>,
- pub inbox_url: Option<Url>,
- pub shared_inbox_url: Option<Option<Url>>,
+ 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>>,
}
projects / lemmy.git / blobdiff