From 69fe55ad54468948c13af520a498ed4aeac194ed Mon Sep 17 00:00:00 2001 From: rtkay123 Date: Thu, 17 Jul 2025 14:00:40 +0200 Subject: chore: convert to workspace --- src/server/activities.rs | 2 - src/server/activities/accept.rs | 52 ------------------ src/server/activities/follow.rs | 91 ------------------------------- src/server/routes.rs | 39 ------------- src/server/routes/users.rs | 30 ---------- src/server/routes/users/get_outbox.rs | 77 -------------------------- src/server/routes/users/get_user.rs | 100 ---------------------------------- src/server/routes/users/post_inbox.rs | 16 ------ src/server/routes/users/webfinger.rs | 86 ----------------------------- 9 files changed, 493 deletions(-) delete mode 100644 src/server/activities.rs delete mode 100644 src/server/activities/accept.rs delete mode 100644 src/server/activities/follow.rs delete mode 100644 src/server/routes.rs delete mode 100644 src/server/routes/users.rs delete mode 100644 src/server/routes/users/get_outbox.rs delete mode 100644 src/server/routes/users/get_user.rs delete mode 100644 src/server/routes/users/post_inbox.rs delete mode 100644 src/server/routes/users/webfinger.rs (limited to 'src/server') diff --git a/src/server/activities.rs b/src/server/activities.rs deleted file mode 100644 index 5e2ad4b..0000000 --- a/src/server/activities.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod accept; -pub mod follow; diff --git a/src/server/activities/accept.rs b/src/server/activities/accept.rs deleted file mode 100644 index 44f26f6..0000000 --- a/src/server/activities/accept.rs +++ /dev/null @@ -1,52 +0,0 @@ -use crate::{ - entity::user::User, error::AppError, server::activities::follow::Follow, state::AppHandle, -}; -use activitypub_federation::{ - config::Data, fetch::object_id::ObjectId, kinds::activity::AcceptType, traits::Activity, -}; -use async_trait::async_trait; -use serde::{Deserialize, Serialize}; -use url::Url; - -#[derive(Deserialize, Serialize, Debug)] -#[serde(rename_all = "camelCase")] -pub struct Accept { - actor: ObjectId, - object: Follow, - #[serde(rename = "type")] - kind: AcceptType, - id: Url, -} - -impl Accept { - pub fn new(actor: ObjectId, object: Follow, id: Url) -> Accept { - Accept { - actor, - object, - kind: Default::default(), - id, - } - } -} - -#[async_trait] -impl Activity for Accept { - type DataType = AppHandle; - type Error = AppError; - - fn id(&self) -> &Url { - &self.id - } - - fn actor(&self) -> &Url { - self.actor.inner() - } - - async fn verify(&self, _data: &Data) -> Result<(), Self::Error> { - Ok(()) - } - - async fn receive(self, _data: &Data) -> Result<(), Self::Error> { - Ok(()) - } -} diff --git a/src/server/activities/follow.rs b/src/server/activities/follow.rs deleted file mode 100644 index 466edb7..0000000 --- a/src/server/activities/follow.rs +++ /dev/null @@ -1,91 +0,0 @@ -use activitypub_federation::{ - config::Data, - fetch::object_id::ObjectId, - kinds::activity::FollowType, - traits::{Activity, Actor}, -}; -use async_trait::async_trait; -use serde::{Deserialize, Serialize}; -use url::Url; -use uuid::Uuid; - -use crate::{ - entity::user::User, - error::AppError, - server::{activities::accept::Accept, generate_object_id}, - state::AppHandle, -}; - -#[derive(Deserialize, Serialize, Clone, Debug)] -#[serde(rename_all = "camelCase")] -pub struct Follow { - pub actor: ObjectId, - pub object: ObjectId, - #[serde(rename = "type")] - kind: FollowType, - id: Url, -} - -impl Follow { - pub fn new(actor: ObjectId, object: ObjectId, id: Url) -> Follow { - Follow { - actor, - object, - kind: Default::default(), - id, - } - } -} - -#[async_trait] -impl Activity for Follow { - #[doc = " App data type passed to handlers. Must be identical to"] - #[doc = " [crate::config::FederationConfigBuilder::app_data] type."] - type DataType = AppHandle; - - #[doc = " Error type returned by handler methods"] - type Error = AppError; - - #[doc = " `id` field of the activity"] - fn id(&self) -> &Url { - &self.id - } - - #[doc = " `actor` field of activity"] - fn actor(&self) -> &Url { - self.actor.inner() - } - - #[doc = " Verifies that the received activity is valid."] - #[doc = ""] - #[doc = " This needs to be a separate method, because it might be used for activities"] - #[doc = " like `Undo/Follow`, which shouldn\'t perform any database write for the inner `Follow`."] - async fn verify(&self, _data: &Data) -> Result<(), Self::Error> { - Ok(()) - } - - #[doc = " Called when an activity is received."] - #[doc = ""] - #[doc = " Should perform validation and possibly write action to the database. In case the activity"] - #[doc = " has a nested `object` field, must call `object.from_json` handler."] - async fn receive(self, data: &Data) -> Result<(), Self::Error> { - let id = Uuid::now_v7(); - - sqlx::query!("insert into following (id, follower, followee) values ($1, $2, $3) on conflict (follower, followee) do nothing" - ,id, - self.actor.inner().as_str(), - self.object.inner().as_str(), - ).execute(&data.services.postgres).await?; - - let follower = self.actor.dereference(data).await?; - let id = generate_object_id(data.domain(), data.environment)?; - - let local_user = self.object.dereference(data).await?; - let accept = Accept::new(self.object.clone(), self, id.clone()); - - local_user - .send(accept, vec![follower.shared_inbox_or_inbox()], false, data) - .await?; - Ok(()) - } -} diff --git a/src/server/routes.rs b/src/server/routes.rs deleted file mode 100644 index 9e1b9a9..0000000 --- a/src/server/routes.rs +++ /dev/null @@ -1,39 +0,0 @@ -pub(super) mod users; -use axum::response::IntoResponse; - -pub async fn health_check() -> impl IntoResponse { - let name = env!("CARGO_PKG_NAME"); - let ver = env!("CARGO_PKG_VERSION"); - - format!("{name} v{ver} is live") -} - -#[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 health_check(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("/").body(Body::empty()).unwrap()) - .await - .unwrap(); - - assert_eq!(response.status(), StatusCode::OK); - } -} 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, - data: Data, -) -> Result { - 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, - data: Data, -) -> Result { - 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, -) -> Result, 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, - activity_data: ActivityData, -) -> impl IntoResponse { - receive_activity::, 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, - data: Data, -) -> Result { - 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); - } -} -- cgit v1.2.3