From 8af2cd26641dbf4c40e1071a62fb40b43a9fee71 Mon Sep 17 00:00:00 2001 From: alemi Date: Tue, 30 Apr 2024 02:05:28 +0200 Subject: [PATCH] fix: maybe don't filter whole queries --- src/model/addressing.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/model/addressing.rs b/src/model/addressing.rs index 39ba82e..f4fc607 100644 --- a/src/model/addressing.rs +++ b/src/model/addressing.rs @@ -1,5 +1,5 @@ use apb::{ActivityMut, CollectionMut, ObjectMut}; -use sea_orm::{entity::prelude::*, Condition, FromQueryResult, Iterable, Order, QueryOrder, QuerySelect, SelectColumns}; +use sea_orm::{entity::prelude::*, sea_query::IntoCondition, Condition, FromQueryResult, Iterable, Order, QueryOrder, QuerySelect, SelectColumns}; use crate::routes::activitypub::jsonld::LD; @@ -169,9 +169,13 @@ impl Entity { .order_by(Column::Published, Order::Desc); if let Some(uid) = uid { + let uid = uid.to_string(); select = select - .filter(crate::model::like::Column::Actor.eq(uid)) - .join(sea_orm::JoinType::LeftJoin, crate::model::object::Relation::Like.def()) + .join( + sea_orm::JoinType::LeftJoin, + crate::model::object::Relation::Like.def() + .on_condition(move |_l, _r| crate::model::like::Column::Actor.eq(uid.clone()).into_condition()), + ) .select_column_as(crate::model::like::Column::Actor, format!("{}{}", crate::model::like::Entity.table_name(), crate::model::like::Column::Actor.to_string())); }