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

typo + only send for webxdcs

Browse Source
This commit is contained in:
Sebastian Klähn
2022-09-11 09:39:56 +02:00
parent 2e2fa95298
commit 70979c55fa
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deltachat-ffi/src/lib.rs
View File

@@ -504,7 +504,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
EventType::ConnectivityChanged => 2100, EventType::ConnectivityChanged => 2100,
EventType::SelfavatarChanged => 2110, EventType::SelfavatarChanged => 2110,
EventType::WebxdcStatusUpdate { .. } => 2120, EventType::WebxdcStatusUpdate { .. } => 2120,
EventType::WebXdInstanceDeleted { .. } => 2121, EventType::WebxdcInstanceDeleted { .. } => 2121,
} }
} }
@@ -551,7 +551,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
contact_id.to_u32() as libc::c_int contact_id.to_u32() as libc::c_int
} }
EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int, EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
EventType::WebXdInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int, EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
} }
} }
@@ -583,7 +583,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
| EventType::ImexFileWritten(_) | EventType::ImexFileWritten(_)
| EventType::MsgsNoticed(_) | EventType::MsgsNoticed(_)
| EventType::ConnectivityChanged | EventType::ConnectivityChanged
| EventType::WebXdInstanceDeleted { .. } | EventType::WebxdcInstanceDeleted { .. }
| EventType::SelfavatarChanged => 0, | EventType::SelfavatarChanged => 0,
EventType::ChatModified(_) => 0, EventType::ChatModified(_) => 0,
EventType::MsgsChanged { msg_id, .. } EventType::MsgsChanged { msg_id, .. }
@@ -640,7 +640,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
| EventType::ConnectivityChanged | EventType::ConnectivityChanged
| EventType::SelfavatarChanged | EventType::SelfavatarChanged
| EventType::WebxdcStatusUpdate { .. } | EventType::WebxdcStatusUpdate { .. }
| EventType::WebXdInstanceDeleted { .. } | EventType::WebxdcInstanceDeleted { .. }
| EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(), | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
EventType::ConfigureProgress { comment, .. } => { EventType::ConfigureProgress { comment, .. } => {
if let Some(comment) = comment { if let Some(comment) = comment {

4
deltachat-jsonrpc/src/api/events.rs
View File

@@ -60,7 +60,7 @@ pub fn event_to_json_rpc_notification(event: Event) -> Value {
msg_id, msg_id,
status_update_serial, status_update_serial,
} => (json!(msg_id), json!(status_update_serial)), } => (json!(msg_id), json!(status_update_serial)),
EventType::WebXdInstanceDeleted { msg_id } => (json!(msg_id), Value::Null), EventType::WebxdcInstanceDeleted { msg_id } => (json!(msg_id), Value::Null),
}; };
let id: EventTypeName = event.typ.into(); let id: EventTypeName = event.typ.into();
@@ -139,7 +139,7 @@ impl From<EventType> for EventTypeName {
EventType::ConnectivityChanged => ConnectivityChanged, EventType::ConnectivityChanged => ConnectivityChanged,
EventType::SelfavatarChanged => SelfavatarChanged, EventType::SelfavatarChanged => SelfavatarChanged,
EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate, EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
EventType::WebXdInstanceDeleted { .. } => WebXdInstanceDeleted, EventType::WebxdcInstanceDeleted { .. } => WebXdInstanceDeleted,
} }
} }
} }

2
src/events.rs
View File

@@ -304,7 +304,7 @@ pub enum EventType {
}, },
/// Inform that a message containing a webxdc instance has been deleted /// Inform that a message containing a webxdc instance has been deleted
WebXdInstanceDeleted { WebxdcInstanceDeleted {
msg_id: MsgId, msg_id: MsgId,
}, },
} }

4
src/message.rs
View File

@@ -1237,7 +1237,9 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
.await .await
.with_context(|| format!("Unable to trash message {}", msg_id))?; .with_context(|| format!("Unable to trash message {}", msg_id))?;
context.emit_event(EventType::WebXdInstanceDeleted { msg_id: *msg_id }); if msg.viewtype == Viewtype::Webxdc {
context.emit_event(EventType::WebxdcInstanceDeleted { msg_id: *msg_id });
}
context context
.sql .sql

2
src/webxdc.rs
View File

@@ -2387,7 +2387,7 @@ sth_for_the = "future""#
message::delete_msgs(&alice, &[instance.id]).await?; message::delete_msgs(&alice, &[instance.id]).await?;
alice alice
.evtracker .evtracker
.get_matching(|evt| matches!(evt, EventType::WebXdInstanceDeleted { .. })) .get_matching(|evt| matches!(evt, EventType::WebxdcInstanceDeleted { .. }))
.await; .await;
Ok(()) Ok(())
} }