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

refactor: Rename Chat::add_sync_item() to sync()

Browse Source
This commit is contained in:
iequidoo
2023-11-09 03:49:18 -03:00
committed by iequidoo
parent 4d1a9c2aa1
commit 6273a7d54e
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/chat.rs
View File

@@ -399,7 +399,7 @@ impl ChatId {
if sync.into() { if sync.into() {
// NB: For a 1:1 chat this currently triggers `Contact::block()` on other devices. // NB: For a 1:1 chat this currently triggers `Contact::block()` on other devices.
chat.add_sync_item(context, ChatAction::Block).await?; chat.sync(context, ChatAction::Block).await?;
} }
Ok(()) Ok(())
} }
@@ -417,7 +417,7 @@ impl ChatId {
// TODO: For a 1:1 chat this currently triggers `Contact::unblock()` on other devices. // TODO: For a 1:1 chat this currently triggers `Contact::unblock()` on other devices.
// Maybe we should unblock the contact locally too, this would also resolve discrepancy // Maybe we should unblock the contact locally too, this would also resolve discrepancy
// with `block()` which also blocks the contact. // with `block()` which also blocks the contact.
chat.add_sync_item(context, ChatAction::Unblock).await?; chat.sync(context, ChatAction::Unblock).await?;
} }
Ok(()) Ok(())
} }
@@ -465,7 +465,7 @@ impl ChatId {
} }
if sync.into() { if sync.into() {
chat.add_sync_item(context, ChatAction::Accept).await?; chat.sync(context, ChatAction::Accept).await?;
} }
Ok(()) Ok(())
} }
@@ -627,7 +627,7 @@ impl ChatId {
if sync.into() { if sync.into() {
let chat = Chat::load_from_db(context, self).await?; let chat = Chat::load_from_db(context, self).await?;
chat.add_sync_item(context, ChatAction::SetVisibility(visibility)) chat.sync(context, ChatAction::SetVisibility(visibility))
.await?; .await?;
} }
Ok(()) Ok(())
@@ -1923,8 +1923,7 @@ impl Chat {
let contact = Contact::get_by_id(context, contact_id).await?; let contact = Contact::get_by_id(context, contact_id).await?;
addrs.push(contact.get_addr().to_string()); addrs.push(contact.get_addr().to_string());
} }
self.add_sync_item(context, ChatAction::SetContacts(addrs)) self.sync(context, ChatAction::SetContacts(addrs)).await
.await
} }
/// Returns chat id for the purpose of synchronisation across devices. /// Returns chat id for the purpose of synchronisation across devices.
@@ -1953,18 +1952,23 @@ impl Chat {
} }
} }
/// Adds a chat action to the list of items to synchronise to other devices. /// Synchronises a chat action to other devices.
pub(crate) async fn add_sync_item(&self, context: &Context, action: ChatAction) -> Result<()> { pub(crate) async fn sync(&self, context: &Context, action: ChatAction) -> Result<()> {
if let Some(id) = self.get_sync_id(context).await? { if let Some(id) = self.get_sync_id(context).await? {
context sync(context, id, action).await?;
.add_sync_item(SyncData::AlterChat { id, action })
.await?;
context.send_sync_msg().await?;
} }
Ok(()) Ok(())
} }
} }
async fn sync(context: &Context, id: sync::ChatId, action: ChatAction) -> Result<()> {
context
.add_sync_item(SyncData::AlterChat { id, action })
.await?;
context.send_sync_msg().await?;
Ok(())
}
/// Whether the chat is pinned or archived. /// Whether the chat is pinned or archived.
#[derive(Debug, Copy, Eq, PartialEq, Clone, Serialize, Deserialize, EnumIter)] #[derive(Debug, Copy, Eq, PartialEq, Clone, Serialize, Deserialize, EnumIter)]
#[repr(i8)] #[repr(i8)]
@@ -3513,8 +3517,7 @@ pub(crate) async fn set_muted_ex(
context.emit_event(EventType::ChatModified(chat_id)); context.emit_event(EventType::ChatModified(chat_id));
if sync.into() { if sync.into() {
let chat = Chat::load_from_db(context, chat_id).await?; let chat = Chat::load_from_db(context, chat_id).await?;
chat.add_sync_item(context, ChatAction::SetMuted(duration)) chat.sync(context, ChatAction::SetMuted(duration)).await?;
.await?;
} }
Ok(()) Ok(())
} }