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

introduce get_primary_addr() shortcutting access the configured address for an account.

Browse Source
This commit is contained in:
holger krekel
2022-04-13 20:38:00 +02:00
parent c0abcf3daa
commit 4661ffb762
15 changed files with 38 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dc_receive_imf.rs
View File

@@ -1451,10 +1451,7 @@ async fn create_or_lookup_group(
ProtectionStatus::Unprotected
};
let self_addr = context
.get_config(Config::ConfiguredAddr)
.await?
.context("no address configured")?;
let self_addr = context.get_primary_addr().await?;
if chat_id.is_none()
&& !mime_parser.is_mailinglist_message()
&& !grpid.is_empty()
@@ -1550,11 +1547,7 @@ async fn apply_group_changes(
return Ok(None);
}
let self_addr = context
.get_config(Config::ConfiguredAddr)
.await?
.context("no address configured")?;
let self_addr = context.get_primary_addr().await?;
let mut recreate_member_list = false;
let mut send_event_chat_modified = false;
@@ -1998,12 +1991,7 @@ async fn create_adhoc_group(
/// are hidden in BCC. This group ID is sent by DC in the messages sent to this chat,
/// so having the same ID prevents group split.
async fn create_adhoc_grp_id(context: &Context, member_ids: &[ContactId]) -> Result<String> {
let member_cs = context
.get_config(Config::ConfiguredAddr)
.await?
.unwrap_or_else(|| "no-self".to_string())
.to_lowercase();
let member_cs = context.get_primary_addr().await?.to_lowercase();
let query = format!(
"SELECT addr FROM contacts WHERE id IN({}) AND id!=?",
sql::repeat_vars(member_ids.len())?