r10s's comments

Author: iequidoo

deltachat-ffi/deltachat.h

@@ -7601,7 +7601,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used as info message.
 #define DC_STR_SECUREJOIN_TAKES_LONGER 192
 
-/// "❤️ Seems you're using Delta Chat!"… (donation request device message)
+/// "❤️ Seems you're enjoying Delta Chat!"… (donation request device message)
 #define DC_STR_DONATION_REQUEST 193
 
 /// "Contact". Deprecated, currently unused.

src/chat.rs

@@ -3231,37 +3231,28 @@ pub async fn send_videochat_invitation(context: &Context, chat_id: ChatId) -> Re
 }
 
 async fn donation_request_maybe(context: &Context) -> Result<()> {
-    let secs_between_checks = 14 * 24 * 60 * 60;
-    let secs_between_requests = 60 * 24 * 60 * 60;
+    let secs_between_checks = 30 * 24 * 60 * 60;
     let now = time();
     let ts = context
         .get_config_i64(Config::DonationRequestNextCheck)
         .await?;
-    let ts_new = if ts <= now {
-        let msg_cnt = context
-            .sql
-            .count(
-                "SELECT COUNT(*) FROM msgs WHERE state>=? AND hidden=0",
-                (MessageState::OutDelivered,),
-            )
-            .await?;
-        if msg_cnt < 50 {
-            // New users go here, so they won't get the message immediately.
-            now.saturating_add(secs_between_checks)
-        } else {
-            let mut msg = Message::new_text(stock_str::donation_request(context).await);
-            add_device_msg(context, None, Some(&mut msg)).await?;
-            now.saturating_add(secs_between_requests)
-        }
+    if ts > now {
+        return Ok(());
+    }
+    let msg_cnt = context.sql.count(
+        "SELECT COUNT(*) FROM msgs WHERE state>=? AND hidden=0",
+        (MessageState::OutDelivered,),
+    );
+    let ts = if ts == 0 || msg_cnt.await? < 100 {
+        now.saturating_add(secs_between_checks)
     } else {
-        cmp::min(ts, now.saturating_add(secs_between_requests))
+        let mut msg = Message::new_text(stock_str::donation_request(context).await);
+        add_device_msg(context, None, Some(&mut msg)).await?;
+        i64::MAX
     };
-    if ts_new != ts {
-        context
-            .set_config_internal(Config::DonationRequestNextCheck, Some(&ts_new.to_string()))
-            .await?;
-    }
-    Ok(())
+    context
+        .set_config_internal(Config::DonationRequestNextCheck, Some(&ts.to_string()))
+        .await
 }
 
 /// Chat message list request options.

src/stock_str.rs

@@ -434,11 +434,11 @@ pub enum StockMessage {
     ))]
     SecurejoinTakesLonger = 192,
 
-    #[strum(props(fallback = "❤️ Seems you're using Delta Chat!
+    #[strum(props(fallback = "❤️ Seems you're enjoying Delta Chat!
 
 Please consider donating to help that Delta Chat stays free for everyone.
 
-While Delta Chat is free to use and open source, development costs time and developers need money.
+While Delta Chat is free to use and open source, development costs money.
 Help keeping us to keep Delta Chat independent and make it more awesome in the future.
 
 https://delta.chat/donate"))]
@@ -839,7 +839,7 @@ pub(crate) async fn securejoin_takes_longer(context: &Context) -> String {
     translated(context, StockMessage::SecurejoinTakesLonger).await
 }
 
-/// Stock string: `❤️ Seems you're using Delta Chat!`…
+/// Stock string: `❤️ Seems you're enjoying Delta Chat!`…
 pub(crate) async fn donation_request(context: &Context) -> String {
     translated(context, StockMessage::DonationRequest).await
 }