Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-04 22:06: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

17
src/mimefactory.rs
View File

@@ -133,11 +133,7 @@ impl<'a> MimeFactory<'a> {
) -> Result<MimeFactory<'a>> {
let chat = Chat::load_from_db(context, msg.chat_id).await?;
let from_addr = context
.get_config(Config::ConfiguredAddr)
.await?
.unwrap_or_default();
let from_addr = context.get_primary_addr().await.unwrap_or_default();
let config_displayname = context
.get_config(Config::Displayname)
.await?
@@ -237,10 +233,7 @@ impl<'a> MimeFactory<'a> {
ensure!(!msg.chat_id.is_special(), "Invalid chat id");
let contact = Contact::load_from_db(context, msg.from_id).await?;
let from_addr = context
.get_config(Config::ConfiguredAddr)
.await?
.unwrap_or_default();
let from_addr = context.get_primary_addr().await?;
let from_displayname = context
.get_config(Config::Displayname)
.await?
@@ -278,11 +271,7 @@ impl<'a> MimeFactory<'a> {
&self,
context: &Context,
) -> Result<Vec<(Option<Peerstate>, &str)>> {
let self_addr = context
.get_config(Config::ConfiguredAddr)
.await?
.context("not configured")?;
let self_addr = context.get_primary_addr().await?;
let mut res = Vec::new();
for (_, addr) in self
.recipients