diff --git a/src/handlers.rs b/src/handlers.rs index 7429401..7e1ba0c 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -1,6 +1,6 @@ use crate::{ sources::{fisu, honu, saerro, sanctuary, voidwell}, - types::{AllResponse, Population, Response}, + types::{Population, Response}, }; use axum::{ extract::{Path, State}, @@ -12,7 +12,7 @@ pub async fn get_one_world(State(db): State, Path(world): Path) - Json(get_world(db, world).await) } -pub async fn get_all_worlds(State(db): State) -> Json { +pub async fn get_all_worlds(State(db): State) -> Json> { let mut set = JoinSet::new(); let mut worlds = vec![Response::default(); 8]; @@ -26,7 +26,7 @@ pub async fn get_all_worlds(State(db): State) -> Json { i += 1; } - Json(AllResponse { worlds }) + Json(worlds) } async fn get_world(db: sled::Db, world: i32) -> Response { diff --git a/src/types.rs b/src/types.rs index 24043c0..9953ffe 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,12 +1,6 @@ -use std::collections::HashMap; - use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; - -#[derive(Deserialize, Serialize, Debug, Clone, Default)] -pub struct AllResponse { - pub worlds: Vec, -} +use std::collections::HashMap; #[derive(Deserialize, Serialize, Debug, Clone, Default)] pub struct Response {