From: Dessalines <tyhou13@gmx.com>
Date: Wed, 30 Mar 2022 13:56:23 +0000 (-0400)
Subject: Adding a ban expires update job. Fixes #2177
X-Git-Url: http://these/git/%7Bsrc%7D?a=commitdiff_plain;h=3ad172e8ed9e0458bb21daaa5fd745b9159a98da;p=lemmy.git

Adding a ban expires update job. Fixes #2177
---

diff --git a/src/scheduled_tasks.rs b/src/scheduled_tasks.rs
index f416fb7b..23c4fdc4 100644
--- a/src/scheduled_tasks.rs
+++ b/src/scheduled_tasks.rs
@@ -13,12 +13,14 @@ pub fn setup(pool: DbPool) -> Result<(), LemmyError> {
 
   let conn = pool.get()?;
   active_counts(&conn);
+  update_banned_when_expired(&conn);
 
   // On startup, reindex the tables non-concurrently
   // TODO remove this for now, since it slows down startup a lot on lemmy.ml
   reindex_aggregates_tables(&conn, true);
   scheduler.every(1.hour()).run(move || {
     active_counts(&conn);
+    update_banned_when_expired(&conn);
     reindex_aggregates_tables(&conn, true);
   });
 
@@ -91,3 +93,13 @@ fn active_counts(conn: &PgConnection) {
 
   info!("Done.");
 }
+
+/// Set banned to false after ban expires
+fn update_banned_when_expired(conn: &PgConnection) {
+  info!("Updating banned column if it expires ...");
+  let update_ban_expires_stmt =
+    format!("update person set banned = false where banned = true and ban_expires < now()");
+  sql_query(update_ban_expires_stmt)
+    .execute(conn)
+    .expect("update banned when expires");
+}