Merge branch 'main' into prop/message-prerender

1 files changed, 5 insertions, 4 deletions

diff --git a/src/channel/app.rs b/src/channel/app.rs
index 21784e9..1e341e3 100644
--- a/src/channel/app.rs
+++ b/src/channel/app.rs
@@ -97,8 +97,9 @@ impl<'a> Channels<'a> {
     }
 
     pub async fn expire(&self, relative_to: &DateTime) -> Result<(), ExpireError> {
-        // Somewhat arbitrarily, expire after 90 days.
-        let expire_at = relative_to.to_owned() - TimeDelta::days(90);
+        // Somewhat arbitrarily, expire after 7 days. Active channels will not be
+        // expired until their messages expire.
+        let expire_at = relative_to.to_owned() - TimeDelta::days(7);
 
         let mut tx = self.db.begin().await?;
         let expired = tx.channels().expired(&expire_at).await?;
@@ -128,8 +129,8 @@ impl<'a> Channels<'a> {
     }
 
     pub async fn purge(&self, relative_to: &DateTime) -> Result<(), sqlx::Error> {
-        // Somewhat arbitrarily, purge after 7 days.
-        let purge_at = relative_to.to_owned() - TimeDelta::days(7);
+        // Somewhat arbitrarily, purge after 6 hours.
+        let purge_at = relative_to.to_owned() - TimeDelta::hours(6);
 
         let mut tx = self.db.begin().await?;
         tx.channels().purge(&purge_at).await?;