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

fix: always create activities if local

Browse source
This commit is contained in:
əlemi 2024-06-07 23:21:41 +02:00
parent a53c93c1c5
commit ecc277a1f0
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 19 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

@ -74,7 +74,7 @@ pub async fn create(ctx: &crate::Context, activity: impl apb::Activity, tx: &Dat
let object_model = ctx.insert_object(object_node, tx).await?; let object_model = ctx.insert_object(object_node, tx).await?;
// only likes mentioning local users are stored to generate notifications, everything else // only likes mentioning local users are stored to generate notifications, everything else
// produces side effects but no activity, and thus no notification // produces side effects but no activity, and thus no notification
if activity.mentioning().iter().any(|x| ctx.is_local(x)) { if ctx.is_local(activity.actor().id()?) || activity.mentioning().iter().any(|x| ctx.is_local(x)) {
ctx.insert_activity(activity, tx).await?; ctx.insert_activity(activity, tx).await?;
} }
tracing::debug!("{} posted {}", object_model.attributed_to.as_deref().unwrap_or("<anonymous>"), object_model.id); tracing::debug!("{} posted {}", object_model.attributed_to.as_deref().unwrap_or("<anonymous>"), object_model.id);
@ -107,7 +107,7 @@ pub async fn like(ctx: &crate::Context, activity: impl apb::Activity, tx: &Datab
// only likes mentioning local users are stored to generate notifications, everything else // only likes mentioning local users are stored to generate notifications, everything else
// produces side effects but no activity, and thus no notification // produces side effects but no activity, and thus no notification
if activity.mentioning().iter().any(|x| ctx.is_local(x)) { if ctx.is_local(&actor.id) || activity.mentioning().iter().any(|x| ctx.is_local(x)) {
ctx.insert_activity(activity, tx).await?; ctx.insert_activity(activity, tx).await?;
} }
@ -205,11 +205,13 @@ pub async fn delete(_ctx: &crate::Context, activity: impl apb::Activity, tx: &Da
Ok(()) Ok(())
} }
pub async fn update(_ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> { pub async fn update(ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> {
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(activity.id()?.to_string())); return Err(ProcessorError::Unprocessable(activity.id()?.to_string()));
}; };
let actor_id = activity.actor().id()?.to_string();
let oid = object_node.id()?.to_string(); let oid = object_node.id()?.to_string();
match object_node.object_type()? { match object_node.object_type()? {
@ -238,7 +240,11 @@ pub async fn update(_ctx: &crate::Context, activity: impl apb::Activity, tx: &Da
_ => return Err(ProcessorError::Unprocessable(activity.id()?.to_string())), _ => return Err(ProcessorError::Unprocessable(activity.id()?.to_string())),
} }
tracing::debug!("{} updated {}", activity.actor().id()?, oid); if ctx.is_local(&actor_id) {
ctx.insert_activity(activity, tx).await?;
}
tracing::debug!("{} updated {}", actor_id, oid);
Ok(()) Ok(())
} }
@ -360,12 +366,16 @@ pub async fn announce(ctx: &crate::Context, activity: impl apb::Activity, tx: &D
.exec(tx) .exec(tx)
.await?; .await?;
} }
}
// TODO we should probably insert an activity, otherwise this won't appear on timelines!! // TODO we should probably insert an activity, otherwise this won't appear on timelines!!
// or maybe go update all addressing records for this object, pushing them up // or maybe go update all addressing records for this object, pushing them up
// or maybe create new addressing rows with more recent dates // or maybe create new addressing rows with more recent dates
// or maybe create fake objects that reference the original one // or maybe create fake objects that reference the original one
// idk!!!! // idk!!!!
if ctx.is_local(&actor.id) {
ctx.insert_activity(activity, tx).await?;
} }
tracing::debug!("{} shared {}", actor.id, announced_id); tracing::debug!("{} shared {}", actor.id, announced_id);