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

fix: insert more activities otherwise no notifs

Browse source
This commit is contained in:
əlemi 2024-06-25 02:14:33 +02:00
parent 21343436e8
commit 9a9cb567f9
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
upub/core/src/traits/process.rs
View file

@ -72,11 +72,9 @@ 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
// produces side effects but no activity, and thus no notification
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);
Ok(()) Ok(())
} }
@ -105,9 +103,8 @@ pub async fn like(ctx: &crate::Context, activity: impl apb::Activity, tx: &Datab
.exec(tx) .exec(tx)
.await?; .await?;
// only likes mentioning local users are stored to generate notifications, everything else // likes without addressing are "silent likes", process them but dont store activity
// produces side effects but no activity, and thus no notification if !activity.addressed().is_empty() {
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?;
} }
@ -135,9 +132,8 @@ pub async fn dislike(ctx: &crate::Context, activity: impl apb::Activity, tx: &Da
crate::model::dislike::Entity::insert(dislike).exec(tx).await?; crate::model::dislike::Entity::insert(dislike).exec(tx).await?;
// only dislikes mentioning local users are stored to generate notifications, everything else // dislikes without addressing are "silent dislikes", process them but dont store activity
// produces side effects but no activity, and thus no notification if !activity.addressed().is_empty() {
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?;
} }
@ -270,10 +266,16 @@ pub async fn reject(ctx: &crate::Context, activity: impl apb::Activity, tx: &Dat
Ok(()) Ok(())
} }
pub async fn delete(_ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> { pub async fn delete(ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> {
let oid = activity.object().id()?.to_string(); let oid = activity.object().id()?.to_string();
crate::model::actor::Entity::delete_by_ap_id(&oid).exec(tx).await.info_failed("failed deleting from users"); crate::model::actor::Entity::delete_by_ap_id(&oid).exec(tx).await.info_failed("failed deleting from users");
crate::model::object::Entity::delete_by_ap_id(&oid).exec(tx).await.info_failed("failed deleting from objects"); crate::model::object::Entity::delete_by_ap_id(&oid).exec(tx).await.info_failed("failed deleting from objects");
// we should store deletes to make local delete deliveries work
// except when they have empty addressing
// so that also remote "secret" deletes dont get stored
if !activity.addressed().is_empty() {
ctx.insert_activity(activity, tx).await?;
}
tracing::debug!("deleted '{oid}'"); tracing::debug!("deleted '{oid}'");
Ok(()) Ok(())
} }
@ -311,6 +313,8 @@ pub async fn update(ctx: &crate::Context, activity: impl apb::Activity, tx: &Dat
_ => return Err(ProcessorError::Unprocessable(activity.id()?.to_string())), _ => return Err(ProcessorError::Unprocessable(activity.id()?.to_string())),
} }
// updates can be silently discarded except if local. we dont really care about knowing when
// remote documents change, there's the "updated" field, just want the most recent version
if ctx.is_local(&actor_id) { if ctx.is_local(&actor_id) {
ctx.insert_activity(activity, tx).await?; ctx.insert_activity(activity, tx).await?;
} }
@ -394,7 +398,10 @@ pub async fn undo(ctx: &crate::Context, activity: impl apb::Activity, tx: &Datab
_ => return Err(ProcessorError::Unprocessable(activity.id()?.to_string())), _ => return Err(ProcessorError::Unprocessable(activity.id()?.to_string())),
} }
if ctx.is_local(activity.id()?) { // we should store undos to make local delete deliveries work and relations make sense
// except when they have empty addressing
// so that also remote "secret" undos dont get stored
if !activity.addressed().is_empty() {
ctx.insert_activity(activity, tx).await?; ctx.insert_activity(activity, tx).await?;
} }