api info

1 files changed, 8 insertions, 9 deletions

diff --git a/src/main.rs b/src/main.rs
index 56cd695..150f297 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,7 +19,7 @@ fn get_message(id: usize, db: &State<SharedDB>) -> Json<Response<Message, &'stat
     }
 }
 #[get("/get_message_id_list/<id_start>/<id_end>")]
-fn rget_message_id_list(id_start: usize, id_end: usize, db: &State<SharedDB>) -> Json<Response<Vec<usize>, &'static str>> {
+fn get_message_id_list(id_start: usize, id_end: usize, db: &State<SharedDB>) -> Json<Response<Vec<usize>, &'static str>> {
     let lock = db.sdb.lock().unwrap();
     let list = lock.get_message_id_list(id_start, id_end);
 
@@ -190,15 +190,13 @@ struct Message {
 #[derive(serde::Serialize)]
 struct Info {
     name: String,
-    url: String,
     users: usize,
 }
 impl Info {
-    pub fn get() -> Info {
+    pub fn get(db: std::sync::MutexGuard<Database>) -> Info {
         Info{
-            name: String::from("Infernal Garden"),
-            url: String::from("https://wf.infernal.garden"),
-            users: 1,
+            name: String::from("Testing"),
+            users: db.usermap.len(),
         }
     }
 }
@@ -209,8 +207,9 @@ fn ping() -> Json<Response<&'static str, &'static str>> {
 }
 
 #[get("/api")]
-fn api_index() -> Json<Info> {
-    Json(Info::get())
+fn api_index(db: &State<SharedDB>) -> Json<Info> {
+    let lock = db.sdb.lock().unwrap();
+    Json(Info::get(lock))
 }
 
 
@@ -225,7 +224,7 @@ fn rocket() -> _ {
     .mount("/api", routes![
         get_message,
         send_message,
-        rget_message_id_list,
+        get_message_id_list,
         ping,
         get_user,
         create_user,