Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-21 07:46:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

api!: jsonrpc misc_set_draft now requires setting the viewtype

Browse Source
This commit is contained in:
Simon Laux
2023-10-27 22:00:49 +02:00
committed by link2xt
parent 771b57778e
commit 542bd4cbb8
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
deltachat-jsonrpc/src/api.rs
View File

@@ -2033,13 +2033,19 @@ impl CommandApi {
text: Option<String>, text: Option<String>,
file: Option<String>, file: Option<String>,
quoted_message_id: Option<u32>, quoted_message_id: Option<u32>,
view_type: Option<MessageViewtype>,
) -> Result<()> { ) -> Result<()> {
let ctx = self.get_context(account_id).await?; let ctx = self.get_context(account_id).await?;
let mut draft = Message::new(if file.is_some() { let mut draft = Message::new(view_type.map_or_else(
Viewtype::File || {
} else { if file.is_some() {
Viewtype::Text Viewtype::File
}); } else {
Viewtype::Text
}
},
|v| v.into(),
));
draft.set_text(text.unwrap_or_default()); draft.set_text(text.unwrap_or_default());
if let Some(file) = file { if let Some(file) = file {
draft.set_file(file, None); draft.set_file(file, None);

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

@@ -160,11 +160,12 @@ class Chat:
text: Optional[str] = None, text: Optional[str] = None,
file: Optional[str] = None, file: Optional[str] = None,
quoted_msg: Optional[int] = None, quoted_msg: Optional[int] = None,
viewtype: Optional[str] = None,
) -> None: ) -> None:
"""Set draft message.""" """Set draft message."""
if isinstance(quoted_msg, Message): if isinstance(quoted_msg, Message):
quoted_msg = quoted_msg.id quoted_msg = quoted_msg.id
self._rpc.misc_set_draft(self.account.id, self.id, text, file, quoted_msg) self._rpc.misc_set_draft(self.account.id, self.id, text, file, quoted_msg, viewtype)
def remove_draft(self) -> None: def remove_draft(self) -> None:
"""Remove draft message.""" """Remove draft message."""