Fix delete stale events with no expiration

Author: nicolaschan

src/crypto/encode.rs

@@ -1,5 +1,5 @@
-use anyhow::{anyhow, Result};
-use base64::{engine::general_purpose::URL_SAFE, Engine};
+use anyhow::{Result, anyhow};
+use base64::{Engine, engine::general_purpose::URL_SAFE};
 use ed25519_dalek::VerifyingKey;
 
 pub fn bytes_to_string(bytes: &[u8]) -> String {

src/crypto/key.rs

@@ -1,15 +1,15 @@
 use crate::configuration::Configuration;
-use anyhow::{anyhow, Context, Result};
-use ed25519_dalek::{ed25519::signature::SignerMut, SigningKey, VerifyingKey};
+use anyhow::{Context, Result, anyhow};
+use ed25519_dalek::{SigningKey, VerifyingKey, ed25519::signature::SignerMut};
 use rand::rngs::OsRng;
 
 use tokio::io::AsyncWriteExt;
 use tracing::debug;
 
 use super::{
+    Signed,
     encode::{bytes_to_string, string_to_bytes},
     signed::Signable,
-    Signed,
 };
 
 fn generate_signing_key() -> SigningKey {

src/main.rs

@@ -9,7 +9,7 @@ use baybridge::{
     models::{Name, Value},
     server::http::start_http_server,
 };
-use clap::{command, Parser, Subcommand};
+use clap::{Parser, Subcommand, command};
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]

src/server/sqlite_store.rs

@@ -8,7 +8,7 @@ use tracing::debug;
 use crate::{
     api::StateHash,
     client::Event,
-    crypto::{encode::encode_verifying_key, Signed},
+    crypto::{Signed, encode::encode_verifying_key},
 };
 
 #[derive(Clone)]
@@ -151,15 +151,26 @@ impl SqliteStore {
         let priority = event.inner.priority();
 
         let database_guard = self.connection.lock().await;
-        let num_deleted = database_guard.execute(
-            "DELETE FROM events WHERE verifying_key = ? AND name = ? AND expires_at < ? AND priority < ?",
-            params![
-                encode_verifying_key(&verifying_key).as_bytes(),
-                name.as_str().as_bytes(),
-                expires_at,
-                priority,
-            ],
-        )?;
+
+        let num_deleted = match expires_at {
+            Some(expires_at) => database_guard.execute(
+                "DELETE FROM events WHERE verifying_key = ? AND name = ? AND expires_at < ? AND priority < ?",
+                params![
+                    encode_verifying_key(&verifying_key).as_bytes(),
+                    name.as_str().as_bytes(),
+                    expires_at,
+                    priority,
+                ],
+            )?,
+            None => database_guard.execute(
+                "DELETE FROM events WHERE verifying_key = ? AND name = ? AND priority < ?",
+                params![
+                    encode_verifying_key(&verifying_key).as_bytes(),
+                    name.as_str().as_bytes(),
+                    priority,
+                ],
+            )?,
+        };
         Ok(num_deleted)
     }