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

fix: select only user id column

Browse source
This commit is contained in:
əlemi 2024-05-01 18:45:30 +02:00
parent 84a446b494
commit dbf2450433
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/routes/activitypub/user/mod.rs
View file

@ -5,7 +5,7 @@ pub mod outbox;
pub mod following; pub mod following;
use axum::extract::{Path, Query, State}; use axum::extract::{Path, Query, State};
use sea_orm::{ColumnTrait, EntityTrait, QueryFilter, SelectColumns}; use sea_orm::{ColumnTrait, EntityTrait, QueryFilter, QuerySelect, SelectColumns};
use apb::{ActorMut, CollectionMut, Node, Object, ObjectMut}; use apb::{ActorMut, CollectionMut, Node, Object, ObjectMut};
use crate::{errors::UpubError, model::{self, user}, server::{auth::AuthIdentity, fetcher::Fetcher, Context}, url}; use crate::{errors::UpubError, model::{self, user}, server::{auth::AuthIdentity, fetcher::Fetcher, Context}, url};
@ -46,6 +46,7 @@ pub async fn view(
let followed_by_me = model::relation::Entity::find() let followed_by_me = model::relation::Entity::find()
.filter(model::relation::Column::Follower.eq(my_id)) .filter(model::relation::Column::Follower.eq(my_id))
.filter(model::relation::Column::Following.eq(&uid)) .filter(model::relation::Column::Following.eq(&uid))
.select_only()
.select_column(model::relation::Column::Follower) .select_column(model::relation::Column::Follower)
.into_tuple::<String>() .into_tuple::<String>()
.all(ctx.db()) .all(ctx.db())
@ -58,6 +59,7 @@ pub async fn view(
let following_me = model::relation::Entity::find() let following_me = model::relation::Entity::find()
.filter(model::relation::Column::Following.eq(my_id)) .filter(model::relation::Column::Following.eq(my_id))
.filter(model::relation::Column::Follower.eq(&uid)) .filter(model::relation::Column::Follower.eq(&uid))
.select_only()
.select_column(model::relation::Column::Following) .select_column(model::relation::Column::Following)
.into_tuple::<String>() .into_tuple::<String>()
.all(ctx.db()) .all(ctx.db())
@ -90,6 +92,7 @@ pub async fn view(
let followed_by_me = model::relation::Entity::find() let followed_by_me = model::relation::Entity::find()
.filter(model::relation::Column::Follower.eq(my_id)) .filter(model::relation::Column::Follower.eq(my_id))
.filter(model::relation::Column::Following.eq(&uid)) .filter(model::relation::Column::Following.eq(&uid))
.select_only()
.select_column(model::relation::Column::Follower) .select_column(model::relation::Column::Follower)
.into_tuple::<String>() .into_tuple::<String>()
.all(ctx.db()) .all(ctx.db())
@ -102,6 +105,7 @@ pub async fn view(
let following_me = model::relation::Entity::find() let following_me = model::relation::Entity::find()
.filter(model::relation::Column::Following.eq(my_id)) .filter(model::relation::Column::Following.eq(my_id))
.filter(model::relation::Column::Follower.eq(&uid)) .filter(model::relation::Column::Follower.eq(&uid))
.select_only()
.select_column(model::relation::Column::Following) .select_column(model::relation::Column::Following)
.into_tuple::<String>() .into_tuple::<String>()
.all(ctx.db()) .all(ctx.db())