use crate::{
+ newtypes::{DbUrl, PersonId},
schema::{person, person_alias_1, person_alias_2},
- DbUrl,
};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
#[table_name = "person"]
pub struct Person {
- pub id: i32,
+ 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 inbox_url: DbUrl,
pub shared_inbox_url: Option<DbUrl>,
+ pub matrix_user_id: Option<String>,
+ pub admin: bool,
+ pub bot_account: bool,
}
-/// A safe representation of user, without the sensitive info
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+/// A safe representation of person, without the sensitive info
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
#[table_name = "person"]
pub struct PersonSafe {
- pub id: i32,
+ 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 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,
}
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
#[table_name = "person_alias_1"]
pub struct PersonAlias1 {
- pub id: i32,
+ 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 inbox_url: DbUrl,
pub shared_inbox_url: Option<DbUrl>,
+ pub matrix_user_id: Option<String>,
+ pub admin: bool,
+ pub bot_account: bool,
}
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
#[table_name = "person_alias_1"]
pub struct PersonSafeAlias1 {
- pub id: i32,
+ 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 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,
}
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
#[table_name = "person_alias_2"]
pub struct PersonAlias2 {
- pub id: i32,
+ 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 inbox_url: DbUrl,
pub shared_inbox_url: Option<DbUrl>,
+ pub matrix_user_id: Option<String>,
+ pub admin: bool,
+ pub bot_account: bool,
}
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
#[table_name = "person_alias_1"]
pub struct PersonSafeAlias2 {
- pub id: i32,
+ 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 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,
}
-#[derive(Insertable, AsChangeset, Clone)]
+#[derive(Insertable, AsChangeset, Clone, Default)]
#[table_name = "person"]
pub struct PersonForm {
pub name: String,
- pub preferred_username: Option<Option<String>>,
+ pub display_name: Option<Option<String>>,
pub avatar: Option<Option<DbUrl>>,
pub banned: Option<bool>,
pub published: Option<chrono::NaiveDateTime>,
pub bio: Option<Option<String>>,
pub local: Option<bool>,
pub private_key: Option<Option<String>>,
- pub public_key: Option<Option<String>>,
+ pub public_key: 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>,
}