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

fix: cleanup

Browse source
This commit is contained in:
əlemi 2024-03-25 02:27:31 +01:00
parent 6be486ca3d
commit 7f69abf6c0
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/activitypub/user/outbox.rs
View file

@ -1,7 +1,7 @@
use axum::{extract::{Path, Query, State}, http::StatusCode, Json}; use axum::{extract::{Path, Query, State}, http::StatusCode, Json};
use sea_orm::{ColumnTrait, Condition, EntityTrait, Order, QueryFilter, QueryOrder, QuerySelect}; use sea_orm::{EntityTrait, Order, QueryOrder, QuerySelect};
use crate::{activitypub::{jsonld::LD, JsonLD, Pagination, PUBLIC_TARGET}, activitystream::{object::{activity::{accept::AcceptType, reject::RejectType, ActivityMut, ActivityType}, collection::{page::CollectionPageMut, CollectionMut, CollectionType}}, Base, BaseMut, BaseType, Node, ObjectType}, auth::{AuthIdentity, Identity}, model::{self, activity, object}, server::Context, url}; use crate::{activitypub::{jsonld::LD, JsonLD, Pagination}, activitystream::{object::{activity::ActivityMut, collection::{page::CollectionPageMut, CollectionMut, CollectionType}}, Base, BaseMut, BaseType, Node}, auth::{AuthIdentity, Identity}, model::{activity, object}, server::Context, url};
pub async fn get( pub async fn get(
State(ctx): State<Context>, State(ctx): State<Context>,
@ -20,29 +20,21 @@ pub async fn page(
State(ctx): State<Context>, State(ctx): State<Context>,
Path(id): Path<String>, Path(id): Path<String>,
Query(page): Query<Pagination>, Query(page): Query<Pagination>,
AuthIdentity(auth): AuthIdentity, AuthIdentity(_auth): AuthIdentity,
) -> Result<JsonLD<serde_json::Value>, StatusCode> { ) -> Result<JsonLD<serde_json::Value>, StatusCode> {
let limit = page.batch.unwrap_or(20).min(50); let limit = page.batch.unwrap_or(20).min(50);
let offset = page.offset.unwrap_or(0); let offset = page.offset.unwrap_or(0);
let mut conditions = Condition::any() // let mut conditions = Condition::any()
.add(model::addressing::Column::Actor.eq(PUBLIC_TARGET)); // .add(model::addressing::Column::Actor.eq(PUBLIC_TARGET));
if let Identity::User(x) = auth { // if let Identity::User(ref x) = auth {
conditions = conditions.add(model::addressing::Column::Actor.eq(x)); // conditions = conditions.add(model::addressing::Column::Actor.eq(x));
} // }
if let Identity::Server(x) = auth {
conditions = conditions.add(model::addressing::Column::Server.eq(x));
}
let x = model::addressing::Entity::find()
.filter(conditions)
.inner_join(model::activity::Entity)
.left_join(model::object::Entity)
.all(ctx.db())
.await;
// if let Identity::Server(ref x) = auth {
// conditions = conditions.add(model::addressing::Column::Server.eq(x));
// }
match activity::Entity::find() match activity::Entity::find()
.find_also_related(object::Entity) .find_also_related(object::Entity)

2
src/auth.rs
View file

@ -1,4 +1,4 @@
use axum::{extract::{FromRef, FromRequestParts}, http::{header::{self, HeaderValue, USER_AGENT}, request::Parts, StatusCode}}; use axum::{extract::{FromRef, FromRequestParts}, http::{header, request::Parts, StatusCode}};
use sea_orm::{ColumnTrait, Condition, EntityTrait, QueryFilter}; use sea_orm::{ColumnTrait, Condition, EntityTrait, QueryFilter};
use crate::{model, server::Context}; use crate::{model, server::Context};