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

fix: merge previous addressings while inserting

Browse source 
objects discovered before receiving the "official" create should no
longer appear by themselves on the tl
This commit is contained in:
əlemi 2024-11-08 19:39:22 +01:00
parent 02a42ace69
commit 1e57d0d2de
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use std::collections::BTreeSet;
use apb::target::Addressed;
use sea_orm::{ActiveValue::{NotSet, Set}, ColumnTrait, ConnectionTrait, DbErr, EntityTrait, QueryFilter, QuerySelect, SelectColumns};
use sea_orm::{ActiveModelTrait, ActiveValue::{NotSet, Set}, ColumnTrait, ConnectionTrait, DbErr, EntityTrait, IntoActiveModel, QueryFilter, QuerySelect, SelectColumns};
use crate::traits::fetch::Fetcher;
@ -100,6 +100,29 @@ async fn address_to(ctx: &crate::Context, to: Vec<String>, aid: Option<i64>, oid
(_, None) => { tracing::error!("failed resolving actor {target}"); continue; },
}
};
// TODO this is yet another select to insert, can we avoid merging these or think of something
// else entirely??
// if we discovered this object previously, merge its addressing with older entry so it doesnt
// appear twice in timelines
if let (Some(aid), Some(oid)) = (aid, oid) {
if let Some(prev) = crate::model::addressing::Entity::find()
.filter(crate::model::addressing::Column::Activity.is_null())
.filter(crate::model::addressing::Column::Object.eq(oid))
.filter(crate::model::addressing::Column::Actor.eq(actor))
.filter(crate::model::addressing::Column::Instance.eq(server))
.one(tx)
.await?
{
let mut prev = prev.into_active_model();
prev.activity = Set(Some(aid));
prev.object = Set(Some(oid));
prev.update(tx).await?;
continue; // no need to insert this one
}
}
addressing.push(
crate::model::addressing::ActiveModel {
internal: NotSet,