Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-09-22 13:01:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: Use display name for contacts in encryption info (#8609)

Browse Source 
Email address is already present in the list of relays,
a display name is more useful.

Signed-off-by: Jagoda Ślązak <jslazak@jslazak.com>
This commit is contained in:
j-g00da
2026-08-20 08:00:30 +02:00
committed by GitHub
parent 8f3337d971
commit 484d56f24d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat.rs
View File

@@ -1213,7 +1213,7 @@ SELECT id, rfc724_mid, pre_rfc724_mid, timestamp, ?, 1 FROM msgs WHERE chat_id=?
.filter(|&contact_id| !contact_id.is_special()) .filter(|&contact_id| !contact_id.is_special())
{ {
let contact = Contact::get_by_id(context, contact_id).await?; let contact = Contact::get_by_id(context, contact_id).await?;
let addr = contact.get_addr(); let name = contact.get_display_name();
logged_debug_assert!( logged_debug_assert!(
context, context,
contact.is_key_contact(), contact.is_key_contact(),
@@ -1226,12 +1226,12 @@ SELECT id, rfc724_mid, pre_rfc724_mid, timestamp, ?, 1 FROM msgs WHERE chat_id=?
if let Some(public_key) = contact.public_key(context).await? { if let Some(public_key) = contact.public_key(context).await? {
if let Some(relay_addrs) = addresses_from_public_key(&public_key) { if let Some(relay_addrs) = addresses_from_public_key(&public_key) {
let relays = relay_addrs.join(","); let relays = relay_addrs.join(",");
ret += &format!("\n{addr}({relays})\n{fingerprint}\n"); ret += &format!("\n{name}({relays})\n{fingerprint}\n");
} else { } else {
ret += &format!("\n{addr}\n{fingerprint}\n"); ret += &format!("\n{name}\n{fingerprint}\n");
} }
} else { } else {
ret += &format!("\n{addr}\n(key missing)\n{fingerprint}\n"); ret += &format!("\n{name}\n(key missing)\n{fingerprint}\n");
} }
} }

7
src/chat/chat_tests.rs
View File

@@ -4374,6 +4374,7 @@ async fn test_chat_get_encryption_info() -> Result<()> {
let mut tcm = TestContextManager::new(); let mut tcm = TestContextManager::new();
let alice = &tcm.alice().await; let alice = &tcm.alice().await;
let bob = &tcm.bob().await; let bob = &tcm.bob().await;
bob.set_config(Config::Displayname, Some("Bob")).await?;
let fiona = &tcm.fiona().await; let fiona = &tcm.fiona().await;
let contact_bob = alice.add_or_lookup_contact_id(bob).await; let contact_bob = alice.add_or_lookup_contact_id(bob).await;
@@ -4390,7 +4391,7 @@ async fn test_chat_get_encryption_info() -> Result<()> {
chat_id.get_encryption_info(alice).await?, chat_id.get_encryption_info(alice).await?,
"Messages are end-to-end encrypted.\n\ "Messages are end-to-end encrypted.\n\
\n\ \n\
bob@example.net(bob@example.net)\n\ Bob(bob@example.net)\n\
CCCB 5AA9 F6E1 141C 9431\n\ CCCB 5AA9 F6E1 141C 9431\n\
65F1 DB18 B18C BCF7 0487" 65F1 DB18 B18C BCF7 0487"
); );
@@ -4404,7 +4405,7 @@ async fn test_chat_get_encryption_info() -> Result<()> {
C8BA 50BF 4AC1 2FAF 38D7\n\ C8BA 50BF 4AC1 2FAF 38D7\n\
F657 DDFC 8E9F 3C79 9195\n\ F657 DDFC 8E9F 3C79 9195\n\
\n\ \n\
bob@example.net(bob@example.net)\n\ Bob(bob@example.net)\n\
CCCB 5AA9 F6E1 141C 9431\n\ CCCB 5AA9 F6E1 141C 9431\n\
65F1 DB18 B18C BCF7 0487" 65F1 DB18 B18C BCF7 0487"
); );
@@ -4425,7 +4426,7 @@ async fn test_chat_get_encryption_info() -> Result<()> {
C8BA 50BF 4AC1 2FAF 38D7\n\ C8BA 50BF 4AC1 2FAF 38D7\n\
F657 DDFC 8E9F 3C79 9195\n\ F657 DDFC 8E9F 3C79 9195\n\
\n\ \n\
bob@example.net\n\ Bob\n\
(key missing)\n\ (key missing)\n\
CCCB 5AA9 F6E1 141C 9431\n\ CCCB 5AA9 F6E1 141C 9431\n\
65F1 DB18 B18C BCF7 0487" 65F1 DB18 B18C BCF7 0487"