From 70979c55fa144c8c8778bf20f5619fe9be64b855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Kl=C3=A4hn?= <scoreplayer2000@gmail.com>
Date: Sun, 11 Sep 2022 09:39:56 +0200
Subject: [PATCH] typo + only send for webxdcs

---
 deltachat-ffi/src/lib.rs            | 8 ++++----
 deltachat-jsonrpc/src/api/events.rs | 4 ++--
 src/events.rs                       | 2 +-
 src/message.rs                      | 4 +++-
 src/webxdc.rs                       | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs
index b0c79511e..2f872d6e1 100644
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -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::SelfavatarChanged => 2110,
         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
         }
         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::MsgsNoticed(_)
         | EventType::ConnectivityChanged
-        | EventType::WebXdInstanceDeleted { .. }
+        | EventType::WebxdcInstanceDeleted { .. }
         | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         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::SelfavatarChanged
         | EventType::WebxdcStatusUpdate { .. }
-        | EventType::WebXdInstanceDeleted { .. }
+        | EventType::WebxdcInstanceDeleted { .. }
         | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
diff --git a/deltachat-jsonrpc/src/api/events.rs b/deltachat-jsonrpc/src/api/events.rs
index 09a7cd7c2..61e1162c9 100644
--- a/deltachat-jsonrpc/src/api/events.rs
+++ b/deltachat-jsonrpc/src/api/events.rs
@@ -60,7 +60,7 @@ pub fn event_to_json_rpc_notification(event: Event) -> Value {
             msg_id,
             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();
@@ -139,7 +139,7 @@ impl From<EventType> for EventTypeName {
             EventType::ConnectivityChanged => ConnectivityChanged,
             EventType::SelfavatarChanged => SelfavatarChanged,
             EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
-            EventType::WebXdInstanceDeleted { .. } => WebXdInstanceDeleted,
+            EventType::WebxdcInstanceDeleted { .. } => WebXdInstanceDeleted,
         }
     }
 }
diff --git a/src/events.rs b/src/events.rs
index 80c234716..29fb039b2 100644
--- a/src/events.rs
+++ b/src/events.rs
@@ -304,7 +304,7 @@ pub enum EventType {
     },
 
     /// Inform that a message containing a webxdc instance has been deleted
-    WebXdInstanceDeleted {
+    WebxdcInstanceDeleted {
         msg_id: MsgId,
     },
 }
diff --git a/src/message.rs b/src/message.rs
index fe77ee998..7ff5b3667 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1237,7 +1237,9 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
             .await
             .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
             .sql
diff --git a/src/webxdc.rs b/src/webxdc.rs
index 0071a9deb..05fa96875 100644
--- a/src/webxdc.rs
+++ b/src/webxdc.rs
@@ -2387,7 +2387,7 @@ sth_for_the = "future""#
         message::delete_msgs(&alice, &[instance.id]).await?;
         alice
             .evtracker
-            .get_matching(|evt| matches!(evt, EventType::WebXdInstanceDeleted { .. }))
+            .get_matching(|evt| matches!(evt, EventType::WebxdcInstanceDeleted { .. }))
             .await;
         Ok(())
     }