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

fix: addressing of local objects

Browse source
This commit is contained in:
əlemi 2024-06-08 05:45:41 +02:00
parent 453fb2a031
commit 972ef97721
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
upub/core/src/context.rs
View file

@ -140,37 +140,6 @@ impl Context {
id.starts_with(self.base()) id.starts_with(self.base())
} }
pub async fn is_local_internal_object(&self, internal: i64) -> Result<bool, DbErr> {
model::object::Entity::find()
.filter(model::object::Column::Internal.eq(internal))
.select_only()
.select_column(model::object::Column::Internal)
.into_tuple::<i64>()
.any(self.db())
.await
}
pub async fn is_local_internal_activity(&self, internal: i64) -> Result<bool, DbErr> {
model::activity::Entity::find()
.filter(model::activity::Column::Internal.eq(internal))
.select_only()
.select_column(model::activity::Column::Internal)
.into_tuple::<i64>()
.any(self.db())
.await
}
#[allow(unused)]
pub async fn is_local_internal_actor(&self, internal: i64) -> Result<bool, DbErr> {
model::actor::Entity::find()
.filter(model::actor::Column::Internal.eq(internal))
.select_only()
.select_column(model::actor::Column::Internal)
.into_tuple::<i64>()
.any(self.db())
.await
}
pub async fn find_internal(&self, id: &str) -> Result<Option<Internal>, DbErr> { pub async fn find_internal(&self, id: &str) -> Result<Option<Internal>, DbErr> {
if let Some(internal) = model::object::Entity::ap_to_internal(id, self.db()).await? { if let Some(internal) = model::object::Entity::ap_to_internal(id, self.db()).await? {
return Ok(Some(Internal::Object(internal))); return Ok(Some(Internal::Object(internal)));

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

@ -56,25 +56,23 @@ impl Addresser for crate::Context {
async fn address_object(&self, object: &crate::model::object::Model, tx: &impl ConnectionTrait) -> Result<(), DbErr> { async fn address_object(&self, object: &crate::model::object::Model, tx: &impl ConnectionTrait) -> Result<(), DbErr> {
let to = expand_addressing(object.addressed(), tx).await?; let to = expand_addressing(object.addressed(), tx).await?;
address_to(self, to, None, Some(object.internal), tx).await address_to(self, to, None, Some(object.internal), self.is_local(&object.id), tx).await
} }
async fn address_activity(&self, activity: &crate::model::activity::Model, tx: &impl ConnectionTrait) -> Result<(), DbErr> { async fn address_activity(&self, activity: &crate::model::activity::Model, tx: &impl ConnectionTrait) -> Result<(), DbErr> {
let to = expand_addressing(activity.mentioning(), tx).await?; let to = expand_addressing(activity.mentioning(), tx).await?;
address_to(self, to, Some(activity.internal), None, tx).await address_to(self, to, Some(activity.internal), None, self.is_local(&activity.id), tx).await
} }
} }
async fn address_to(ctx: &crate::Context, to: Vec<String>, aid: Option<i64>, oid: Option<i64>, tx: &impl ConnectionTrait) -> Result<(), DbErr> { async fn address_to(ctx: &crate::Context, to: Vec<String>, aid: Option<i64>, oid: Option<i64>, local: bool, tx: &impl ConnectionTrait) -> Result<(), DbErr> {
// TODO address_to became kind of expensive, with these two selects right away and then another // TODO address_to became kind of expensive, with these two selects right away and then another
// select for each target we're addressing to... can this be improved?? // select for each target we're addressing to... can this be improved??
let local_activity = if let Some(x) = aid { ctx.is_local_internal_activity(x).await.unwrap_or(false) } else { false };
let local_object = if let Some(x) = oid { ctx.is_local_internal_object(x).await.unwrap_or(false) } else { false };
let mut addressing = Vec::new(); let mut addressing = Vec::new();
for target in to.into_iter() for target in to.into_iter()
.filter(|to| !to.is_empty()) .filter(|to| !to.is_empty())
.filter(|to| !to.ends_with("/followers")) .filter(|to| !to.ends_with("/followers"))
.filter(|to| local_activity || local_object || to.as_str() == apb::target::PUBLIC || ctx.is_local(to)) .filter(|to| local || to.as_str() == apb::target::PUBLIC || ctx.is_local(to))
{ {
let (server, actor) = if target == apb::target::PUBLIC { (None, None) } else { let (server, actor) = if target == apb::target::PUBLIC { (None, None) } else {
match ( match (