remove default usage

Author: Septias

deltachat-ffi/src/lib.rs

@@ -37,6 +37,7 @@ use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
 use deltachat_jsonrpc::api::CommandApi;
 use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
+use message::Viewtype;
 use num_traits::{FromPrimitive, ToPrimitive};
 use once_cell::sync::Lazy;
 use rand::Rng;
@@ -2076,7 +2077,7 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
                         ctx,
                         "dc_get_msg called with special msg_id={msg_id}, returning empty msg"
                     );
-                    message::Message::default()
+                    message::Message::new(Viewtype::default())
                 } else {
                     warn!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
                     return ptr::null_mut();

src/chat.rs

@@ -2022,6 +2022,10 @@ impl Chat {
         let mut to_id = 0;
         let mut location_id = 0;
 
+        if msg.rfc724_mid.is_empty() {
+            msg.rfc724_mid = create_outgoing_rfc724_mid();
+        }
+
         if self.typ == Chattype::Single {
             if let Some(id) = context
                 .sql
@@ -3864,7 +3868,7 @@ pub(crate) async fn add_contact_to_chat_ex(
 ) -> Result<bool> {
     ensure!(!chat_id.is_special(), "can not add member to special chats");
     let contact = Contact::get_by_id(context, contact_id).await?;
-    let mut msg = Message::default();
+    let mut msg = Message::new(Viewtype::default());
 
     chat_id.reset_gossiped_timestamp(context).await?;
 
@@ -4091,7 +4095,7 @@ pub async fn remove_contact_from_chat(
         "Cannot remove special contact"
     );
 
-    let mut msg = Message::default();
+    let mut msg = Message::new(Viewtype::default());
 
     let chat = Chat::load_from_db(context, chat_id).await?;
     if chat.typ == Chattype::Group || chat.typ == Chattype::Broadcast {
@@ -4196,7 +4200,7 @@ async fn rename_ex(
     ensure!(!chat_id.is_special(), "Invalid chat ID");
 
     let chat = Chat::load_from_db(context, chat_id).await?;
-    let mut msg = Message::default();
+    let mut msg = Message::new(Viewtype::default());
 
     if chat.typ == Chattype::Group
         || chat.typ == Chattype::Mailinglist

src/imex/key_transfer.rs

@@ -32,10 +32,7 @@ pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
     )?;
 
     let chat_id = ChatId::create_for_contact(context, ContactId::SELF).await?;
-    let mut msg = Message {
-        viewtype: Viewtype::File,
-        ..Default::default()
-    };
+    let mut msg = Message::new(Viewtype::File);
     msg.param.set(Param::File, setup_file_blob.as_name());
     msg.param
         .set(Param::Filename, "autocrypt-setup-message.html");

src/message.rs

@@ -432,7 +432,7 @@ impl Default for MessengerMessage {
 /// An object representing a single message in memory.
 /// The message object is not updated.
 /// If you want an update, you have to recreate the object.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub struct Message {
     /// Message ID.
     pub(crate) id: MsgId,
@@ -481,37 +481,6 @@ pub struct Message {
     pub(crate) param: Params,
 }
 
-impl Default for Message {
-    fn default() -> Self {
-        Self {
-            id: Default::default(),
-            from_id: Default::default(),
-            to_id: Default::default(),
-            chat_id: Default::default(),
-            viewtype: Default::default(),
-            state: Default::default(),
-            download_state: Default::default(),
-            hidden: Default::default(),
-            timestamp_sort: Default::default(),
-            timestamp_sent: Default::default(),
-            timestamp_rcvd: Default::default(),
-            ephemeral_timer: Default::default(),
-            ephemeral_timestamp: Default::default(),
-            text: Default::default(),
-            subject: Default::default(),
-            rfc724_mid: create_outgoing_rfc724_mid(),
-            in_reply_to: Default::default(),
-            is_dc_message: Default::default(),
-            original_msg_id: Default::default(),
-            mime_modified: Default::default(),
-            chat_blocked: Default::default(),
-            location_id: Default::default(),
-            error: Default::default(),
-            param: Default::default(),
-        }
-    }
-}
-
 impl Message {
     /// Creates a new message with given view type.
     pub fn new(viewtype: Viewtype) -> Self {