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

send_msg(): return only msg_id

Browse Source
This commit is contained in:
adbenitez
2023-02-26 22:50:24 -05:00
parent ad3c7136ec
commit f0a2ca7815
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1512,12 +1512,7 @@ impl CommandApi {
Ok(message_id.to_u32()) Ok(message_id.to_u32())
} }
async fn send_msg( async fn send_msg(&self, account_id: u32, chat_id: u32, draft: DraftMessage) -> Result<u32> {
&self,
account_id: u32,
chat_id: u32,
draft: DraftMessage,
) -> Result<(u32, MessageObject)> {
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) = draft.viewtype {
viewtype.into() viewtype.into()
@@ -1556,8 +1551,7 @@ impl CommandApi {
let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message) let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
.await? .await?
.to_u32(); .to_u32();
let message = MessageObject::from_message_id(&ctx, msg_id).await?; Ok(msg_id)
Ok((msg_id, message))
} }
// --------------------------------------------- // ---------------------------------------------

2
deltachat-rpc-client/src/deltachat_rpc_client/chat.py
View File

@@ -128,7 +128,7 @@ class Chat:
"overrideSenderName": override_sender_name, "overrideSenderName": override_sender_name,
"quotedMsg": quoted_msg, "quotedMsg": quoted_msg,
} }
msg_id, _ = await self._rpc.send_msg(self.account.id, self.id, draft) msg_id = await self._rpc.send_msg(self.account.id, self.id, draft)
return Message(self.account, msg_id) return Message(self.account, msg_id)
async def send_text(self, text: str) -> Message: async def send_text(self, text: str) -> Message: