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

fix: show unprocessable activities ids

Browse source
This commit is contained in:
əlemi 2024-06-06 22:53:25 +02:00
parent 9301d6646a
commit ddb86718d1
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/traits/process.rs
View file

@ -19,8 +19,8 @@ pub enum ProcessorError {
#[error("could not resolve all objects involved in this activity")] #[error("could not resolve all objects involved in this activity")]
Incomplete, Incomplete,
#[error("activity not processable by this application")] #[error("activity {0} not processable by this application")]
Unprocessable, Unprocessable(String),
#[error("failed normalizing and inserting entity: {0:?}")] #[error("failed normalizing and inserting entity: {0:?}")]
NormalizerError(#[from] crate::traits::normalize::NormalizerError), NormalizerError(#[from] crate::traits::normalize::NormalizerError),
@ -49,7 +49,7 @@ impl Processor for crate::Context {
apb::ActivityType::Undo => Ok(undo(self, activity, tx).await?), apb::ActivityType::Undo => Ok(undo(self, activity, tx).await?),
apb::ActivityType::Delete => Ok(delete(self, activity, tx).await?), apb::ActivityType::Delete => Ok(delete(self, activity, tx).await?),
apb::ActivityType::Update => Ok(update(self, activity, tx).await?), apb::ActivityType::Update => Ok(update(self, activity, tx).await?),
_ => Err(ProcessorError::Unprocessable), _ => Err(ProcessorError::Unprocessable(activity.id()?.to_string())),
} }
} }
} }
@ -58,7 +58,7 @@ pub async fn create(ctx: &crate::Context, activity: impl apb::Activity, tx: &Dat
let Some(object_node) = activity.object().extract() else { let Some(object_node) = activity.object().extract() else {
// TODO we could process non-embedded activities or arrays but im lazy rn // TODO we could process non-embedded activities or arrays but im lazy rn
tracing::error!("refusing to process activity without embedded object"); tracing::error!("refusing to process activity without embedded object");
return Err(ProcessorError::Unprocessable); return Err(ProcessorError::Unprocessable(activity.id()?.to_string()));
}; };
let oid = object_node.id()?.to_string(); let oid = object_node.id()?.to_string();
let addressed = object_node.addressed(); let addressed = object_node.addressed();
@ -243,7 +243,7 @@ pub async fn update(ctx: &crate::Context, activity: impl apb::Activity, tx: &Dat
let uid = activity.actor().id()?.to_string(); let uid = activity.actor().id()?.to_string();
let Some(object_node) = activity.object().extract() else { let Some(object_node) = activity.object().extract() else {
tracing::error!("refusing to process activity without embedded object"); tracing::error!("refusing to process activity without embedded object");
return Err(ProcessorError::Unprocessable); return Err(ProcessorError::Unprocessable(activity.id()?.to_string()));
}; };
let oid = object_node.id()?.to_string(); let oid = object_node.id()?.to_string();
@ -342,8 +342,8 @@ pub async fn undo(ctx: &crate::Context, activity: impl apb::Activity, tx: &Datab
.await?; .await?;
}, },
t => { t => {
tracing::error!("received 'Undo' for unimplemented activity type: {t:?}"); tracing::error!("received 'Undo' activity '{}' for unimplemented activity type: {t:?}", activity_model.id);
return Err(ProcessorError::Unprocessable); return Err(ProcessorError::Unprocessable(activity_model.id));
}, },
} }
@ -368,7 +368,7 @@ pub async fn announce(ctx: &crate::Context, activity: impl apb::Activity, tx: &D
// if we receive a remote activity, process it directly // if we receive a remote activity, process it directly
Pull::Activity(x) => return ctx.process(x, tx).await, Pull::Activity(x) => return ctx.process(x, tx).await,
// actors are not processable at all // actors are not processable at all
Pull::Actor(_) => return Err(ProcessorError::Unprocessable), Pull::Actor(_) => return Err(ProcessorError::Unprocessable(activity.id()?.to_string())),
// objects are processed down below, make a mock Internal::Object(internal) // objects are processed down below, make a mock Internal::Object(internal)
Pull::Object(x) => Pull::Object(x) =>
crate::context::Internal::Object( crate::context::Internal::Object(
@ -377,7 +377,7 @@ pub async fn announce(ctx: &crate::Context, activity: impl apb::Activity, tx: &D
} }
} }
} { } {
crate::context::Internal::Actor(_) => Err(ProcessorError::Unprocessable), crate::context::Internal::Actor(_) => Err(ProcessorError::Unprocessable(activity.id()?.to_string())),
crate::context::Internal::Activity(_) => Err(ProcessorError::AlreadyProcessed), // ??? crate::context::Internal::Activity(_) => Err(ProcessorError::AlreadyProcessed), // ???
crate::context::Internal::Object(internal) => { crate::context::Internal::Object(internal) => {
let object_model = model::object::Entity::find_by_id(internal) let object_model = model::object::Entity::find_by_id(internal)