use crate::newtypes::{DbUrl, InstanceId, PersonId};
+#[cfg(feature = "full")]
+use crate::schema::{person, person_follower};
use serde::{Deserialize, Serialize};
use typed_builder::TypedBuilder;
-#[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 actor_id: DbUrl,
pub bio: Option<String>,
pub local: bool,
+ #[serde(skip)]
pub private_key: Option<String>,
+ #[serde(skip)]
pub public_key: String,
+ #[serde(skip)]
pub last_refreshed_at: chrono::NaiveDateTime,
pub banner: Option<DbUrl>,
pub deleted: bool,
+ #[serde(skip_serializing)]
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>,
- pub instance_id: InstanceId,
-}
-
-/// 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,
+ #[serde(skip)]
pub shared_inbox_url: Option<DbUrl>,
pub matrix_user_id: Option<String>,
pub admin: bool,
pub bot_account: Option<bool>,
pub ban_expires: Option<Option<chrono::NaiveDateTime>>,
}
+
+#[derive(PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::person::Person)))]
+#[cfg_attr(feature = "full", diesel(table_name = person_follower))]
+pub struct PersonFollower {
+ pub id: i32,
+ pub person_id: PersonId,
+ pub follower_id: PersonId,
+ pub published: chrono::NaiveDateTime,
+ pub pending: bool,
+}
+
+#[derive(Clone)]
+#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = person_follower))]
+pub struct PersonFollowerForm {
+ pub person_id: PersonId,
+ pub follower_id: PersonId,
+ pub pending: bool,
+}