alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: all fields of fields are defaultable

Browse source
This commit is contained in:
əlemi 2024-07-15 21:48:26 +02:00
parent 5c384e9b9e
commit 8e9695c1d5
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
upub/core/src/model/actor.rs
View file

@ -1,18 +1,18 @@
use sea_orm::{entity::prelude::*, QuerySelect, SelectColumns}; use sea_orm::{entity::prelude::*, QuerySelect, SelectColumns};
use apb::{field::OptionalString, ActorMut, ActorType, BaseMut, DocumentMut, EndpointsMut, ObjectMut, PublicKeyMut}; use apb::{ActorMut, ActorType, BaseMut, DocumentMut, EndpointsMut, ObjectMut, PublicKeyMut};
use crate::ext::{JsonVec, TypeName}; use crate::ext::{JsonVec, TypeName};
#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)] #[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
pub struct Field { pub struct Field {
#[serde(default)]
pub name: String, pub name: String,
#[serde(default)]
pub value: String, pub value: String,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[serde(skip_serializing_if = "Option::is_none")]
pub verified_at: Option<ChronoDateTimeUtc>, pub verified_at: Option<ChronoDateTimeUtc>,
#[serde(default, rename = "type")]
#[serde(rename = "type")]
pub field_type: String, pub field_type: String,
} }
@ -22,11 +22,11 @@ impl TypeName for Field {
} }
} }
impl<T: apb::Object> From<T> for Field { impl From<serde_json::Value> for Field {
fn from(value: T) -> Self { fn from(value: serde_json::Value) -> Self {
Field { Field {
name: value.name().str().unwrap_or_default(), name: value.get("name").and_then(|x| x.as_str()).unwrap_or_default().to_string(),
value: value.content().str().unwrap_or_default(), value: value.get("value").and_then(|x| x.as_str()).unwrap_or_default().to_string(),
field_type: "PropertyValue".to_string(), // TODO can we try parsing this instead?? field_type: "PropertyValue".to_string(), // TODO can we try parsing this instead??
verified_at: None, // TODO where does verified_at come from? extend apb maybe verified_at: None, // TODO where does verified_at come from? extend apb maybe
} }