Add test for message stats, and fix bugs

Author: Hocuri

src/config.rs

@@ -22,7 +22,7 @@ use crate::login_param::ConfiguredLoginParam;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
 use crate::provider::{Provider, get_provider_by_id};
 use crate::sync::{self, Sync::*, SyncData};
-use crate::tools::get_abs_path;
+use crate::tools::{get_abs_path, time};
 
 /// The available configuration keys.
 #[derive(
@@ -837,7 +837,7 @@ impl Context {
             Config::SelfReporting => {
                 self.sql.set_raw_config(key.as_ref(), value).await?;
                 self.sql
-                    .set_raw_config(Config::SelfReportingEnabledTimestamp.as_ref(), value)
+                    .set_raw_config_int64(Config::SelfReportingEnabledTimestamp.as_ref(), time())
                     .await?;
             }
             _ => {

src/self_reporting.rs

@@ -433,7 +433,8 @@ async fn get_message_stats(
         let to_verified = t.query_row(
             "SELECT COUNT(*) FROM msgs
             WHERE chat_id IN temp.verified_chats
-            AND chat_id<>? AND id>9 AND timestamp_sent>?",
+            AND chat_id<>? AND id>9 AND timestamp>=? AND hidden=0
+            AND NOT (param GLOB '*\nS=*' OR param GLOB 'S=*')",
             (selfreporting_bot_chat_id, last_selfreport_time),
             |row| row.get(0),
         )?;
@@ -442,7 +443,8 @@ async fn get_message_stats(
             "SELECT COUNT(*) FROM msgs
             WHERE chat_id not IN temp.verified_chats
             AND (param GLOB '*\nc=1*' OR param GLOB 'c=1*')
-            AND chat_id<>? AND id>9 AND timestamp_sent>?",
+            AND chat_id<>? AND id>9 AND timestamp>=? AND hidden=0
+            AND NOT (param GLOB '*\nS=*' OR param GLOB 'S=*')",
             (selfreporting_bot_chat_id, last_selfreport_time),
             |row| row.get(0),
         )?;
@@ -451,7 +453,8 @@ async fn get_message_stats(
             "SELECT COUNT(*) FROM msgs
             WHERE chat_id not IN temp.verified_chats
             AND NOT (param GLOB '*\nc=1*' OR param GLOB 'c=1*')
-            AND chat_id<>? AND id>9 AND timestamp_sent>=?",
+            AND chat_id<>? AND id>9 AND timestamp>=? AND hidden=0
+            AND NOT (param GLOB '*\nS=*' OR param GLOB 'S=*')",
             (selfreporting_bot_chat_id, last_selfreport_time),
             |row| row.get(0),
         )?;

src/self_reporting/self_reporting_tests.rs

@@ -82,6 +82,54 @@ async fn test_self_report_one_contact() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_message_stats() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+    let bob = &tcm.bob().await;
+    alice.set_config_bool(Config::SelfReporting, true).await?;
+    let email_chat = alice.create_email_chat(bob).await;
+    let encrypted_chat = alice.create_chat(bob).await;
+
+    let mut expected = MessageStats {
+        to_verified: 0,
+        unverified_encrypted: 0,
+        unencrypted: 0,
+    };
+
+    check_message_stats_report(alice, &expected).await;
+
+    alice.send_text(email_chat.id, "foo").await;
+    expected.unencrypted += 1;
+    check_message_stats_report(alice, &expected).await;
+
+    alice.send_text(encrypted_chat.id, "foo").await;
+    expected.unverified_encrypted += 1;
+    check_message_stats_report(alice, &expected).await;
+
+    alice.send_text(encrypted_chat.id, "foo").await;
+    expected.unverified_encrypted += 1;
+    check_message_stats_report(alice, &expected).await;
+
+    tcm.execute_securejoin(alice, bob).await;
+    expected.to_verified = expected.unverified_encrypted;
+    expected.unverified_encrypted = 0;
+    check_message_stats_report(alice, &expected).await;
+
+    Ok(())
+}
+
+async fn check_message_stats_report(context: &TestContext, expected: &MessageStats) {
+    let report = get_self_report(context, 0).await.unwrap();
+    let actual: serde_json::Value = serde_json::from_str(&report).unwrap();
+    let actual = &actual["message_stats"];
+
+    let expected = serde_json::to_string_pretty(&expected).unwrap();
+    let expected: serde_json::Value = serde_json::from_str(&expected).unwrap();
+
+    assert_eq!(actual, &expected);
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_self_report_securejoin_source_stats() -> Result<()> {
     let mut tcm = TestContextManager::new();
@@ -149,5 +197,5 @@ async fn check_securejoin_report(context: &TestContext, expected: &SecurejoinSou
     let expected = serde_json::to_string_pretty(&expected).unwrap();
     let expected: serde_json::Value = serde_json::from_str(&expected).unwrap();
 
-    assert_eq!(&expected, actual);
+    assert_eq!(actual, &expected);
 }