zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: better type check for normalizing AP document

Browse source
This commit is contained in:
əlemi 2024-06-06 19:57:32 +02:00
parent 49fdc71dbd
commit f249237dc5
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
upub/core/src/traits/normalize.rs
View file

@ -6,6 +6,9 @@ pub enum NormalizerError {
#[error("normalized document misses required field: {0:?}")] #[error("normalized document misses required field: {0:?}")]
Malformed(#[from] apb::FieldErr), Malformed(#[from] apb::FieldErr),
#[error("wrong object type: expected {0}, got {1}")]
WrongType(apb::BaseType, apb::BaseType),
#[error("database error while normalizing object: {0:?}")] #[error("database error while normalizing object: {0:?}")]
DbErr(#[from] sea_orm::DbErr), DbErr(#[from] sea_orm::DbErr),
} }
@ -150,7 +153,11 @@ impl Normalizer for crate::Context {
pub struct AP; pub struct AP;
impl AP { impl AP {
pub fn activity(activity: &impl apb::Activity) -> Result<crate::model::activity::Model, apb::FieldErr> { pub fn activity(activity: &impl apb::Activity) -> Result<crate::model::activity::Model, NormalizerError> {
let t = activity.base_type()?;
if !matches!(t, apb::BaseType::Object(apb::ObjectType::Activity(_))) {
return Err(NormalizerError::WrongType(apb::BaseType::Object(apb::ObjectType::Activity(apb::ActivityType::Activity)), t));
}
Ok(crate::model::activity::Model { Ok(crate::model::activity::Model {
internal: 0, internal: 0,
id: activity.id()?.to_string(), id: activity.id()?.to_string(),
@ -166,7 +173,7 @@ impl AP {
}) })
} }
pub fn activity_q(activity: &impl apb::Activity) -> Result<crate::model::activity::ActiveModel, apb::FieldErr> { pub fn activity_q(activity: &impl apb::Activity) -> Result<crate::model::activity::ActiveModel, NormalizerError> {
let mut m = AP::activity(activity)?.into_active_model(); let mut m = AP::activity(activity)?.into_active_model();
m.internal = NotSet; m.internal = NotSet;
Ok(m) Ok(m)
@ -175,7 +182,11 @@ impl AP {
pub fn attachment(document: &impl apb::Document, parent: i64) -> Result<crate::model::attachment::Model, apb::FieldErr> { pub fn attachment(document: &impl apb::Document, parent: i64) -> Result<crate::model::attachment::Model, NormalizerError> {
let t = document.base_type()?;
if !matches!(t, apb::BaseType::Object(apb::ObjectType::Document(_))) {
return Err(NormalizerError::WrongType(apb::BaseType::Object(apb::ObjectType::Document(apb::DocumentType::Document)), t));
}
Ok(crate::model::attachment::Model { Ok(crate::model::attachment::Model {
internal: 0, internal: 0,
url: document.url().id().str().unwrap_or_default(), url: document.url().id().str().unwrap_or_default(),
@ -187,7 +198,7 @@ impl AP {
}) })
} }
pub fn attachment_q(document: &impl apb::Document, parent: i64) -> Result<crate::model::attachment::ActiveModel, apb::FieldErr> { pub fn attachment_q(document: &impl apb::Document, parent: i64) -> Result<crate::model::attachment::ActiveModel, NormalizerError> {
let mut m = AP::attachment(document, parent)?.into_active_model(); let mut m = AP::attachment(document, parent)?.into_active_model();
m.internal = NotSet; m.internal = NotSet;
Ok(m) Ok(m)
@ -195,26 +206,25 @@ impl AP {
pub fn object(object: &impl apb::Object) -> Result<crate::model::object::Model, apb::FieldErr> { pub fn object(object: &impl apb::Object) -> Result<crate::model::object::Model, NormalizerError> {
let t = object.object_type()?; let t = object.base_type()?;
if matches!(t, if !matches!(t,
apb::ObjectType::Activity(_) apb::BaseType::Object(
| apb::ObjectType::Actor(_) apb::ObjectType::Object
| apb::ObjectType::Collection(_) | apb::ObjectType::Note
| apb::ObjectType::Document( | apb::ObjectType::Article
// TODO lemmy posts are PAGEs... | apb::ObjectType::Event
apb::DocumentType::Document | apb::ObjectType::Place
| apb::DocumentType::Audio | apb::ObjectType::Profile
| apb::DocumentType::Image | apb::ObjectType::Document(apb::DocumentType::Page) // why Document lemmy??????
| apb::DocumentType::Video
) )
) { ) {
return Err(apb::FieldErr("type")); return Err(NormalizerError::WrongType(apb::BaseType::Object(apb::ObjectType::Object), t));
} }
Ok(crate::model::object::Model { Ok(crate::model::object::Model {
internal: 0, internal: 0,
id: object.id()?.to_string(), id: object.id()?.to_string(),
object_type: t, object_type: object.object_type()?,
attributed_to: object.attributed_to().id().str(), attributed_to: object.attributed_to().id().str(),
name: object.name().str(), name: object.name().str(),
summary: object.summary().str(), summary: object.summary().str(),
@ -239,7 +249,7 @@ impl AP {
}) })
} }
pub fn object_q(object: &impl apb::Object) -> Result<crate::model::object::ActiveModel, apb::FieldErr> { pub fn object_q(object: &impl apb::Object) -> Result<crate::model::object::ActiveModel, NormalizerError> {
let mut m = AP::object(object)?.into_active_model(); let mut m = AP::object(object)?.into_active_model();
m.internal = NotSet; m.internal = NotSet;
Ok(m) Ok(m)
@ -247,7 +257,11 @@ impl AP {
pub fn actor(actor: &impl apb::Actor) -> Result<crate::model::actor::Model, apb::FieldErr> { pub fn actor(actor: &impl apb::Actor) -> Result<crate::model::actor::Model, NormalizerError> {
let t = actor.base_type()?;
if !matches!(t, apb::BaseType::Object(apb::ObjectType::Actor(_))) {
return Err(NormalizerError::WrongType(apb::BaseType::Object(apb::ObjectType::Actor(apb::ActorType::Person)), t));
}
let ap_id = actor.id()?.to_string(); let ap_id = actor.id()?.to_string();
let (domain, fallback_preferred_username) = { let (domain, fallback_preferred_username) = {
let clean = ap_id let clean = ap_id
@ -283,7 +297,7 @@ impl AP {
}) })
} }
pub fn actor_q(actor: &impl apb::Actor) -> Result<crate::model::actor::ActiveModel, apb::FieldErr> { pub fn actor_q(actor: &impl apb::Actor) -> Result<crate::model::actor::ActiveModel, NormalizerError> {
let mut m = AP::actor(actor)?.into_active_model(); let mut m = AP::actor(actor)?.into_active_model();
m.internal = NotSet; m.internal = NotSet;
Ok(m) Ok(m)