From 91eb6c4d08c5293f8af6436489923871fb2477a9 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sat, 15 Jan 2022 17:10:23 +0100
Subject: [PATCH] Return a Result instead of a vector

---
 src/database/admin.rs | 16 ++++++++++------
 src/database/users.rs | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 859977e9..7799ffa2 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -95,12 +95,16 @@ impl Admin {
 
                         match event {
                             AdminCommand::ListLocalUsers => {
-                                let users = guard.users.get_local_users();
-
-                                let mut msg: String = format!("Found {} local user account(s):\n", users.len());
-                                msg += &users.join("\n");
-                                
-                                send_message(RoomMessageEventContent::text_plain(&msg), guard, &state_lock);
+                                match guard.users.get_local_users() {
+                                    Ok(users) => {
+                                        let mut msg: String = format!("Found {} local user account(s):\n", users.len());
+                                        msg += &users.join("\n");
+                                        send_message(RoomMessageEventContent::text_plain(&msg), guard, &state_lock);
+                                    }
+                                    Err(e) => {
+                                        send_message(RoomMessageEventContent::text_plain(e.to_string()), guard, &state_lock);
+                                    }
+                                }
                             }
                             AdminCommand::RegisterAppservice(yaml) => {
                                 guard.appservice.register_appservice(yaml).unwrap(); // TODO handle error
diff --git a/src/database/users.rs b/src/database/users.rs
index 021c710b..7d14b3e4 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -84,7 +84,6 @@ impl Users {
         Ok(self.userid_password.iter().count())
     }
 
-
     /// Find out which user an access token belongs to.
     #[tracing::instrument(skip(self, token))]
     pub fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>> {
@@ -129,16 +128,21 @@ impl Users {
     /// If utils::string_from_bytes returns an error that username will be skipped
     /// and the function will log the error
     #[tracing::instrument(skip(self))]
-    pub fn get_local_users(&self) -> Vec<String> {
-        self.userid_password.iter().filter(|(_, pw)| pw.len() > 0).map(|(username, _)| {
-            match utils::string_from_bytes(&username) {
+    pub fn get_local_users(&self) -> Result<Vec<String>> {
+        self.userid_password
+            .iter()
+            .filter(|(_, pw)| pw.len() > 0)
+            .map(|(username, _)| match utils::string_from_bytes(&username) {
                 Ok(s) => s,
                 Err(e) => {
-                    Error::bad_database(format!("Failed to parse username: {}", e.to_string()));
+                    Error::bad_database(format!(
+                        "Failed to parse username while calling get_local_users(): {}",
+                        e.to_string()
+                    ));
                     None
                 }
-            }
-        }).collect::<Vec<String>>()
+            })
+            .collect::<Result<Vec<String>>>()
     }
 
     /// Returns the password hash for the given user.