-use crate::{
- schema::{person, person_alias_1, person_alias_2},
- DbUrl,
- PersonId,
-};
-use serde::Serialize;
+use crate::newtypes::{DbUrl, InstanceId, PersonId};
+use serde::{Deserialize, Serialize};
+use typed_builder::TypedBuilder;
-#[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: PersonId,
pub name: String,
- pub preferred_username: Option<String>,
+ pub display_name: Option<String>,
pub avatar: Option<DbUrl>,
pub banned: bool,
pub published: chrono::NaiveDateTime,
pub bio: Option<String>,
pub local: bool,
pub private_key: Option<String>,
- pub public_key: Option<String>,
+ pub public_key: String,
pub last_refreshed_at: chrono::NaiveDateTime,
pub banner: Option<DbUrl>,
pub deleted: bool,
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>,
+ pub instance_id: InstanceId,
}
/// A safe representation of person, without the sensitive info
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "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 PersonSafe {
pub id: PersonId,
pub name: String,
- pub preferred_username: 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,
-}
-
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_1"]
-pub struct PersonAlias1 {
- pub id: PersonId,
- pub name: String,
- pub preferred_username: 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: Option<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,
-}
-
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_1"]
-pub struct PersonSafeAlias1 {
- pub id: PersonId,
- pub name: String,
- pub preferred_username: Option<String>,
+ pub display_name: Option<String>,
pub avatar: Option<DbUrl>,
pub banned: bool,
pub published: chrono::NaiveDateTime,
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>,
+ pub instance_id: InstanceId,
}
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_2"]
-pub struct PersonAlias2 {
- pub id: PersonId,
+#[derive(Clone, TypedBuilder)]
+#[builder(field_defaults(default))]
+#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = person))]
+pub struct PersonInsertForm {
+ #[builder(!default)]
pub name: String,
- pub preferred_username: Option<String>,
+ #[builder(!default)]
+ pub public_key: String,
+ #[builder(!default)]
+ pub instance_id: InstanceId,
+ pub display_name: Option<String>,
pub avatar: Option<DbUrl>,
- pub banned: bool,
- pub published: chrono::NaiveDateTime,
+ pub banned: Option<bool>,
+ pub published: Option<chrono::NaiveDateTime>,
pub updated: Option<chrono::NaiveDateTime>,
- pub actor_id: DbUrl,
+ pub actor_id: Option<DbUrl>,
pub bio: Option<String>,
- pub local: bool,
+ pub local: Option<bool>,
pub private_key: Option<String>,
- pub public_key: Option<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,
-}
-
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "person_alias_1"]
-pub struct PersonSafeAlias2 {
- pub id: PersonId,
- pub name: String,
- pub preferred_username: 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 last_refreshed_at: Option<chrono::NaiveDateTime>,
pub banner: Option<DbUrl>,
- pub deleted: bool,
- pub inbox_url: DbUrl,
+ pub deleted: Option<bool>,
+ pub inbox_url: Option<DbUrl>,
pub shared_inbox_url: Option<DbUrl>,
pub matrix_user_id: Option<String>,
- pub admin: bool,
+ pub admin: Option<bool>,
+ pub bot_account: Option<bool>,
+ pub ban_expires: Option<chrono::NaiveDateTime>,
}
-#[derive(Insertable, AsChangeset, Clone, Default)]
-#[table_name = "person"]
-pub struct PersonForm {
- pub name: String,
- pub preferred_username: Option<Option<String>>,
+#[derive(Clone, TypedBuilder)]
+#[cfg_attr(feature = "full", derive(AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = person))]
+#[builder(field_defaults(default))]
+pub struct PersonUpdateForm {
+ 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 updated: Option<Option<chrono::NaiveDateTime>>,
pub actor_id: Option<DbUrl>,
pub bio: Option<Option<String>>,
pub local: Option<bool>,
+ pub public_key: Option<String>,
pub private_key: Option<Option<String>>,
- pub public_key: Option<Option<String>>,
pub last_refreshed_at: Option<chrono::NaiveDateTime>,
pub banner: Option<Option<DbUrl>>,
pub deleted: Option<bool>,
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>>,
}