bhcli

commit 538ce6f25c64b8f818947cda9a63b93c6f6c579d
parent a18e32647cd2acb8d08096db3099ac337ffbb414
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri,  7 Apr 2023 00:31:12 -0700

cleanup

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

1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -2166,10 +2166,7 @@ impl Users {
 }
 
 fn extract_users(doc: &Document) -> Users {
-    let mut admin = Vec::new();
-    let mut staff = Vec::new();
-    let mut members = Vec::new();
-    let mut guests = Vec::new();
+    let mut users = Users::default();
 
     if let Some(chatters) = doc.find(Attr("id", "chatters")).next() {
         if let Some(tr) = chatters.find(Name("tr")).next() {
@@ -2188,10 +2185,10 @@ fn extract_users(doc: &Document) -> Users {
                                     let tui_color = parse_color(&color);
                                     let username = user_span.text();
                                     match th_count {
-                                        1 => admin.push((tui_color, username)),
-                                        2 => staff.push((tui_color, username)),
-                                        3 => members.push((tui_color, username)),
-                                        4 => guests.push((tui_color, username)),
+                                        1 => users.admin.push((tui_color, username)),
+                                        2 => users.staff.push((tui_color, username)),
+                                        3 => users.members.push((tui_color, username)),
+                                        4 => users.guests.push((tui_color, username)),
                                         _ => {}
                                     }
                                 }
@@ -2202,12 +2199,7 @@ fn extract_users(doc: &Document) -> Users {
             }
         }
     }
-    Users {
-        admin,
-        staff,
-        members,
-        guests,
-    }
+    users
 }
 
 fn remove_suffix<'a>(s: &'a str, suffix: &str) -> &'a str {