From d8f07b2c5fe74283c6a37713a6b7829606b136f3 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Thu, 31 Oct 2024 13:33:14 +0100 Subject: [PATCH] feat: Enable Webxdc realtime by default (#6125) --- deltachat-ffi/deltachat.h | 4 ++-- src/config.rs | 1 + src/peer_channels.rs | 38 +++++--------------------------------- 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index 688291339..34ff1914e 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -530,8 +530,8 @@ char* dc_get_blobdir (const dc_context_t* context); * These keys go to backups and allow easy per-account settings when using @ref dc_accounts_t, * however, are not handled by the core otherwise. * - `webxdc_realtime_enabled` = Whether the realtime APIs should be enabled. - * 0 = WebXDC realtime API is disabled and behaves as noop (default). - * 1 = WebXDC realtime API is enabled. + * 0 = WebXDC realtime API is disabled and behaves as noop. + * 1 = WebXDC realtime API is enabled (default). * * If you want to retrieve a value, use dc_get_config(). * diff --git a/src/config.rs b/src/config.rs index 687537641..ad279068b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -433,6 +433,7 @@ pub enum Config { WebxdcIntegration, /// Enable webxdc realtime features. + #[strum(props(default = "1"))] WebxdcRealtimeEnabled, } diff --git a/src/peer_channels.rs b/src/peer_channels.rs index 504f3b387..254c7dd3b 100644 --- a/src/peer_channels.rs +++ b/src/peer_channels.rs @@ -590,17 +590,6 @@ mod tests { let alice = &mut tcm.alice().await; let bob = &mut tcm.bob().await; - bob.ctx - .set_config_bool(Config::WebxdcRealtimeEnabled, true) - .await - .unwrap(); - - alice - .ctx - .set_config_bool(Config::WebxdcRealtimeEnabled, true) - .await - .unwrap(); - // Alice sends webxdc to bob let alice_chat = alice.create_chat(bob).await; let mut instance = Message::new(Viewtype::File); @@ -739,17 +728,6 @@ mod tests { let alice = &mut tcm.alice().await; let bob = &mut tcm.bob().await; - bob.ctx - .set_config_bool(Config::WebxdcRealtimeEnabled, true) - .await - .unwrap(); - - alice - .ctx - .set_config_bool(Config::WebxdcRealtimeEnabled, true) - .await - .unwrap(); - assert!(alice .get_config_bool(Config::WebxdcRealtimeEnabled) .await @@ -907,17 +885,6 @@ mod tests { let alice = &mut tcm.alice().await; let bob = &mut tcm.bob().await; - bob.ctx - .set_config_bool(Config::WebxdcRealtimeEnabled, true) - .await - .unwrap(); - - alice - .ctx - .set_config_bool(Config::WebxdcRealtimeEnabled, true) - .await - .unwrap(); - // Alice sends webxdc to bob let alice_chat = alice.create_chat(bob).await; let mut instance = Message::new(Viewtype::File); @@ -986,6 +953,11 @@ mod tests { let mut tcm = TestContextManager::new(); let alice = &mut tcm.alice().await; + alice + .set_config_bool(Config::WebxdcRealtimeEnabled, false) + .await + .unwrap(); + // creates iroh endpoint as side effect send_webxdc_realtime_advertisement(alice, MsgId::new(1)) .await