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

fix: make_vcard: Add authname and key for ContactId::SELF

Browse Source
This commit is contained in:
iequidoo
2024-05-18 18:06:03 -03:00
committed by link2xt
parent 5f790c1dbc
commit 7010e80336
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/contact.rs
View File

@@ -192,9 +192,13 @@ pub async fn make_vcard(context: &Context, contacts: &[ContactId]) -> Result<Str
let mut vcard_contacts = Vec::with_capacity(contacts.len()); let mut vcard_contacts = Vec::with_capacity(contacts.len());
for id in contacts { for id in contacts {
let c = Contact::get_by_id(context, *id).await?; let c = Contact::get_by_id(context, *id).await?;
let key = Peerstate::from_addr(context, &c.addr) let key = match *id {
.await? ContactId::SELF => Some(load_self_public_key(context).await?),
.and_then(|peerstate| peerstate.peek_key(false).map(|k| k.to_base64())); _ => Peerstate::from_addr(context, &c.addr)
.await?
.and_then(|peerstate| peerstate.take_key(false)),
};
let key = key.map(|k| k.to_base64());
let profile_image = match c.get_profile_image(context).await? { let profile_image = match c.get_profile_image(context).await? {
None => None, None => None,
Some(path) => tokio::fs::read(path) Some(path) => tokio::fs::read(path)
@@ -543,6 +547,10 @@ impl Contact {
{ {
if contact_id == ContactId::SELF { if contact_id == ContactId::SELF {
contact.name = stock_str::self_msg(context).await; contact.name = stock_str::self_msg(context).await;
contact.authname = context
.get_config(Config::Displayname)
.await?
.unwrap_or_default();
contact.addr = context contact.addr = context
.get_config(Config::ConfiguredAddr) .get_config(Config::ConfiguredAddr)
.await? .await?