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

Resultify get_chat_id_by_grpid

Browse Source 
I want to avoid having to be able to represent a chat_id of 0 in order
to more nicely turn chat_id into a ChatId newtype.
This commit is contained in:
Floris Bruynooghe
2020-01-13 23:27:04 +01:00
committed by Floris Bruynooghe
parent 213c5df706
commit 7540770dec
4 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/dc_receive_imf.rs
View File

@@ -867,7 +867,8 @@ fn create_or_lookup_group(
set_better_msg(mime_parser, &better_msg);
// check, if we have a chat with this group ID
let (mut chat_id, chat_id_verified, _blocked) = chat::get_chat_id_by_grpid(context, &grpid);
let (mut chat_id, chat_id_verified, _blocked) =
chat::get_chat_id_by_grpid(context, &grpid).unwrap_or((0, false, Blocked::Not));
if chat_id != 0 {
if chat_id_verified {
if let Err(err) =
@@ -1179,10 +1180,23 @@ fn create_group_record(
)
.is_err()
{
warn!(
context,
"Failed to create group '{}' for grpid={}",
grpname.as_ref(),
grpid.as_ref()
);
return 0;
}
sql::get_rowid(context, &context.sql, "chats", "grpid", grpid.as_ref())
let chat_id = sql::get_rowid(context, &context.sql, "chats", "grpid", grpid.as_ref());
info!(
context,
"Created group '{}' grpid={} as chat #{}",
grpname.as_ref(),
grpid.as_ref(),
chat_id
);
chat_id
}
fn create_adhoc_grp_id(context: &Context, member_ids: &[u32]) -> String {