mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-02 01:01:20 +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
64 lines
2.3 KiB
Rust
64 lines
2.3 KiB
Rust
use crate::fetcher::search::{search_query_to_object_id, SearchableObjects};
|
|
use activitypub_federation::config::Data;
|
|
use actix_web::web::{Json, Query};
|
|
use diesel::NotFound;
|
|
use lemmy_api_common::{
|
|
context::LemmyContext,
|
|
site::{ResolveObject, ResolveObjectResponse},
|
|
utils::{check_private_instance, local_user_view_from_jwt},
|
|
};
|
|
use lemmy_db_schema::{newtypes::PersonId, source::local_site::LocalSite, utils::DbPool};
|
|
use lemmy_db_views::structs::{CommentView, PostView};
|
|
use lemmy_db_views_actor::structs::{CommunityView, PersonView};
|
|
use lemmy_utils::error::{LemmyError, LemmyErrorExt2, LemmyErrorType};
|
|
|
|
#[tracing::instrument(skip(context))]
|
|
pub async fn resolve_object(
|
|
data: Query<ResolveObject>,
|
|
context: Data<LemmyContext>,
|
|
) -> Result<Json<ResolveObjectResponse>, LemmyError> {
|
|
let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
|
|
let local_site = LocalSite::read(&mut context.pool()).await?;
|
|
let person_id = local_user_view.person.id;
|
|
check_private_instance(&Some(local_user_view), &local_site)?;
|
|
|
|
let res = search_query_to_object_id(&data.q, &context)
|
|
.await
|
|
.with_lemmy_type(LemmyErrorType::CouldntFindObject)?;
|
|
convert_response(res, person_id, &mut context.pool())
|
|
.await
|
|
.with_lemmy_type(LemmyErrorType::CouldntFindObject)
|
|
}
|
|
|
|
async fn convert_response(
|
|
object: SearchableObjects,
|
|
user_id: PersonId,
|
|
pool: &mut DbPool<'_>,
|
|
) -> Result<Json<ResolveObjectResponse>, LemmyError> {
|
|
use SearchableObjects::*;
|
|
let removed_or_deleted;
|
|
let mut res = ResolveObjectResponse::default();
|
|
match object {
|
|
Person(p) => {
|
|
removed_or_deleted = p.deleted;
|
|
res.person = Some(PersonView::read(pool, p.id).await?)
|
|
}
|
|
Community(c) => {
|
|
removed_or_deleted = c.deleted || c.removed;
|
|
res.community = Some(CommunityView::read(pool, c.id, Some(user_id), None).await?)
|
|
}
|
|
Post(p) => {
|
|
removed_or_deleted = p.deleted || p.removed;
|
|
res.post = Some(PostView::read(pool, p.id, Some(user_id), None).await?)
|
|
}
|
|
Comment(c) => {
|
|
removed_or_deleted = c.deleted || c.removed;
|
|
res.comment = Some(CommentView::read(pool, c.id, Some(user_id)).await?)
|
|
}
|
|
};
|
|
// if the object was deleted from database, dont return it
|
|
if removed_or_deleted {
|
|
return Err(NotFound {}.into());
|
|
}
|
|
Ok(Json(res))
|
|
}
|