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

fix: reintroduce distinct

Browse source
This commit is contained in:
əlemi 2025-01-15 01:36:48 +01:00
parent 5c01432a71
commit bef08a6b13
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
upub/routes/src/activitypub/object/likes.rs
View file

@ -1,6 +1,6 @@
use apb::{BaseMut, CollectionMut, LD}; use apb::{BaseMut, CollectionMut, LD};
use axum::extract::{Path, Query, State}; use axum::extract::{Path, Query, State};
use sea_orm::{ColumnTrait, EntityTrait, Iterable, QueryFilter, QueryOrder, QuerySelect, RelationTrait, SelectColumns, Iden, EntityName}; use sea_orm::{sea_query::IntoColumnRef, ColumnTrait, EntityName, EntityTrait, Iden, Iterable, QueryFilter, QueryOrder, QuerySelect, RelationTrait, SelectColumns};
use upub::{selector::{RichActivity, RichFillable}, Context}; use upub::{selector::{RichActivity, RichFillable}, Context};
use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity}; use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity};
@ -39,11 +39,16 @@ pub async fn page(
let (limit, offset) = page.pagination(); let (limit, offset) = page.pagination();
let mut select = upub::model::like::Entity::find() let mut select = upub::model::like::Entity::find()
.distinct_on([
(upub::model::like::Entity, upub::model::like::Column::Published).into_column_ref(),
(upub::model::activity::Entity, upub::model::activity::Column::Internal).into_column_ref(),
])
.join(sea_orm::JoinType::InnerJoin, upub::model::like::Relation::Activities.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::like::Relation::Activities.def())
.join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def())
.filter(auth.filter_activities()) .filter(auth.filter_activities())
.filter(upub::model::like::Column::Object.eq(internal)) .filter(upub::model::like::Column::Object.eq(internal))
.order_by_desc(upub::model::like::Column::Published) .order_by_desc(upub::model::like::Column::Published)
.order_by_desc(upub::model::activity::Column::Internal)
.limit(limit) .limit(limit)
.offset(offset) .offset(offset)
.select_only(); .select_only();

7
upub/routes/src/activitypub/object/shares.rs
View file

@ -1,6 +1,6 @@
use apb::{BaseMut, CollectionMut, LD}; use apb::{BaseMut, CollectionMut, LD};
use axum::extract::{Path, Query, State}; use axum::extract::{Path, Query, State};
use sea_orm::{ColumnTrait, EntityName, EntityTrait, Iden, Iterable, QueryFilter, QueryOrder, QuerySelect, RelationTrait, SelectColumns}; use sea_orm::{sea_query::IntoColumnRef, ColumnTrait, EntityName, EntityTrait, Iden, Iterable, QueryFilter, QueryOrder, QuerySelect, RelationTrait, SelectColumns};
use upub::{selector::{RichActivity, RichFillable}, Context}; use upub::{selector::{RichActivity, RichFillable}, Context};
use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity}; use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity};
@ -39,11 +39,16 @@ pub async fn page(
let (limit, offset) = page.pagination(); let (limit, offset) = page.pagination();
let mut select = upub::model::announce::Entity::find() let mut select = upub::model::announce::Entity::find()
.distinct_on([
(upub::model::announce::Entity, upub::model::announce::Column::Published).into_column_ref(),
(upub::model::activity::Entity, upub::model::activity::Column::Internal).into_column_ref(),
])
.join(sea_orm::JoinType::InnerJoin, upub::model::announce::Relation::Activities.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::announce::Relation::Activities.def())
.join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def())
.filter(auth.filter_activities()) .filter(auth.filter_activities())
.filter(upub::model::announce::Column::Object.eq(internal)) .filter(upub::model::announce::Column::Object.eq(internal))
.order_by_desc(upub::model::announce::Column::Published) .order_by_desc(upub::model::announce::Column::Published)
.order_by_desc(upub::model::activity::Column::Internal)
.limit(limit) .limit(limit)
.offset(offset) .offset(offset)
.select_only(); .select_only();