From 093839c2b02fc856e7a73429fd4c9519a237f667 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Fri, 9 Oct 2020 08:16:09 +0300
Subject: [PATCH] prepare_msg_raw: replace large `if` with early exit

---
 src/chat.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/chat.rs b/src/chat.rs
index 9fcafe206..1ec498517 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -790,7 +790,11 @@ impl Chat {
             bail!("Cannot set message; self not in group.");
         }
 
-        if let Some(from) = context.get_config(Config::ConfiguredAddr).await {
+        let from = match context.get_config(Config::ConfiguredAddr).await {
+            Some(from) => from,
+            None => bail!("Cannot prepare message for sending, address is not configured."),
+        };
+
             let new_rfc724_mid = {
                 let grpid = match self.typ {
                     Chattype::Group | Chattype::VerifiedGroup => Some(self.grpid.as_str()),
@@ -1003,9 +1007,6 @@ impl Chat {
                             self.id,
                         );
                     }
-        } else {
-            bail!("Cannot prepare message for sending, address is not configured.");
-        }
         schedule_ephemeral_task(context).await;
 
         Ok(MsgId::new(msg_id))