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

simplify WebxdcStatusUpdate handling

Browse Source
This commit is contained in:
B. Petersen
2022-01-13 12:42:24 +01:00
committed by bjoern
parent 1e9e308df3
commit 4af4914e32
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/webxdc.rs
View File

@@ -86,6 +86,8 @@ impl Context {
Ok(false) Ok(false)
} }
/// Takes a payload and writes it to the database.
/// Moreover, events are handled.
async fn create_status_update_record( async fn create_status_update_record(
&self, &self,
instance_msg_id: MsgId, instance_msg_id: MsgId,
@@ -105,7 +107,14 @@ impl Context {
paramsv![instance_msg_id, serde_json::to_string(&status_update_item)?], paramsv![instance_msg_id, serde_json::to_string(&status_update_item)?],
) )
.await?; .await?;
Ok(StatusUpdateId(u32::try_from(rowid)?)) let status_update_id = StatusUpdateId(u32::try_from(rowid)?);
self.emit_event(EventType::WebxdcStatusUpdate {
msg_id: instance_msg_id,
status_update_id,
});
Ok(status_update_id)
} }
/// Sends a status update for an webxdc instance. /// Sends a status update for an webxdc instance.
@@ -129,10 +138,6 @@ impl Context {
let status_update_id = self let status_update_id = self
.create_status_update_record(instance_msg_id, payload) .create_status_update_record(instance_msg_id, payload)
.await?; .await?;
self.emit_event(EventType::WebxdcStatusUpdate {
msg_id: instance_msg_id,
status_update_id,
});
match instance.state { match instance.state {
MessageState::Undefined | MessageState::OutPreparing | MessageState::OutDraft => { MessageState::Undefined | MessageState::OutPreparing | MessageState::OutDraft => {
// send update once the instance is actually send // send update once the instance is actually send
@@ -202,16 +207,11 @@ impl Context {
let updates: StatusUpdates = serde_json::from_str(json)?; let updates: StatusUpdates = serde_json::from_str(json)?;
for update_item in updates.updates { for update_item in updates.updates {
let status_update_id = self self.create_status_update_record(
.create_status_update_record( instance.id,
instance.id, &*serde_json::to_string(&update_item.payload)?,
&*serde_json::to_string(&update_item.payload)?, )
) .await?;
.await?;
self.emit_event(EventType::WebxdcStatusUpdate {
msg_id: instance.id,
status_update_id,
});
} }
Ok(()) Ok(())