From 9aba44b8f44e21e7d4a2e7ddc57a4ab4efa11ea4 Mon Sep 17 00:00:00 2001
From: David <daidavid0609@gmail.com>
Date: Tue, 8 Nov 2022 21:02:32 +0100
Subject: [PATCH] Changed reader to return custom struct

---
 src/config_reader.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/config_reader.rs b/src/config_reader.rs
index 3d140f2..791d45d 100644
--- a/src/config_reader.rs
+++ b/src/config_reader.rs
@@ -2,14 +2,18 @@ pub mod config_reader {
     use std::error::Error;
     use configparser::ini::Ini;
 
-    pub fn read_configs() -> Result<Vec<String>, Box<dyn Error>> {
+    #[derive(Debug)]
+    #[allow(dead_code)]
+    pub struct BotUserCreds {
+        user_id: String,
+        password: String
+    }
+
+    pub fn read_configs(file_path: &str) -> Result<BotUserCreds, Box<dyn Error>> {
         let mut config = Ini::new();
-        let _map = config.load("../../matrix_creds.ini")?;
+        let _map = config.load(file_path)?;
         let user_id = config.get("credentials", "userid").unwrap();
         let password = config.get("credentials", "password").unwrap();
-        let mut return_vec: Vec<String> = vec![];
-        return_vec.push(user_id);
-        return_vec.push(password);
-        return Ok(return_vec)
+        Ok(BotUserCreds{user_id, password})
     }
 }