Making public key required. Fixes #1934

[lemmy.git] / crates / db_schema / src / source / person.rs

diff --git a/crates/db_schema/src/source/person.rs b/crates/db_schema/src/source/person.rs
index 965378616b139133044874a40cf62013314d7d8b..8ff56eba445f578ba77213c9e1f6633ed3cec2c2 100644 (file)
--- a/crates/db_schema/src/source/person.rs
+++ b/crates/db_schema/src/source/person.rs
@@ -1,11 +1,10 @@
 use crate::{
+  newtypes::{DbUrl, PersonId},
   schema::{person, person_alias_1, person_alias_2},
-  DbUrl,
-  PersonId,
 };
-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: PersonId,
@@ -19,7 +18,7 @@ pub struct Person {
   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,
@@ -31,7 +30,7 @@ pub struct Person {
 }
 
 /// A safe representation of person, without the sensitive info
-#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
 #[table_name = "person"]
 pub struct PersonSafe {
   pub id: PersonId,
@@ -53,7 +52,7 @@ pub struct PersonSafe {
   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: PersonId,
@@ -67,7 +66,7 @@ pub struct PersonAlias1 {
   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,
@@ -78,7 +77,7 @@ pub struct PersonAlias1 {
   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: PersonId,
@@ -100,7 +99,7 @@ pub struct PersonSafeAlias1 {
   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: PersonId,
@@ -114,7 +113,7 @@ pub struct PersonAlias2 {
   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,
@@ -125,7 +124,7 @@ pub struct PersonAlias2 {
   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: PersonId,
@@ -160,7 +159,7 @@ pub struct PersonForm {
   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>,