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

fix: filter_objects() -> filter()

Browse source
This commit is contained in:
əlemi 2024-07-02 19:32:50 +02:00
parent 781619a899
commit 45da3a1684
Signed by: alemi
GPG key ID: A4895B84D311642C
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
upub/routes/src/activitypub/object/context.rs
View file

@ -12,7 +12,7 @@ pub async fn get(
let context = ctx.oid(&id); let context = ctx.oid(&id);
let count = upub::Query::feed(auth.my_id()) let count = upub::Query::feed(auth.my_id())
.filter(auth.filter_objects()) .filter(auth.filter())
.filter(model::object::Column::Context.eq(&context)) .filter(model::object::Column::Context.eq(&context))
.count(ctx.db()) .count(ctx.db())
.await?; .await?;
@ -31,7 +31,7 @@ pub async fn page(
crate::builders::paginate_feed( crate::builders::paginate_feed(
upub::url!(ctx, "/objects/{id}/context/page"), upub::url!(ctx, "/objects/{id}/context/page"),
Condition::all() Condition::all()
.add(auth.filter_objects()) .add(auth.filter())
.add(model::object::Column::Context.eq(context)), .add(model::object::Column::Context.eq(context)),
ctx.db(), ctx.db(),
page, page,

4
upub/routes/src/activitypub/object/mod.rs
View file

@ -29,7 +29,7 @@ pub async fn view(
let item = upub::Query::feed(auth.my_id()) let item = upub::Query::feed(auth.my_id())
.filter(model::object::Column::Id.eq(&oid)) .filter(model::object::Column::Id.eq(&oid))
.filter(auth.filter_objects()) .filter(auth.filter())
.into_model::<RichActivity>() .into_model::<RichActivity>()
.one(ctx.db()) .one(ctx.db())
.await? .await?
@ -46,7 +46,7 @@ pub async fn view(
if ctx.cfg().security.show_reply_ids { if ctx.cfg().security.show_reply_ids {
let replies_ids = upub::Query::feed(auth.my_id()) let replies_ids = upub::Query::feed(auth.my_id())
.filter(model::object::Column::InReplyTo.eq(oid)) .filter(model::object::Column::InReplyTo.eq(oid))
.filter(auth.filter_objects()) .filter(auth.filter())
.select_only() .select_only()
.select_column(model::object::Column::Id) .select_column(model::object::Column::Id)
.into_tuple::<String>() .into_tuple::<String>()

4
upub/routes/src/activitypub/object/replies.rs
View file

@ -17,7 +17,7 @@ pub async fn get(
let replies_ids = upub::Query::feed(auth.my_id()) let replies_ids = upub::Query::feed(auth.my_id())
.filter(model::object::Column::InReplyTo.eq(ctx.oid(&id))) .filter(model::object::Column::InReplyTo.eq(ctx.oid(&id)))
.filter(auth.filter_objects()) .filter(auth.filter())
.select_only() .select_only()
.select_column(model::object::Column::Id) .select_column(model::object::Column::Id)
.into_tuple::<String>() .into_tuple::<String>()
@ -47,7 +47,7 @@ pub async fn page(
crate::builders::paginate_feed( crate::builders::paginate_feed(
page_id, page_id,
Condition::all() Condition::all()
.add(auth.filter_objects()) .add(auth.filter())
.add(model::object::Column::InReplyTo.eq(oid)), .add(model::object::Column::InReplyTo.eq(oid)),
ctx.db(), ctx.db(),
page, page,