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

refactor: Make SyncData::AlterChat an inline struct

Browse Source
This commit is contained in:
iequidoo
2023-10-31 23:03:13 -03:00
committed by iequidoo
parent 6cd7296001
commit cdcb10fb58
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/chat.rs
View File

@@ -1901,7 +1901,7 @@ impl Chat {
pub(crate) async fn add_sync_item(&self, context: &Context, action: ChatAction) -> Result<()> {
if let Some(id) = self.get_sync_id(context).await? {
context
.add_sync_item(SyncData::AlterChat(sync::AlterChatData { id, action }))
.add_sync_item(SyncData::AlterChat { id, action })
.await?;
}
Ok(())
@@ -4054,8 +4054,12 @@ pub(crate) async fn update_msg_text_and_timestamp(
impl Context {
/// Executes [`SyncData::AlterChat`] item sent by other device.
pub(crate) async fn sync_alter_chat(&self, data: &sync::AlterChatData) -> Result<()> {
let chat_id = match &data.id {
pub(crate) async fn sync_alter_chat(
&self,
id: &sync::ChatId,
action: &ChatAction,
) -> Result<()> {
let chat_id = match id {
sync::ChatId::ContactAddr(addr) => {
let Some(contact_id) =
Contact::lookup_id_by_addr_ex(self, addr, Origin::Unknown, None).await?
@@ -4063,7 +4067,7 @@ impl Context {
warn!(self, "sync_alter_chat: No contact for addr '{addr}'.");
return Ok(());
};
match &data.action {
match action {
ChatAction::Block => {
return contact::set_blocked(self, Nosync, contact_id, true).await
}
@@ -4086,7 +4090,7 @@ impl Context {
chat_id
}
};
match &data.action {
match action {
ChatAction::Block => chat_id.block_ex(self, Nosync).await,
ChatAction::Unblock => chat_id.unblock_ex(self, Nosync).await,
ChatAction::Accept => chat_id.accept_ex(self, Nosync).await,