Deleting denied local_users older than a week. Fixes #4434

crates/db_schema/src/impls/local_user.rs

@@ -1,12 +1,6 @@
 use crate::{
   newtypes::{DbUrl, LocalUserId, PersonId},
-  schema::local_user::dsl::{
-    accepted_application,
-    email,
-    email_verified,
-    local_user,
-    password_encrypted,
-  },
+  schema::{local_user, registration_application},
   source::{
     actor_language::{LocalUserLanguage, SiteLanguage},
     local_user::{LocalUser, LocalUserInsertForm, LocalUserUpdateForm},
@@ -15,11 +9,18 @@ use crate::{
   utils::{
     functions::{coalesce, lower},
     get_conn,
+    now,
     DbPool,
   },
 };
 use bcrypt::{hash, DEFAULT_COST};
-use diesel::{dsl::insert_into, result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
+use diesel::{
+  dsl::{insert_into, IntervalDsl},
+  result::Error,
+  ExpressionMethods,
+  JoinOnDsl,
+  QueryDsl,
+};
 use diesel_async::RunQueryDsl;
 
 impl LocalUser {
@@ -31,16 +32,16 @@ impl LocalUser {
     let conn = &mut get_conn(pool).await?;
     let password_hash = hash(new_password, DEFAULT_COST).expect("Couldn't hash password");
 
-    diesel::update(local_user.find(local_user_id))
-      .set((password_encrypted.eq(password_hash),))
+    diesel::update(local_user::table.find(local_user_id))
+      .set((local_user::password_encrypted.eq(password_hash),))
       .get_result::<Self>(conn)
       .await
   }
 
   pub async fn set_all_users_email_verified(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    diesel::update(local_user)
-      .set(email_verified.eq(true))
+    diesel::update(local_user::table)
+      .set(local_user::email_verified.eq(true))
       .get_results::<Self>(conn)
       .await
   }
@@ -49,18 +50,31 @@ impl LocalUser {
     pool: &mut DbPool<'_>,
   ) -> Result<Vec<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    diesel::update(local_user)
-      .set(accepted_application.eq(true))
+    diesel::update(local_user::table)
+      .set(local_user::accepted_application.eq(true))
       .get_results::<Self>(conn)
       .await
   }
 
-  pub async fn is_email_taken(pool: &mut DbPool<'_>, email_: &str) -> Result<bool, Error> {
+  pub async fn delete_old_denied_local_users(pool: &mut DbPool<'_>) -> Result<usize, Error> {
+    let conn = &mut get_conn(pool).await?;
+
+    let old_denied_registrations = registration_application::table
+      .filter(registration_application::deny_reason.is_not_null())
+      .filter(registration_application::published.lt(now() - 1.week()))
+      .select(registration_application::local_user_id);
+
+    diesel::delete(local_user::table.filter(local_user::id.eq_any(old_denied_registrations)))
+      .execute(conn)
+      .await
+  }
+
+  pub async fn is_email_taken(pool: &mut DbPool<'_>, email: &str) -> Result<bool, Error> {
     use diesel::dsl::{exists, select};
     let conn = &mut get_conn(pool).await?;
-    select(exists(
-      local_user.filter(lower(coalesce(email, "")).eq(email_.to_lowercase())),
-    ))
+    select(exists(local_user::table.filter(
+      lower(coalesce(local_user::email, "")).eq(email.to_lowercase()),
+    )))
     .get_result(conn)
     .await
   }
@@ -162,7 +176,7 @@ impl Crud for LocalUser {
       hash(&form.password_encrypted, DEFAULT_COST).expect("Couldn't hash password");
     form_with_encrypted_password.password_encrypted = password_hash;
 
-    let local_user_ = insert_into(local_user)
+    let local_user_ = insert_into(local_user::table)
       .values(form_with_encrypted_password)
       .get_result::<Self>(conn)
       .await?;
@@ -185,7 +199,7 @@ impl Crud for LocalUser {
     form: &Self::UpdateForm,
   ) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
-    diesel::update(local_user.find(local_user_id))
+    diesel::update(local_user::table.find(local_user_id))
       .set(form)
       .get_result::<Self>(conn)
       .await

src/scheduled_tasks.rs

@@ -22,7 +22,10 @@ use lemmy_db_schema::{
     received_activity,
     sent_activity,
   },
-  source::instance::{Instance, InstanceForm},
+  source::{
+    instance::{Instance, InstanceForm},
+    local_user::LocalUser,
+  },
   utils::{get_conn, naive_now, now, DbPool, DELETED_REPLACEMENT_TEXT},
 };
 use lemmy_routes::nodeinfo::NodeInfo;
@@ -79,21 +82,16 @@ pub async fn setup(context: LemmyContext) -> Result<(), LemmyError> {
   });
 
   let context_1 = context.clone();
-  // Overwrite deleted & removed posts and comments every day
+  // Daily tasks:
+  // - Overwrite deleted & removed posts and comments every day
+  // - Delete old denied users
+  // - Update instance software
   scheduler.every(CTimeUnits::days(1)).run(move || {
     let context = context_1.clone();
 
     async move {
       overwrite_deleted_posts_and_comments(&mut context.pool()).await;
-    }
-  });
-
-  let context_1 = context.clone();
-  // Update the Instance Software
-  scheduler.every(CTimeUnits::days(1)).run(move || {
-    let context = context_1.clone();
-
-    async move {
+      delete_old_denied_users(&mut context.pool()).await;
       update_instance_software(&mut context.pool(), context.client())
         .await
         .map_err(|e| warn!("Failed to update instance software: {e}"))
@@ -115,6 +113,7 @@ async fn startup_jobs(pool: &mut DbPool<'_>) {
   update_banned_when_expired(pool).await;
   clear_old_activities(pool).await;
   overwrite_deleted_posts_and_comments(pool).await;
+  delete_old_denied_users(pool).await;
 }
 
 /// Update the hot_rank columns for the aggregates tables
@@ -320,6 +319,16 @@ async fn clear_old_activities(pool: &mut DbPool<'_>) {
   }
 }
 
+async fn delete_old_denied_users(pool: &mut DbPool<'_>) {
+  LocalUser::delete_old_denied_local_users(pool)
+    .await
+    .map(|_| {
+      info!("Done.");
+    })
+    .map_err(|e| error!("Failed to deleted old denied users: {e}"))
+    .ok();
+}
+
 /// overwrite posts and comments 30d after deletion
 async fn overwrite_deleted_posts_and_comments(pool: &mut DbPool<'_>) {
   info!("Overwriting deleted posts...");