X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi%2Fsrc%2Fcommunity%2Fadd_mod.rs;h=2d7b88750a9d6136bea32f8f160fd9c59cf743f5;hb=27be1efb74d6761046999980561a343d06235674;hp=ce3082f7144e796f6d2b7db907e88b70d3d8c742;hpb=c6c52ab9ccde330b5012f8d0ce4fc8f26628d5cc;p=lemmy.git

diff --git a/crates/api/src/community/add_mod.rs b/crates/api/src/community/add_mod.rs
index ce3082f7..2d7b8875 100644
--- a/crates/api/src/community/add_mod.rs
+++ b/crates/api/src/community/add_mod.rs
@@ -1,10 +1,10 @@
-use crate::Perform;
-use actix_web::web::Data;
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
 use lemmy_api_common::{
   community::{AddModToCommunity, AddModToCommunityResponse},
   context::LemmyContext,
-  utils::{get_local_user_view_from_jwt, is_mod_or_admin},
-  websocket::{messages::SendCommunityRoomMessage, UserOperation},
+  send_activity::{ActivityChannel, SendActivityData},
+  utils::{is_mod_or_admin, local_user_view_from_jwt},
 };
 use lemmy_db_schema::{
   source::{
@@ -14,68 +14,64 @@ use lemmy_db_schema::{
   traits::{Crud, Joinable},
 };
 use lemmy_db_views_actor::structs::CommunityModeratorView;
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
-#[async_trait::async_trait(?Send)]
-impl Perform for AddModToCommunity {
-  type Response = AddModToCommunityResponse;
+#[tracing::instrument(skip(context))]
+pub async fn add_mod_to_community(
+  data: Json<AddModToCommunity>,
+  context: Data<LemmyContext>,
+) -> Result<Json<AddModToCommunityResponse>, LemmyError> {
+  let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
 
-  #[tracing::instrument(skip(context, websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
-  ) -> Result<AddModToCommunityResponse, LemmyError> {
-    let data: &AddModToCommunity = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+  let community_id = data.community_id;
 
-    let community_id = data.community_id;
+  // Verify that only mods or admins can add mod
+  is_mod_or_admin(&mut context.pool(), local_user_view.person.id, community_id).await?;
+  let community = Community::read(&mut context.pool(), community_id).await?;
+  if local_user_view.person.admin && !community.local {
+    return Err(LemmyErrorType::NotAModerator)?;
+  }
 
-    // Verify that only mods or admins can add mod
-    is_mod_or_admin(context.pool(), local_user_view.person.id, community_id).await?;
-    let community = Community::read(context.pool(), community_id).await?;
-    if local_user_view.person.admin && !community.local {
-      return Err(LemmyError::from_message("not_a_moderator"));
-    }
+  // Update in local database
+  let community_moderator_form = CommunityModeratorForm {
+    community_id: data.community_id,
+    person_id: data.person_id,
+  };
+  if data.added {
+    CommunityModerator::join(&mut context.pool(), &community_moderator_form)
+      .await
+      .with_lemmy_type(LemmyErrorType::CommunityModeratorAlreadyExists)?;
+  } else {
+    CommunityModerator::leave(&mut context.pool(), &community_moderator_form)
+      .await
+      .with_lemmy_type(LemmyErrorType::CommunityModeratorAlreadyExists)?;
+  }
 
-    // Update in local database
-    let community_moderator_form = CommunityModeratorForm {
-      community_id: data.community_id,
-      person_id: data.person_id,
-    };
-    if data.added {
-      CommunityModerator::join(context.pool(), &community_moderator_form)
-        .await
-        .map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
-    } else {
-      CommunityModerator::leave(context.pool(), &community_moderator_form)
-        .await
-        .map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
-    }
+  // Mod tables
+  let form = ModAddCommunityForm {
+    mod_person_id: local_user_view.person.id,
+    other_person_id: data.person_id,
+    community_id: data.community_id,
+    removed: Some(!data.added),
+  };
 
-    // Mod tables
-    let form = ModAddCommunityForm {
-      mod_person_id: local_user_view.person.id,
-      other_person_id: data.person_id,
-      community_id: data.community_id,
-      removed: Some(!data.added),
-    };
+  ModAddCommunity::create(&mut context.pool(), &form).await?;
 
-    ModAddCommunity::create(context.pool(), &form).await?;
+  // Note: in case a remote mod is added, this returns the old moderators list, it will only get
+  //       updated once we receive an activity from the community (like `Announce/Add/Moderator`)
+  let community_id = data.community_id;
+  let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id).await?;
 
-    // Note: in case a remote mod is added, this returns the old moderators list, it will only get
-    //       updated once we receive an activity from the community (like `Announce/Add/Moderator`)
-    let community_id = data.community_id;
-    let moderators = CommunityModeratorView::for_community(context.pool(), community_id).await?;
+  ActivityChannel::submit_activity(
+    SendActivityData::AddModToCommunity(
+      local_user_view.person,
+      data.community_id,
+      data.person_id,
+      data.added,
+    ),
+    &context,
+  )
+  .await?;
 
-    let res = AddModToCommunityResponse { moderators };
-    context.chat_server().do_send(SendCommunityRoomMessage {
-      op: UserOperation::AddModToCommunity,
-      response: res.clone(),
-      community_id,
-      websocket_id,
-    });
-    Ok(res)
-  }
+  Ok(Json(AddModToCommunityResponse { moderators }))
 }