From cacc01bac07e2c75ebd7000ae1a49476dea840bc Mon Sep 17 00:00:00 2001 From: link2xt Date: Tue, 6 Dec 2022 15:58:45 +0000 Subject: [PATCH] Add IMAP server ID to the context info only when it is known --- CHANGELOG.md | 1 + src/context.rs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f972a5717..f48cb3afb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Add more logging to `fetch_many_msgs` and refactor it #3811 - Small speedup #3780 - Log the reason when the message cannot be sent to the chat #3810 +- Add IMAP server ID line to the context info only when it is known #3814 ### API-Changes - Add Python API to send reactions #3762 diff --git a/src/context.rs b/src/context.rs index eea2479d4..d28774df9 100644 --- a/src/context.rs +++ b/src/context.rs @@ -614,9 +614,9 @@ impl Context { res.insert("entered_account_settings", l.to_string()); res.insert("used_account_settings", l2.to_string()); - let server_id = self.server_id.read().await; - res.insert("imap_server_id", format!("{:?}", server_id)); - drop(server_id); + if let Some(server_id) = &*self.server_id.read().await { + res.insert("imap_server_id", format!("{:?}", server_id)); + } res.insert("secondary_addrs", secondary_addrs); res.insert(