mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-07 20:42:40 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
77 lines
2.5 KiB
Rust
77 lines
2.5 KiB
Rust
use crate::Perform;
|
|
use actix_web::web::Data;
|
|
use diesel::NotFound;
|
|
use lemmy_api_common::{
|
|
site::{ResolveObject, ResolveObjectResponse},
|
|
utils::{check_private_instance, get_local_user_view_from_jwt_opt},
|
|
};
|
|
use lemmy_apub::fetcher::search::{search_query_to_object_id, SearchableObjects};
|
|
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, PersonViewSafe};
|
|
use lemmy_utils::{error::LemmyError, ConnectionId};
|
|
use lemmy_websocket::LemmyContext;
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl Perform for ResolveObject {
|
|
type Response = ResolveObjectResponse;
|
|
|
|
#[tracing::instrument(skip(context, _websocket_id))]
|
|
async fn perform(
|
|
&self,
|
|
context: &Data<LemmyContext>,
|
|
_websocket_id: Option<ConnectionId>,
|
|
) -> Result<ResolveObjectResponse, LemmyError> {
|
|
let local_user_view =
|
|
get_local_user_view_from_jwt_opt(self.auth.as_ref(), context.pool(), context.secret())
|
|
.await?;
|
|
let local_site = LocalSite::read(context.pool()).await?;
|
|
check_private_instance(&local_user_view, &local_site)?;
|
|
|
|
let res = search_query_to_object_id(&self.q, local_user_view.is_none(), context)
|
|
.await
|
|
.map_err(|e| e.with_message("couldnt_find_object"))?;
|
|
convert_response(res, local_user_view.map(|l| l.person.id), context.pool())
|
|
.await
|
|
.map_err(|e| e.with_message("couldnt_find_object"))
|
|
}
|
|
}
|
|
|
|
async fn convert_response(
|
|
object: SearchableObjects,
|
|
user_id: Option<PersonId>,
|
|
pool: &DbPool,
|
|
) -> Result<ResolveObjectResponse, LemmyError> {
|
|
let removed_or_deleted;
|
|
let mut res = ResolveObjectResponse {
|
|
comment: None,
|
|
post: None,
|
|
community: None,
|
|
person: None,
|
|
};
|
|
use SearchableObjects::*;
|
|
match object {
|
|
Person(p) => {
|
|
removed_or_deleted = p.deleted;
|
|
res.person = Some(PersonViewSafe::read(pool, p.id).await?)
|
|
}
|
|
Community(c) => {
|
|
removed_or_deleted = c.deleted || c.removed;
|
|
res.community = Some(CommunityView::read(pool, c.id, user_id).await?)
|
|
}
|
|
Post(p) => {
|
|
removed_or_deleted = p.deleted || p.removed;
|
|
res.post = Some(PostView::read(pool, p.id, user_id).await?)
|
|
}
|
|
Comment(c) => {
|
|
removed_or_deleted = c.deleted || c.removed;
|
|
res.comment = Some(CommentView::read(pool, c.id, user_id).await?)
|
|
}
|
|
};
|
|
// if the object was deleted from database, dont return it
|
|
if removed_or_deleted {
|
|
return Err(NotFound {}.into());
|
|
}
|
|
Ok(res)
|
|
}
|