Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-22 08:16:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: use the same webxdc ratelimit for all email servers

Browse Source 
This removes another distinction between chatmail and non-chatmail
and fixes flaky tests/test_webxdc.py::test_webxdc

Closes <https://github.com/chatmail/core/issues/7522>
This commit is contained in:
link2xt
2025-11-25 22:29:39 +00:00
committed by l
parent b1fa1055d7
commit 6b6ec2a4b7
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/context.rs
View File

@@ -453,7 +453,7 @@ impl Context {
translated_stockstrings: stockstrings, translated_stockstrings: stockstrings,
events, events,
scheduler: SchedulerState::new(), scheduler: SchedulerState::new(),
ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow at least 1 message every 10 seconds + a burst of 6. ratelimit: RwLock::new(Ratelimit::new(Duration::new(3, 0), 3.0)), // Allow at least 1 message every second + a burst of 3.
quota: RwLock::new(None), quota: RwLock::new(None),
new_msgs_notify, new_msgs_notify,
server_id: RwLock::new(None), server_id: RwLock::new(None),
@@ -485,12 +485,6 @@ impl Context {
return; return;
} }
if self.is_chatmail().await.unwrap_or_default() {
let mut lock = self.ratelimit.write().await;
// Allow at least 1 message every second + a burst of 3.
*lock = Ratelimit::new(Duration::new(3, 0), 3.0);
}
// The next line is mainly for iOS: // The next line is mainly for iOS:
// iOS starts a separate process for receiving notifications and if the user concurrently // iOS starts a separate process for receiving notifications and if the user concurrently
// starts the app, the UI process opens the database but waits with calling start_io() // starts the app, the UI process opens the database but waits with calling start_io()

2
src/webxdc/webxdc_tests.rs
View File

@@ -1289,7 +1289,7 @@ async fn test_get_webxdc_info() -> Result<()> {
let info = instance.get_webxdc_info(&t).await?; let info = instance.get_webxdc_info(&t).await?;
assert_eq!(info.name, "minimal.xdc"); assert_eq!(info.name, "minimal.xdc");
assert_eq!(info.icon, WEBXDC_DEFAULT_ICON.to_string()); assert_eq!(info.icon, WEBXDC_DEFAULT_ICON.to_string());
assert_eq!(info.send_update_interval, 10000); assert_eq!(info.send_update_interval, 1000);
assert_eq!(info.send_update_max_size, RECOMMENDED_FILE_SIZE as usize); assert_eq!(info.send_update_max_size, RECOMMENDED_FILE_SIZE as usize);
let mut instance = create_webxdc_instance( let mut instance = create_webxdc_instance(