mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-02 13:39:21 +00:00
1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
51 lines
1.4 KiB
Rust
51 lines
1.4 KiB
Rust
use crate::{
|
|
activity_lists::SiteInboxActivities,
|
|
http::create_apub_response,
|
|
objects::{instance::ApubSite, person::ApubPerson},
|
|
protocol::collections::empty_outbox::EmptyOutbox,
|
|
};
|
|
use activitypub_federation::{
|
|
actix_web::inbox::receive_activity,
|
|
config::Data,
|
|
protocol::context::WithContext,
|
|
traits::Object,
|
|
};
|
|
use actix_web::{web::Bytes, HttpRequest, HttpResponse};
|
|
use lemmy_api_common::context::LemmyContext;
|
|
use lemmy_db_views::structs::SiteView;
|
|
use lemmy_utils::error::LemmyError;
|
|
use url::Url;
|
|
|
|
pub(crate) async fn get_apub_site_http(
|
|
context: Data<LemmyContext>,
|
|
) -> Result<HttpResponse, LemmyError> {
|
|
let site: ApubSite = SiteView::read_local(&mut context.pool()).await?.site.into();
|
|
|
|
let apub = site.into_json(&context).await?;
|
|
create_apub_response(&apub)
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
pub(crate) async fn get_apub_site_outbox(
|
|
context: Data<LemmyContext>,
|
|
) -> Result<HttpResponse, LemmyError> {
|
|
let outbox_id = format!(
|
|
"{}/site_outbox",
|
|
context.settings().get_protocol_and_hostname()
|
|
);
|
|
let outbox = EmptyOutbox::new(Url::parse(&outbox_id)?)?;
|
|
create_apub_response(&outbox)
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
pub async fn get_apub_site_inbox(
|
|
request: HttpRequest,
|
|
body: Bytes,
|
|
data: Data<LemmyContext>,
|
|
) -> Result<HttpResponse, LemmyError> {
|
|
receive_activity::<WithContext<SiteInboxActivities>, ApubPerson, LemmyContext>(
|
|
request, body, &data,
|
|
)
|
|
.await
|
|
}
|