Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / api / src / site / leave_admin.rs

diff --git a/crates/api/src/site/leave_admin.rs b/crates/api/src/site/leave_admin.rs
index b5754c9badfbcb853a0f31edf61af727c2a4de81..3781c73f2f30fd35179c519a38e3d62a6aa53cb3 100644 (file)
--- a/crates/api/src/site/leave_admin.rs
+++ b/crates/api/src/site/leave_admin.rs
@@ -1,50 +1,51 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
+  context::LemmyContext,
   site::{GetSiteResponse, LeaveAdmin},
-  utils::{blocking, build_federated_instances, get_local_user_view_from_jwt, is_admin},
+  utils::{is_admin, local_user_view_from_jwt},
 };
 use lemmy_db_schema::{
   source::{
     actor_language::SiteLanguage,
     language::Language,
     moderator::{ModAdd, ModAddForm},
-    person::Person,
+    person::{Person, PersonUpdateForm},
+    tagline::Tagline,
   },
   traits::Crud,
 };
-use lemmy_db_views::structs::SiteView;
-use lemmy_db_views_actor::structs::PersonViewSafe;
-use lemmy_utils::{error::LemmyError, version, ConnectionId};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_views::structs::{CustomEmojiView, SiteView};
+use lemmy_db_views_actor::structs::PersonView;
+use lemmy_utils::{
+  error::{LemmyError, LemmyErrorType},
+  version,
+};
 
 #[async_trait::async_trait(?Send)]
 impl Perform for LeaveAdmin {
   type Response = GetSiteResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<GetSiteResponse, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<GetSiteResponse, LemmyError> {
     let data: &LeaveAdmin = 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?;
 
     is_admin(&local_user_view)?;
 
     // Make sure there isn't just one admin (so if one leaves, there will still be one left)
-    let admins = blocking(context.pool(), PersonViewSafe::admins).await??;
+    let admins = PersonView::admins(&mut context.pool()).await?;
     if admins.len() == 1 {
-      return Err(LemmyError::from_message("cannot_leave_admin"));
+      return Err(LemmyErrorType::CannotLeaveAdmin)?;
     }
 
     let person_id = local_user_view.person.id;
-    blocking(context.pool(), move |conn| {
-      Person::leave_admin(conn, person_id)
-    })
-    .await??;
+    Person::update(
+      &mut context.pool(),
+      person_id,
+      &PersonUpdateForm::builder().admin(Some(false)).build(),
+    )
+    .await?;
 
     // Mod tables
     let form = ModAddForm {
@@ -53,26 +54,27 @@ impl Perform for LeaveAdmin {
       removed: Some(true),
     };
 
-    blocking(context.pool(), move |conn| ModAdd::create(conn, &form)).await??;
+    ModAdd::create(&mut context.pool(), &form).await?;
 
     // Reread site and admins
-    let site_view = blocking(context.pool(), SiteView::read_local).await??;
-    let admins = blocking(context.pool(), PersonViewSafe::admins).await??;
-
-    let federated_instances = build_federated_instances(context.pool(), context.settings()).await?;
+    let site_view = SiteView::read_local(&mut context.pool()).await?;
+    let admins = PersonView::admins(&mut context.pool()).await?;
 
-    let all_languages = blocking(context.pool(), Language::read_all).await??;
-    let discussion_languages = blocking(context.pool(), SiteLanguage::read_local).await??;
+    let all_languages = Language::read_all(&mut context.pool()).await?;
+    let discussion_languages = SiteLanguage::read_local_raw(&mut context.pool()).await?;
+    let taglines = Tagline::get_all(&mut context.pool(), site_view.local_site.id).await?;
+    let custom_emojis =
+      CustomEmojiView::get_all(&mut context.pool(), site_view.local_site.id).await?;
 
     Ok(GetSiteResponse {
-      site_view: Some(site_view),
+      site_view,
       admins,
-      online: 0,
       version: version::VERSION.to_string(),
       my_user: None,
-      federated_instances,
       all_languages,
       discussion_languages,
+      taglines,
+      custom_emojis,
     })
   }
 }