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

fix: sub-address only if necessary

Browse source
This commit is contained in:
əlemi 2024-11-09 11:58:06 +01:00
parent 32a2f968f6
commit 98fa0dc58f
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
upub/core/src/traits/address.rs
View file

@ -69,12 +69,19 @@ impl Addresser for crate::Context {
(Some(activity), Some(object)) => { (Some(activity), Some(object)) => {
let to_activity = BTreeSet::from_iter(expand_addressing(activity.addressed(), None, tx).await?); let to_activity = BTreeSet::from_iter(expand_addressing(activity.addressed(), None, tx).await?);
let to_object = BTreeSet::from_iter(expand_addressing(object.addressed(), object.audience.clone(), tx).await?); let to_object = BTreeSet::from_iter(expand_addressing(object.addressed(), object.audience.clone(), tx).await?);
let to_common = to_activity.intersection(&to_object).cloned().collect(); let to_common = to_activity.intersection(&to_object).cloned().collect();
address_to(self, to_common, Some(activity.internal), Some(object.internal), self.is_local(&activity.id), activity.published, tx).await?; address_to(self, to_common, Some(activity.internal), Some(object.internal), self.is_local(&activity.id), activity.published, tx).await?;
let to_only_activity = (&to_activity - &to_object).into_iter().collect();
address_to(self, to_only_activity, Some(activity.internal), None, self.is_local(&activity.id), activity.published, tx).await?; let to_only_activity: Vec<String> = (&to_activity - &to_object).into_iter().collect();
let to_only_object = (&to_object - &to_activity).into_iter().collect(); if !to_only_activity.is_empty() {
address_to(self, to_only_object, None, Some(object.internal), self.is_local(&activity.id), object.published, tx).await?; address_to(self, to_only_activity, Some(activity.internal), None, self.is_local(&activity.id), activity.published, tx).await?;
}
let to_only_object: Vec<String> = (&to_object - &to_activity).into_iter().collect();
if !to_only_object.is_empty() {
address_to(self, to_only_object, None, Some(object.internal), self.is_local(&activity.id), object.published, tx).await?;
}
Ok(()) Ok(())
}, },
} }