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

[lemmy.git] / crates / db_views_actor / src / community_person_ban_view.rs

diff --git a/crates/db_views_actor/src/community_person_ban_view.rs b/crates/db_views_actor/src/community_person_ban_view.rs
index 6c67bd82a12b711fdbbe3f514adf1effd284ed72..705b4bf7706082b61edbf3d68d7b0570dacdd85b 100644 (file)
--- a/crates/db_views_actor/src/community_person_ban_view.rs
+++ b/crates/db_views_actor/src/community_person_ban_view.rs
@@ -1,43 +1,29 @@
-use diesel::{dsl::*, result::Error, *};
+use crate::structs::CommunityPersonBanView;
+use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
   newtypes::{CommunityId, PersonId},
   schema::{community, community_person_ban, person},
-  source::{
-    community::{Community, CommunitySafe},
-    person::{Person, PersonSafe},
-  },
-  traits::ToSafe,
+  source::{community::Community, person::Person},
+  utils::{get_conn, DbPool},
 };
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct CommunityPersonBanView {
-  pub community: CommunitySafe,
-  pub person: PersonSafe,
-}
 
 impl CommunityPersonBanView {
-  pub fn get(
-    conn: &PgConnection,
+  pub async fn get(
+    pool: &mut DbPool<'_>,
     from_person_id: PersonId,
     from_community_id: CommunityId,
   ) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
     let (community, person) = community_person_ban::table
       .inner_join(community::table)
       .inner_join(person::table)
-      .select((
-        Community::safe_columns_tuple(),
-        Person::safe_columns_tuple(),
-      ))
+      .select((community::all_columns, person::all_columns))
       .filter(community_person_ban::community_id.eq(from_community_id))
       .filter(community_person_ban::person_id.eq(from_person_id))
-      .filter(
-        community_person_ban::expires
-          .is_null()
-          .or(community_person_ban::expires.gt(now)),
-      )
       .order_by(community_person_ban::published)
-      .first::<(CommunitySafe, PersonSafe)>(conn)?;
+      .first::<(Community, Person)>(conn)
+      .await?;
 
     Ok(CommunityPersonBanView { community, person })
   }