diff --git a/sdgb-api/src/title/methods/api_ext/mod.rs b/sdgb-api/src/title/methods/api_ext/mod.rs index 95afbe5..fd4cfd2 100644 --- a/sdgb-api/src/title/methods/api_ext/mod.rs +++ b/sdgb-api/src/title/methods/api_ext/mod.rs @@ -4,9 +4,9 @@ use crate::title::methods::{APIExt, APIMethod}; fn api_implement(api_names: Vec) { for api_name in api_names { crabtime::output!( - pub struct {{api_name}}; + pub struct {{api_name}}Ext; - impl APIExt for {{api_name}} { + impl APIExt for {{api_name}}Ext { const METHOD: APIMethod = APIMethod::{{api_name}}; type Payload = crate::title::model::{{api_name}}; type Response = crate::title::model::{{api_name}}Resp; diff --git a/sdgb-cli/src/main.rs b/sdgb-cli/src/main.rs index c72c2d3..3317cb8 100644 --- a/sdgb-cli/src/main.rs +++ b/sdgb-cli/src/main.rs @@ -203,7 +203,7 @@ async fn main() -> Result<(), Box> { #[cfg(feature = "fetchall")] Commands::ListAllUser { concurrency } => { use crate::{cache::PLAYERS, utils::helpers::cached_concurrent_fetch}; - use sdgb_api::title::methods::GetUserPreviewApi; + use sdgb_api::title::methods::GetUserPreviewApiExt; use std::io::BufRead as _; let mut user_ids = Vec::new(); @@ -222,8 +222,13 @@ async fn main() -> Result<(), Box> { } } - cached_concurrent_fetch::(user_ids, &client, concurrency, PLAYERS) - .await?; + cached_concurrent_fetch::( + user_ids, + &client, + concurrency, + PLAYERS, + ) + .await?; } #[cfg(feature = "fetchall")] @@ -232,7 +237,7 @@ async fn main() -> Result<(), Box> { min_rating, max_rating, } => { - use sdgb_api::title::methods; + use sdgb_api::title::methods::GetUserRatingApiExt; use crate::{ cache::{PLAYER_B50, PLAYERS}, @@ -242,7 +247,7 @@ async fn main() -> Result<(), Box> { let mut players: Vec = read_cache(PLAYERS)?; players.retain(|p| p.player_rating >= min_rating && p.player_rating <= max_rating); - cached_concurrent_fetch::( + cached_concurrent_fetch::( players.iter().map(|p| p.user_id).collect::>(), &client, concurrency,