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

fix: Use ChatIdBlocked::lookup_by_contact() instead of ChatId's method when applicable

Browse Source 
`ChatId::lookup_by_contact()` returns `None` for blocked chats, so it should be only used if we need
to filter out blocked chats, e.g. when building a chatlist.
This commit is contained in:
iequidoo
2024-05-07 03:09:23 -03:00
committed by iequidoo
parent e3cb9b894b
commit ab1583eef9
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat.rs
View File

@@ -2303,7 +2303,9 @@ async fn update_special_chat_name(
contact_id: ContactId,
name: String,
) -> Result<()> {
if let Some(chat_id) = ChatId::lookup_by_contact(context, contact_id).await? {
if let Some(ChatIdBlocked { id: chat_id, .. }) =
ChatIdBlocked::lookup_by_contact(context, contact_id).await?
{
// the `!= name` condition avoids unneeded writes
context
.sql
@@ -4478,9 +4480,10 @@ impl Context {
}
_ => (),
}
ChatId::lookup_by_contact(self, contact_id)
ChatIdBlocked::lookup_by_contact(self, contact_id)
.await?
.with_context(|| format!("No chat for addr '{addr}'"))?
.id
}
SyncId::Grpid(grpid) => {
if let SyncAction::CreateBroadcast(name) = action {