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

[lemmy.git] / crates / db_views_moderator / src / mod_remove_post_view.rs

diff --git a/crates/db_views_moderator/src/mod_remove_post_view.rs b/crates/db_views_moderator/src/mod_remove_post_view.rs
index c1bc2e8f5f87de05ab1907ecdfe411ba65c7e79b..74cd3c4899bc7c4f5abbce6c9291dfda118c0679 100644 (file)
--- a/crates/db_views_moderator/src/mod_remove_post_view.rs
+++ b/crates/db_views_moderator/src/mod_remove_post_view.rs
@@ -1,22 +1,28 @@
 use crate::structs::{ModRemovePostView, ModlogListParams};
-use diesel::{result::Error, *};
+use diesel::{
+  result::Error,
+  BoolExpressionMethods,
+  ExpressionMethods,
+  IntoSql,
+  JoinOnDsl,
+  NullableExpressionMethods,
+  QueryDsl,
+};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
   newtypes::PersonId,
   schema::{community, mod_remove_post, person, post},
-  source::{
-    community::{Community, CommunitySafe},
-    moderator::ModRemovePost,
-    person::{Person, PersonSafe},
-    post::Post,
-  },
-  traits::{ToSafe, ViewToVec},
-  utils::limit_and_offset,
+  source::{community::Community, moderator::ModRemovePost, person::Person, post::Post},
+  traits::JoinView,
+  utils::{get_conn, limit_and_offset, DbPool},
 };
 
-type ModRemovePostViewTuple = (ModRemovePost, Option<PersonSafe>, Post, CommunitySafe);
+type ModRemovePostViewTuple = (ModRemovePost, Option<Person>, Post, Community);
 
 impl ModRemovePostView {
-  pub fn list(conn: &mut PgConnection, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+  pub async fn list(pool: &mut DbPool<'_>, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
+
     let person_alias_1 = diesel::alias!(person as person1);
     let admin_person_id_join = params.mod_person_id.unwrap_or(PersonId(-1));
     let show_mod_names = !params.hide_modlog_names;
@@ -32,9 +38,9 @@ impl ModRemovePostView {
       .inner_join(person_alias_1.on(post::creator_id.eq(person_alias_1.field(person::id))))
       .select((
         mod_remove_post::all_columns,
-        Person::safe_columns_tuple().nullable(),
+        person::all_columns.nullable(),
         post::all_columns,
-        Community::safe_columns_tuple(),
+        community::all_columns,
       ))
       .into_boxed();
 
@@ -56,24 +62,22 @@ impl ModRemovePostView {
       .limit(limit)
       .offset(offset)
       .order_by(mod_remove_post::when_.desc())
-      .load::<ModRemovePostViewTuple>(conn)?;
+      .load::<ModRemovePostViewTuple>(conn)
+      .await?;
 
-    let results = Self::from_tuple_to_vec(res);
+    let results = res.into_iter().map(Self::from_tuple).collect();
     Ok(results)
   }
 }
 
-impl ViewToVec for ModRemovePostView {
-  type DbTuple = ModRemovePostViewTuple;
-  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
-    items
-      .into_iter()
-      .map(|a| Self {
-        mod_remove_post: a.0,
-        moderator: a.1,
-        post: a.2,
-        community: a.3,
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for ModRemovePostView {
+  type JoinTuple = ModRemovePostViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      mod_remove_post: a.0,
+      moderator: a.1,
+      post: a.2,
+      community: a.3,
+    }
   }
 }