Adding email admins for new applications. Fixes #2271 (#2390)

[lemmy.git] / crates / db_views / src / local_user_view.rs

diff --git a/crates/db_views/src/local_user_view.rs b/crates/db_views/src/local_user_view.rs
index 12c26df6d0987f24d31662d116d50143f8f62096..b5a758b84e982a736e249fd87adf3f9be04b9087 100644 (file)
--- a/crates/db_views/src/local_user_view.rs
+++ b/crates/db_views/src/local_user_view.rs
@@ -8,14 +8,14 @@ use lemmy_db_schema::{
     local_user::{LocalUser, LocalUserSettings},
     person::{Person, PersonSafe},
   },
-  traits::{ToSafe, ToSafeSettings},
+  traits::{ToSafe, ToSafeSettings, ViewToVec},
   utils::functions::lower,
 };
 
 type LocalUserViewTuple = (LocalUser, Person, PersonAggregates);
 
 impl LocalUserView {
-  pub fn read(conn: &PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
+  pub fn read(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
     let (local_user, person, counts) = local_user::table
       .find(local_user_id)
       .inner_join(person::table)
@@ -33,7 +33,7 @@ impl LocalUserView {
     })
   }
 
-  pub fn read_person(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
+  pub fn read_person(conn: &mut PgConnection, person_id: PersonId) -> Result<Self, Error> {
     let (local_user, person, counts) = local_user::table
       .filter(person::id.eq(person_id))
       .inner_join(person::table)
@@ -52,7 +52,7 @@ impl LocalUserView {
   }
 
   // TODO check where this is used
-  pub fn read_from_name(conn: &PgConnection, name: &str) -> Result<Self, Error> {
+  pub fn read_from_name(conn: &mut PgConnection, name: &str) -> Result<Self, Error> {
     let (local_user, person, counts) = local_user::table
       .filter(person::name.eq(name))
       .inner_join(person::table)
@@ -70,7 +70,10 @@ impl LocalUserView {
     })
   }
 
-  pub fn find_by_email_or_name(conn: &PgConnection, name_or_email: &str) -> Result<Self, Error> {
+  pub fn find_by_email_or_name(
+    conn: &mut PgConnection,
+    name_or_email: &str,
+  ) -> Result<Self, Error> {
     let (local_user, person, counts) = local_user::table
       .inner_join(person::table)
       .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
@@ -92,7 +95,7 @@ impl LocalUserView {
     })
   }
 
-  pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<Self, Error> {
+  pub fn find_by_email(conn: &mut PgConnection, from_email: &str) -> Result<Self, Error> {
     let (local_user, person, counts) = local_user::table
       .inner_join(person::table)
       .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
@@ -114,7 +117,7 @@ impl LocalUserView {
 type LocalUserSettingsViewTuple = (LocalUserSettings, PersonSafe, PersonAggregates);
 
 impl LocalUserSettingsView {
-  pub fn read(conn: &PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
+  pub fn read(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
     let (local_user, person, counts) = local_user::table
       .find(local_user_id)
       .inner_join(person::table)
@@ -131,4 +134,34 @@ impl LocalUserSettingsView {
       counts,
     })
   }
+
+  pub fn list_admins_with_emails(conn: &mut PgConnection) -> Result<Vec<Self>, Error> {
+    let res = local_user::table
+      .filter(person::admin.eq(true))
+      .filter(local_user::email.is_not_null())
+      .inner_join(person::table)
+      .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
+      .select((
+        LocalUser::safe_settings_columns_tuple(),
+        Person::safe_columns_tuple(),
+        person_aggregates::all_columns,
+      ))
+      .load::<LocalUserSettingsViewTuple>(conn)?;
+
+    Ok(LocalUserSettingsView::from_tuple_to_vec(res))
+  }
+}
+
+impl ViewToVec for LocalUserSettingsView {
+  type DbTuple = LocalUserSettingsViewTuple;
+  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
+    items
+      .into_iter()
+      .map(|a| Self {
+        local_user: a.0,
+        person: a.1,
+        counts: a.2,
+      })
+      .collect::<Vec<Self>>()
+  }
 }