diff options
author | rtkay123 <dev@kanjala.com> | 2025-07-17 14:00:40 +0200 |
---|---|---|
committer | rtkay123 <dev@kanjala.com> | 2025-07-17 14:00:40 +0200 |
commit | 69fe55ad54468948c13af520a498ed4aeac194ed (patch) | |
tree | c7db25aa7cf615480e9b386064f232d2bec6ccc3 /src/server/routes | |
parent | 5fdb24b6a2cef7964a049e789ed90f883221d657 (diff) | |
download | sellershut-69fe55ad54468948c13af520a498ed4aeac194ed.tar.bz2 sellershut-69fe55ad54468948c13af520a498ed4aeac194ed.zip |
chore: convert to workspace
Diffstat (limited to 'src/server/routes')
-rw-r--r-- | src/server/routes/users.rs | 30 | ||||
-rw-r--r-- | src/server/routes/users/get_outbox.rs | 77 | ||||
-rw-r--r-- | src/server/routes/users/get_user.rs | 100 | ||||
-rw-r--r-- | src/server/routes/users/post_inbox.rs | 16 | ||||
-rw-r--r-- | src/server/routes/users/webfinger.rs | 86 |
5 files changed, 0 insertions, 309 deletions
diff --git a/src/server/routes/users.rs b/src/server/routes/users.rs deleted file mode 100644 index 9c9a3bf..0000000 --- a/src/server/routes/users.rs +++ /dev/null @@ -1,30 +0,0 @@ -pub mod get_outbox; -pub mod post_inbox; -pub mod get_user; -pub mod webfinger; - -use activitypub_federation::traits::Activity; -use axum::{routing::{get, post}, Router}; -use serde::{Deserialize, Serialize}; - -use crate::server::activities::{accept::Accept, follow::Follow}; -use url::Url; -use activitypub_federation::config::Data; - -/// List of all activities which this actor can receive. -#[derive(Deserialize, Serialize, Debug)] -#[serde(untagged)] -#[enum_delegate::implement(Activity)] -pub enum PersonAcceptedActivities { - Follow(Follow), - Accept(Accept), -} - - -pub fn users_router() -> Router { - Router::new() - .route("/users/{username}", get(get_user::http_get_user)) - .route("/users/{username}/outbox", get(get_outbox::http_get_outbox)) - .route("/users/{username}/inbox", post(post_inbox::http_post_user_inbox)) - .route("/.well-known/webfinger", get(webfinger::webfinger)) -} diff --git a/src/server/routes/users/get_outbox.rs b/src/server/routes/users/get_outbox.rs deleted file mode 100644 index 75467af..0000000 --- a/src/server/routes/users/get_outbox.rs +++ /dev/null @@ -1,77 +0,0 @@ -use activitypub_federation::{ - axum::json::FederationJson, config::Data, protocol::context::WithContext, traits::Object, -}; -use axum::{debug_handler, extract::Path, http::StatusCode, response::IntoResponse}; - -use crate::{error::AppError, state::AppHandle}; - -#[debug_handler] -pub async fn http_get_outbox( - Path(name): Path<String>, - data: Data<AppHandle>, -) -> Result<impl IntoResponse, AppError> { - if let Some(a) = super::get_user::read_user(&name, &data).await? { - let json_user = a.into_json(&data).await?; - Ok(( - StatusCode::OK, - FederationJson(WithContext::new_default(json_user)), - ) - .into_response()) - } else { - Ok((StatusCode::NOT_FOUND, "").into_response()) - } -} - -#[cfg(test)] -mod tests { - use axum::{ - body::Body, - http::{Request, StatusCode}, - }; - use sqlx::PgPool; - use stack_up::Services; - use tower::ServiceExt; - - use crate::{ - server::{self, test_config}, - state::AppState, - }; - - #[sqlx::test] - async fn get_user(pool: PgPool) { - let services = Services { postgres: pool }; - let state = AppState::create(services, &test_config()).await.unwrap(); - let app = server::router(state); - - let response = app - .oneshot( - Request::builder() - .uri("/users/sellershut") - .body(Body::empty()) - .unwrap(), - ) - .await - .unwrap(); - - assert_eq!(response.status(), StatusCode::OK); - } - - #[sqlx::test] - async fn get_user_not_found(pool: PgPool) { - let services = Services { postgres: pool }; - let state = AppState::create(services, &test_config()).await.unwrap(); - let app = server::router(state); - - let response = app - .oneshot( - Request::builder() - .uri("/users/selut") - .body(Body::empty()) - .unwrap(), - ) - .await - .unwrap(); - - assert_eq!(response.status(), StatusCode::NOT_FOUND); - } -} diff --git a/src/server/routes/users/get_user.rs b/src/server/routes/users/get_user.rs deleted file mode 100644 index fc2803e..0000000 --- a/src/server/routes/users/get_user.rs +++ /dev/null @@ -1,100 +0,0 @@ -use activitypub_federation::{ - axum::json::FederationJson, config::Data, protocol::context::WithContext, traits::Object, -}; -use axum::{debug_handler, extract::Path, http::StatusCode, response::IntoResponse}; -use tracing::trace; - -use crate::{error::AppError, state::AppHandle}; - -#[debug_handler] -pub async fn http_get_user( - Path(name): Path<String>, - data: Data<AppHandle>, -) -> Result<impl IntoResponse, AppError> { - if let Some(a) = read_user(&name, &data).await? { - let json_user = a.into_json(&data).await?; - Ok(( - StatusCode::OK, - FederationJson(WithContext::new_default(json_user)), - ) - .into_response()) - } else { - Ok((StatusCode::NOT_FOUND, "").into_response()) - } -} - -pub async fn read_user( - name: &str, - data: &Data<AppHandle>, -) -> Result<Option<crate::entity::user::User>, AppError> { - trace!(username = name, "getting user"); - let read = sqlx::query_as!( - crate::entity::user::DbUser, - "select * from account where username = $1 and local = $2", - name, - true - ) - .fetch_optional(&data.services.postgres) - .await?; - - let user = read.into_iter().find(|value| value.username.eq(&name)); - let user = match user { - Some(user) => Some(crate::entity::user::User::try_from(user)?), - None => None, - }; - Ok(user) -} - -#[cfg(test)] -mod tests { - use axum::{ - body::Body, - http::{Request, StatusCode}, - }; - use sqlx::PgPool; - use stack_up::Services; - use tower::ServiceExt; - - use crate::{ - server::{self, test_config}, - state::AppState, - }; - - #[sqlx::test] - async fn get_user(pool: PgPool) { - let services = Services { postgres: pool }; - let state = AppState::create(services, &test_config()).await.unwrap(); - let app = server::router(state); - - let response = app - .oneshot( - Request::builder() - .uri("/users/sellershut") - .body(Body::empty()) - .unwrap(), - ) - .await - .unwrap(); - - assert_eq!(response.status(), StatusCode::OK); - } - - #[sqlx::test] - async fn get_user_not_found(pool: PgPool) { - let services = Services { postgres: pool }; - let state = AppState::create(services, &test_config()).await.unwrap(); - let app = server::router(state); - - let response = app - .oneshot( - Request::builder() - .uri("/users/selut") - .body(Body::empty()) - .unwrap(), - ) - .await - .unwrap(); - - assert_eq!(response.status(), StatusCode::NOT_FOUND); - } -} diff --git a/src/server/routes/users/post_inbox.rs b/src/server/routes/users/post_inbox.rs deleted file mode 100644 index 5e3258b..0000000 --- a/src/server/routes/users/post_inbox.rs +++ /dev/null @@ -1,16 +0,0 @@ -use activitypub_federation::{axum::inbox::{receive_activity, ActivityData}, config::Data, protocol::context::WithContext}; -use axum::response::IntoResponse; - -use crate::{entity::user::User, server::routes::users::PersonAcceptedActivities, state::AppHandle}; - -pub async fn http_post_user_inbox( - data: Data<AppHandle>, - activity_data: ActivityData, -) -> impl IntoResponse { - receive_activity::<WithContext<PersonAcceptedActivities>, User, AppHandle>( - activity_data, - &data, - ) - .await -} - diff --git a/src/server/routes/users/webfinger.rs b/src/server/routes/users/webfinger.rs deleted file mode 100644 index c395d59..0000000 --- a/src/server/routes/users/webfinger.rs +++ /dev/null @@ -1,86 +0,0 @@ -use activitypub_federation::{ - config::Data, - fetch::webfinger::{build_webfinger_response, extract_webfinger_name}, -}; -use axum::{Json, extract::Query, http::StatusCode, response::IntoResponse}; -use serde::Deserialize; - -use crate::{error::AppError, server::routes::users::get_user::read_user, state::AppHandle}; - -#[derive(Deserialize)] -pub struct WebfingerQuery { - resource: String, -} - -pub async fn webfinger( - Query(query): Query<WebfingerQuery>, - data: Data<AppHandle>, -) -> Result<impl IntoResponse, AppError> { - let name = extract_webfinger_name(&query.resource, &data)?; - if let Some(db_user) = read_user(name, &data).await? { - Ok(( - StatusCode::OK, - Json(build_webfinger_response( - query.resource, - db_user.ap_id.into_inner(), - )), - ) - .into_response()) - } else { - Ok((StatusCode::NOT_FOUND, "").into_response()) - } -} - -#[cfg(test)] -mod tests { - use axum::{ - body::Body, - http::{Request, StatusCode}, - }; - use sqlx::PgPool; - use stack_up::Services; - use tower::ServiceExt; - - use crate::{ - server::{self, test_config}, - state::AppState, - }; - - #[sqlx::test] - async fn webfinger_ok(pool: PgPool) { - let services = Services { postgres: pool }; - let state = AppState::create(services, &test_config()).await.unwrap(); - let app = server::router(state); - - let response = app - .oneshot( - Request::builder() - .uri("/.well-known/webfinger?resource=acct:sellershut@localhost") - .body(Body::empty()) - .unwrap(), - ) - .await - .unwrap(); - - assert_eq!(response.status(), StatusCode::OK); - } - - #[sqlx::test] - async fn webfinger_err(pool: PgPool) { - let services = Services { postgres: pool }; - let state = AppState::create(services, &test_config()).await.unwrap(); - let app = server::router(state); - - let response = app - .oneshot( - Request::builder() - .uri("/.well-known/webfinger?resource=acct:sst@localhost") - .body(Body::empty()) - .unwrap(), - ) - .await - .unwrap(); - - assert_eq!(response.status(), StatusCode::NOT_FOUND); - } -} |