Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 12:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename DraftMessage to MessageData

Browse Source
This commit is contained in:
adbenitez
2023-02-26 23:34:15 -05:00
parent f0a2ca7815
commit 9f81299de0
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
deltachat-jsonrpc/src/api/mod.rs
View File

@@ -41,7 +41,7 @@ use types::account::Account;
use types::chat::FullChat; use types::chat::FullChat;
use types::chat_list::ChatListEntry; use types::chat_list::ChatListEntry;
use types::contact::ContactObject; use types::contact::ContactObject;
use types::message::DraftMessage; use types::message::MessageData;
use types::message::MessageObject; use types::message::MessageObject;
use types::provider_info::ProviderInfo; use types::provider_info::ProviderInfo;
use types::webxdc::WebxdcMessageInfo; use types::webxdc::WebxdcMessageInfo;
@@ -1512,31 +1512,31 @@ impl CommandApi {
Ok(message_id.to_u32()) Ok(message_id.to_u32())
} }
async fn send_msg(&self, account_id: u32, chat_id: u32, draft: DraftMessage) -> Result<u32> { async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
let ctx = self.get_context(account_id).await?; let ctx = self.get_context(account_id).await?;
let mut message = Message::new(if let Some(viewtype) = draft.viewtype { let mut message = Message::new(if let Some(viewtype) = data.viewtype {
viewtype.into() viewtype.into()
} else if draft.file.is_some() { } else if data.file.is_some() {
Viewtype::File Viewtype::File
} else { } else {
Viewtype::Text Viewtype::Text
}); });
if draft.text.is_some() { if data.text.is_some() {
message.set_text(draft.text); message.set_text(data.text);
} }
if draft.html.is_some() { if data.html.is_some() {
message.set_html(draft.html); message.set_html(data.html);
} }
if draft.override_sender_name.is_some() { if data.override_sender_name.is_some() {
message.set_override_sender_name(draft.override_sender_name); message.set_override_sender_name(data.override_sender_name);
} }
if let Some(file) = draft.file { if let Some(file) = data.file {
message.set_file(file, None); message.set_file(file, None);
} }
if let Some((latitude, longitude)) = draft.location { if let Some((latitude, longitude)) = data.location {
message.set_location(latitude, longitude); message.set_location(latitude, longitude);
} }
if let Some(id) = draft.quoted_message_id { if let Some(id) = data.quoted_message_id {
message message
.set_quote( .set_quote(
&ctx, &ctx,

2
deltachat-jsonrpc/src/api/types/message.rs
View File

@@ -505,7 +505,7 @@ impl From<ChatItem> for JSONRPCMessageListItem {
#[derive(Deserialize, TypeDef)] #[derive(Deserialize, TypeDef)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct DraftMessage { pub struct MessageData {
pub text: Option<String>, pub text: Option<String>,
pub html: Option<String>, pub html: Option<String>,
pub viewtype: Option<MessageViewtype>, pub viewtype: Option<MessageViewtype>,