mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-17 01:12:39 +00:00
6047257bfc
* Move admin flag from person to local_user (fixes #3060) The person table is for federated data, but admin flag can only apply to local users. Thats why it really belongs in the local_user table. This will also prevent the federation code from accidentally overwriting the admin flag * fmt * try to fix api tests * lint * fix person view * ci * ci --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
60 lines
1.8 KiB
Rust
60 lines
1.8 KiB
Rust
use crate::Perform;
|
|
use actix_web::web::Data;
|
|
use lemmy_api_common::{
|
|
context::LemmyContext,
|
|
person::{BlockPerson, BlockPersonResponse},
|
|
utils::local_user_view_from_jwt,
|
|
};
|
|
use lemmy_db_schema::{
|
|
source::person_block::{PersonBlock, PersonBlockForm},
|
|
traits::Blockable,
|
|
};
|
|
use lemmy_db_views::structs::LocalUserView;
|
|
use lemmy_db_views_actor::structs::PersonView;
|
|
use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl Perform for BlockPerson {
|
|
type Response = BlockPersonResponse;
|
|
|
|
#[tracing::instrument(skip(context))]
|
|
async fn perform(&self, context: &Data<LemmyContext>) -> Result<BlockPersonResponse, LemmyError> {
|
|
let data: &BlockPerson = self;
|
|
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
|
|
|
|
let target_id = data.person_id;
|
|
let person_id = local_user_view.person.id;
|
|
|
|
// Don't let a person block themselves
|
|
if target_id == person_id {
|
|
return Err(LemmyErrorType::CantBlockYourself)?;
|
|
}
|
|
|
|
let person_block_form = PersonBlockForm {
|
|
person_id,
|
|
target_id,
|
|
};
|
|
|
|
let target_user = LocalUserView::read_person(&mut context.pool(), target_id).await;
|
|
if target_user.map(|t| t.local_user.admin) == Ok(true) {
|
|
return Err(LemmyErrorType::CantBlockAdmin)?;
|
|
}
|
|
|
|
if data.block {
|
|
PersonBlock::block(&mut context.pool(), &person_block_form)
|
|
.await
|
|
.with_lemmy_type(LemmyErrorType::PersonBlockAlreadyExists)?;
|
|
} else {
|
|
PersonBlock::unblock(&mut context.pool(), &person_block_form)
|
|
.await
|
|
.with_lemmy_type(LemmyErrorType::PersonBlockAlreadyExists)?;
|
|
}
|
|
|
|
let person_view = PersonView::read(&mut context.pool(), target_id).await?;
|
|
Ok(BlockPersonResponse {
|
|
person_view,
|
|
blocked: data.block,
|
|
})
|
|
}
|
|
}
|