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

fix: Path<()>, not Path<>, Path<>

Browse source
This commit is contained in:
əlemi 2024-04-13 06:55:16 +02:00
parent fc488e6b2f
commit 7f66851136
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ use axum::{extract::{Path, State}, http::StatusCode};
use sea_orm::{ColumnTrait, Condition, EntityTrait, QueryFilter}; use sea_orm::{ColumnTrait, Condition, EntityTrait, QueryFilter};
use apb::{PublicKeyMut, ActorMut, DocumentMut, DocumentType, ObjectMut, BaseMut, Node}; use apb::{PublicKeyMut, ActorMut, DocumentMut, DocumentType, ObjectMut, BaseMut, Node};
use crate::{model::{self, user}, server::Context, url}; use crate::{errors::UpubError, model::{self, user}, server::Context, url};
use super::{jsonld::LD, JsonLD}; use super::{jsonld::LD, JsonLD};
@ -44,13 +44,13 @@ pub fn ap_user(user: model::user::Model) -> serde_json::Value {
.set_endpoints(Node::Empty) .set_endpoints(Node::Empty)
} }
pub async fn view(State(ctx) : State<Context>, Path(id): Path<String>) -> Result<JsonLD<serde_json::Value>, StatusCode> { pub async fn view(State(ctx) : State<Context>, Path(id): Path<String>) -> crate::Result<JsonLD<serde_json::Value>> {
match user::Entity::find_by_id(ctx.uid(id.clone())) match user::Entity::find_by_id(ctx.uid(id.clone()))
.find_also_related(model::config::Entity) .find_also_related(model::config::Entity)
.one(ctx.db()).await .one(ctx.db()).await?
{ {
// local user // local user
Ok(Some((user, Some(_cfg)))) => { Some((user, Some(_cfg))) => {
Ok(JsonLD(ap_user(user.clone()) // ew ugly clone TODO Ok(JsonLD(ap_user(user.clone()) // ew ugly clone TODO
.set_inbox(Node::link(url!(ctx, "/users/{id}/inbox"))) .set_inbox(Node::link(url!(ctx, "/users/{id}/inbox")))
.set_outbox(Node::link(url!(ctx, "/users/{id}/outbox"))) .set_outbox(Node::link(url!(ctx, "/users/{id}/outbox")))
@ -61,35 +61,26 @@ pub async fn view(State(ctx) : State<Context>, Path(id): Path<String>) -> Result
)) ))
}, },
// remote user TODDO doesn't work? // remote user TODDO doesn't work?
Ok(Some((user, None))) => Ok(JsonLD(ap_user(user).ld_context())), Some((user, None)) => Ok(JsonLD(ap_user(user).ld_context())),
Ok(None) => Err(StatusCode::NOT_FOUND), None => Err(UpubError::not_found()),
Err(e) => {
tracing::error!("error querying for user: {e}");
Err(StatusCode::INTERNAL_SERVER_ERROR)
},
} }
} }
pub async fn remote_view( pub async fn remote_view(
State(ctx) : State<Context>, State(ctx) : State<Context>,
Path(server): Path<String>, Path((server, id)): Path<(String, String)>,
Path(id): Path<String>, ) -> crate::Result<JsonLD<serde_json::Value>> {
) -> Result<JsonLD<serde_json::Value>, StatusCode> {
match user::Entity::find() match user::Entity::find()
.filter( .filter(
Condition::all() Condition::all()
.add(user::Column::PreferredUsername.eq(id)) .add(user::Column::PreferredUsername.eq(id))
.add(user::Column::Domain.eq(server)) .add(user::Column::Domain.eq(server))
) )
.one(ctx.db()).await .one(ctx.db()).await?
{ {
// local user // local user
Ok(Some(user)) => Ok(JsonLD(ap_user(user).ld_context())), Some(user) => Ok(JsonLD(ap_user(user).ld_context())),
Ok(None) => Err(StatusCode::NOT_FOUND), None => Err(UpubError::not_found()),
Err(e) => {
tracing::error!("error querying for user: {e}");
Err(StatusCode::INTERNAL_SERVER_ERROR)
},
} }
} }