bhcli

commit bf75c7450187115db0f2a10cb272bedba7ce1a95
parent 6233c75b5856554f78b36a2854a8db5c47824dda
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun,  2 Apr 2023 05:39:32 -0700

cleanup

Diffstat:
M
src/main.rs
 | 
60
++++++++++++++++++++++++++++++++----------------------------

1 file changed, 32 insertions(+), 28 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -2080,39 +2080,43 @@ fn get_username(own_username: &str, root: &StyledText, members_tag: &str) -> Opt
 fn get_message(root: &StyledText, members_tag: &str) -> Option<(String, Option<String>, String)> {
     if let StyledText::Styled(_, children) = root {
         let msg = children.get(0)?.text();
-        if let Some(StyledText::Styled(_, children)) = children.get(children.len() - 1) {
-            let from = match children.get(children.len() - 1) {
-                Some(StyledText::Text(t)) => t.to_owned(),
-                _ => return None,
-            };
-            return Some((from, None, msg));
-        } else if let Some(StyledText::Text(t)) = children.get(children.len() - 1) {
-            if t == &members_tag {
-                let from = match children.get(children.len() - 2) {
-                    Some(StyledText::Styled(_, children)) => match children.get(children.len() - 1) {
-                        Some(StyledText::Text(t)) => t.to_owned(),
-                        _ => return None,
-                    },
+        match children.get(children.len() - 1)? {
+            StyledText::Styled(_, children) => {
+                let from = match children.get(children.len() - 1)? {
+                    StyledText::Text(t) => t.to_owned(),
                     _ => return None,
                 };
                 return Some((from, None, msg));
-            } else if t == "[" {
-                let from = match children.get(children.len() - 2) {
-                    Some(StyledText::Styled(_, children)) => match children.get(children.len() - 1) {
-                        Some(StyledText::Text(t)) => t.to_owned(),
+            },
+            StyledText::Text(t) => {
+                if t == &members_tag {
+                    let from = match children.get(children.len() - 2)? {
+                        StyledText::Styled(_, children) => match children.get(children.len() - 1)? {
+                            StyledText::Text(t) => t.to_owned(),
+                            _ => return None,
+                        },
                         _ => return None,
-                    },
-                    _ => return None,
-                };
-                let to = match children.get(2) {
-                    Some(StyledText::Styled(_, children)) => match children.get(children.len() - 1) {
-                        Some(StyledText::Text(t)) => Some(t.to_owned()),
+                    };
+                    return Some((from, None, msg));
+                } else if t == "[" {
+                    let from = match children.get(children.len() - 2)? {
+                        StyledText::Styled(_, children) => match children.get(children.len() - 1)? {
+                            StyledText::Text(t) => t.to_owned(),
+                            _ => return None,
+                        },
                         _ => return None,
-                    },
-                    _ => return None,
-                };
-                return Some((from, to, msg));
-            }
+                    };
+                    let to = match children.get(2)? {
+                        StyledText::Styled(_, children) => match children.get(children.len() - 1)? {
+                            StyledText::Text(t) => Some(t.to_owned()),
+                            _ => return None,
+                        },
+                        _ => return None,
+                    };
+                    return Some((from, to, msg));
+                }
+            },
+            _ => return None,
         }
     }
     return None;