Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-20 15:06:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: upgrade to Rust 2024

Browse Source
This commit is contained in:
link2xt
2025-06-27 02:01:37 +00:00
committed by l
parent 0ffd4d9f87
commit 5c3de759d3
94 changed files with 1083 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/webxdc/integration.rs
View File

@@ -1,12 +1,12 @@
use std::path::Path;
use crate::chat::{send_msg, ChatId};
use crate::chat::{ChatId, send_msg};
use crate::config::Config;
use crate::contact::ContactId;
use crate::context::Context;
use crate::message::{Message, MsgId, Viewtype};
use crate::param::Param;
use crate::webxdc::{maps_integration, StatusUpdateItem, StatusUpdateSerial};
use crate::webxdc::{StatusUpdateItem, StatusUpdateSerial, maps_integration};
use anyhow::Result;
impl Context {

6
src/webxdc/maps_integration.rs
View File

@@ -33,7 +33,7 @@
//! ```
use crate::{chat, location};
use std::collections::{hash_map, HashMap};
use std::collections::{HashMap, hash_map};
use crate::context::Context;
use crate::message::{Message, MsgId};
@@ -169,13 +169,13 @@ pub(crate) async fn intercept_get_updates(
#[cfg(test)]
mod tests {
use crate::chat::{create_group_chat, ChatId, ProtectionStatus};
use crate::chat::{ChatId, ProtectionStatus, create_group_chat};
use crate::chatlist::Chatlist;
use crate::contact::Contact;
use crate::message::Message;
use crate::test_utils::TestContext;
use crate::webxdc::StatusUpdateSerial;
use crate::{location, EventType};
use crate::{EventType, location};
use anyhow::Result;
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]

99
src/webxdc/webxdc_tests.rs
View File

@@ -5,8 +5,8 @@ use serde_json::json;
use super::*;
use crate::chat::{
add_contact_to_chat, create_broadcast_list, create_group_chat, forward_msgs,
remove_contact_from_chat, resend_msgs, send_msg, send_text_msg, ChatId, ProtectionStatus,
ChatId, ProtectionStatus, add_contact_to_chat, create_broadcast_list, create_group_chat,
forward_msgs, remove_contact_from_chat, resend_msgs, send_msg, send_text_msg,
};
use crate::chatlist::Chatlist;
use crate::config::Config;
@@ -296,14 +296,17 @@ async fn test_webxdc_contact_request() -> Result<()> {
let bob_instance = bob.get_last_msg().await;
let bob_chat = Chat::load_from_db(&bob, bob_instance.chat_id).await?;
assert!(bob_chat.is_contact_request());
assert!(bob_instance
.get_webxdc_blob(&bob, "index.html")
.await
.is_ok());
assert!(bob
.send_webxdc_status_update(bob_instance.id, r#"{"payload":42}"#)
.await
.is_err());
assert!(
bob_instance
.get_webxdc_blob(&bob, "index.html")
.await
.is_ok()
);
assert!(
bob.send_webxdc_status_update(bob_instance.id, r#"{"payload":42}"#)
.await
.is_err()
);
assert_eq!(
bob.get_webxdc_status_updates(bob_instance.id, StatusUpdateSerial(0))
.await?,
@@ -312,10 +315,11 @@ async fn test_webxdc_contact_request() -> Result<()> {
// Once the contact request is accepted, Bob can send updates
bob_chat.id.accept(&bob).await?;
assert!(bob
.send_webxdc_status_update(bob_instance.id, r#"{"payload":42}"#)
.await
.is_ok());
assert!(
bob.send_webxdc_status_update(bob_instance.id, r#"{"payload":42}"#)
.await
.is_ok()
);
assert_eq!(
bob.get_webxdc_status_updates(bob_instance.id, StatusUpdateSerial(0))
.await?,
@@ -548,15 +552,17 @@ async fn test_create_status_update_record() -> Result<()> {
.await?;
assert_eq!(update_id1_duplicate, None);
assert!(t
.send_webxdc_status_update(instance.id, "\n\n\n")
.await
.is_err());
assert!(
t.send_webxdc_status_update(instance.id, "\n\n\n")
.await
.is_err()
);
assert!(t
.send_webxdc_status_update(instance.id, "bad json")
.await
.is_err());
assert!(
t.send_webxdc_status_update(instance.id, "bad json")
.await
.is_err()
);
assert_eq!(
t.get_webxdc_status_updates(instance.id, StatusUpdateSerial(0))
@@ -631,12 +637,13 @@ async fn test_receive_status_update() -> Result<()> {
let instance = send_webxdc_instance(&t, chat_id).await?;
let now = tools::time();
assert!(t
.receive_status_update(ContactId::SELF, &instance, now, true, r#"foo: bar"#)
.await
.is_err()); // no json
assert!(t
.receive_status_update(
assert!(
t.receive_status_update(ContactId::SELF, &instance, now, true, r#"foo: bar"#)
.await
.is_err()
); // no json
assert!(
t.receive_status_update(
ContactId::SELF,
&instance,
now,
@@ -644,9 +651,10 @@ async fn test_receive_status_update() -> Result<()> {
r#"{"updada":[{"payload":{"foo":"bar"}}]}"#
)
.await
.is_err()); // "updates" object missing
assert!(t
.receive_status_update(
.is_err()
); // "updates" object missing
assert!(
t.receive_status_update(
ContactId::SELF,
&instance,
now,
@@ -654,9 +662,10 @@ async fn test_receive_status_update() -> Result<()> {
r#"{"updates":[{"foo":"bar"}]}"#
)
.await
.is_err()); // "payload" field missing
assert!(t
.receive_status_update(
.is_err()
); // "payload" field missing
assert!(
t.receive_status_update(
ContactId::SELF,
&instance,
now,
@@ -664,7 +673,8 @@ async fn test_receive_status_update() -> Result<()> {
r#"{"updates":{"payload":{"foo":"bar"}}}"#
)
.await
.is_err()); // not an array
.is_err()
); // not an array
t.receive_status_update(
ContactId::SELF,
@@ -1101,10 +1111,11 @@ async fn test_send_webxdc_status_update_to_non_webxdc() -> Result<()> {
let t = TestContext::new_alice().await;
let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
let msg_id = send_text_msg(&t, chat_id, "ho!".to_string()).await?;
assert!(t
.send_webxdc_status_update(msg_id, r#"{"foo":"bar"}"#)
.await
.is_err());
assert!(
t.send_webxdc_status_update(msg_id, r#"{"foo":"bar"}"#)
.await
.is_err()
);
Ok(())
}
@@ -1118,10 +1129,12 @@ async fn test_get_webxdc_blob() -> Result<()> {
assert_eq!(buf.len(), 188);
assert!(String::from_utf8_lossy(&buf).contains("document.write"));
assert!(instance
.get_webxdc_blob(&t, "not-existent.html")
.await
.is_err());
assert!(
instance
.get_webxdc_blob(&t, "not-existent.html")
.await
.is_err()
);
Ok(())
}