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

[lemmy.git] / crates / api / src / local_user / list_banned.rs

diff --git a/crates/api/src/local_user/list_banned.rs b/crates/api/src/local_user/list_banned.rs
index 60eb32b35ec4251126a8886684fbf3cb00449b51..9391a4bbf914472c55895aac40aea76ca95a2aec 100644 (file)
--- a/crates/api/src/local_user/list_banned.rs
+++ b/crates/api/src/local_user/list_banned.rs
@@ -3,31 +3,24 @@ use actix_web::web::Data;
 use lemmy_api_common::{
   context::LemmyContext,
   person::{BannedPersonsResponse, GetBannedPersons},
-  utils::{get_local_user_view_from_jwt, is_admin},
+  utils::{is_admin, local_user_view_from_jwt},
 };
-use lemmy_db_views_actor::structs::PersonViewSafe;
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_db_views_actor::structs::PersonView;
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for GetBannedPersons {
   type Response = BannedPersonsResponse;
 
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<Self::Response, LemmyError> {
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
     let data: &GetBannedPersons = 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 banned = PersonViewSafe::banned(context.pool()).await?;
+    let banned = PersonView::banned(&mut context.pool()).await?;
 
-    let res = Self::Response { banned };
-
-    Ok(res)
+    Ok(Self::Response { banned })
   }
 }