use crate::Perform;
use actix_web::web::Data;
use lemmy_api_common::{
+ context::LemmyContext,
person::{AddAdmin, AddAdminResponse},
- utils::{get_local_user_view_from_jwt, is_admin},
+ utils::{is_admin, local_user_view_from_jwt},
};
use lemmy_db_schema::{
source::{
},
traits::Crud,
};
-use lemmy_db_views_actor::structs::PersonViewSafe;
-use lemmy_utils::{error::LemmyError, ConnectionId};
-use lemmy_websocket::{messages::SendAllMessage, LemmyContext, UserOperation};
+use lemmy_db_views_actor::structs::PersonView;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
#[async_trait::async_trait(?Send)]
impl Perform for AddAdmin {
type Response = AddAdminResponse;
- #[tracing::instrument(skip(context, websocket_id))]
- async fn perform(
- &self,
- context: &Data<LemmyContext>,
- websocket_id: Option<ConnectionId>,
- ) -> Result<AddAdminResponse, LemmyError> {
+ #[tracing::instrument(skip(context))]
+ async fn perform(&self, context: &Data<LemmyContext>) -> Result<AddAdminResponse, LemmyError> {
let data: &AddAdmin = self;
- let local_user_view =
- get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+ let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
// Make sure user is an admin
is_admin(&local_user_view)?;
let added = data.added;
let added_person_id = data.person_id;
let added_admin = Person::update(
- context.pool(),
+ &mut context.pool(),
added_person_id,
&PersonUpdateForm::builder().admin(Some(added)).build(),
)
.await
- .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_user"))?;
+ .with_lemmy_type(LemmyErrorType::CouldntUpdateUser)?;
// Mod tables
let form = ModAddForm {
removed: Some(!data.added),
};
- ModAdd::create(context.pool(), &form).await?;
+ ModAdd::create(&mut context.pool(), &form).await?;
- let admins = PersonViewSafe::admins(context.pool()).await?;
+ let admins = PersonView::admins(&mut context.pool()).await?;
- let res = AddAdminResponse { admins };
-
- context.chat_server().do_send(SendAllMessage {
- op: UserOperation::AddAdmin,
- response: res.clone(),
- websocket_id,
- });
-
- Ok(res)
+ Ok(AddAdminResponse { admins })
}
}