diff --git a/src/endpoints.rs b/src/endpoints.rs index 472c3e7..0d15e49 100644 --- a/src/endpoints.rs +++ b/src/endpoints.rs @@ -1,13 +1,13 @@ -/////////////////////////////////////////////// -// // -// ! // -// This file is automatically generated! // -// Do not directly edit! // -// // +/////////////////////////////////////////////// +// // +// ! // +// This file is automatically generated! // +// Do not directly edit! // +// // /////////////////////////////////////////////// // http://www.mingweisamuel.com/riotapi-schema/tool/ -// Version 6699beea97d4afea8ffa9310a554ec23a499e531 +// Version 3bd5ca30e5a7aa15963ca4366e3b6be89defe567 //! Automatically generated endpoint handles and data transfer structs. @@ -80,6 +80,27 @@ impl RiotApi { pub fn summoner_v4(&self) -> SummonerV4 { SummonerV4 { base: self } } + /// Handle for TftLeagueV1 endpoints. This method is automatically generated. + /// + /// Official API Reference + #[inline] + pub fn tft_league_v1(&self) -> TftLeagueV1 { + TftLeagueV1 { base: self } + } + /// Handle for TftMatchV1 endpoints. This method is automatically generated. + /// + /// Official API Reference + #[inline] + pub fn tft_match_v1(&self) -> TftMatchV1 { + TftMatchV1 { base: self } + } + /// Handle for TftSummonerV1 endpoints. This method is automatically generated. + /// + /// Official API Reference + #[inline] + pub fn tft_summoner_v1(&self) -> TftSummonerV1 { + TftSummonerV1 { base: self } + } /// Handle for ThirdPartyCodeV4 endpoints. This method is automatically generated. /// /// Official API Reference @@ -189,7 +210,7 @@ impl<'a> LeagueExpV4<'a> { /// * `tier` /// * `division` /// * `page` (optional) - Starts with page 1. - pub fn get_league_entries(&self, region: Region, division: crate::consts::Division, tier: crate::consts::Tier, queue: crate::consts::QueueType, page: Option) + pub fn get_league_entries(&self, region: Region, queue: crate::consts::QueueType, tier: crate::consts::Tier, division: crate::consts::Division, page: Option) -> impl Future>>> + 'a { let mut query_params = Serializer::new(String::new()); @@ -383,17 +404,17 @@ impl<'a> MatchV4<'a> { /// * `beginTime` (optional) - The begin time to use for filtering matchlist specified as epoch milliseconds. If beginTime is specified, but not endTime, then endTime defaults to the the current unix timestamp in milliseconds (the maximum time range limitation is not observed in this specific case). If endTime is specified, but not beginTime, then beginTime defaults to the start of the account's match history returning a 400 due to the maximum time range limitation. If both are specified, then endTime should be greater than beginTime. The maximum time range allowed is one week, otherwise a 400 error code is returned. /// * `endIndex` (optional) - The end index to use for filtering matchlist. If beginIndex is specified, but not endIndex, then endIndex defaults to beginIndex+100. If endIndex is specified, but not beginIndex, then beginIndex defaults to 0. If both are specified, then endIndex must be greater than beginIndex. The maximum range allowed is 100, otherwise a 400 error code is returned. /// * `beginIndex` (optional) - The begin index to use for filtering matchlist. If beginIndex is specified, but not endIndex, then endIndex defaults to beginIndex+100. If endIndex is specified, but not beginIndex, then beginIndex defaults to 0. If both are specified, then endIndex must be greater than beginIndex. The maximum range allowed is 100, otherwise a 400 error code is returned. - pub fn get_matchlist(&self, region: Region, encrypted_account_id: &str, champion: Option>, queue: Option>, season: Option>, end_time: Option, begin_time: Option, end_index: Option, begin_index: Option) + pub fn get_matchlist(&self, region: Region, encrypted_account_id: &str, begin_time: Option, begin_index: Option, champion: Option>, end_time: Option, end_index: Option, queue: Option>, season: Option>) -> impl Future>> + 'a { let mut query_params = Serializer::new(String::new()); + if let Some(begin_time) = begin_time { query_params.append_pair("beginTime", &*begin_time.to_string()); }; + if let Some(begin_index) = begin_index { query_params.append_pair("beginIndex", &*begin_index.to_string()); }; if let Some(champion) = champion { query_params.extend_pairs(champion.iter().map(|w| ("champion", Into::::into(*w).to_string()))); }; + if let Some(end_time) = end_time { query_params.append_pair("endTime", &*end_time.to_string()); }; + if let Some(end_index) = end_index { query_params.append_pair("endIndex", &*end_index.to_string()); }; if let Some(queue) = queue { query_params.extend_pairs(queue.iter().map(|w| ("queue", Into::::into(*w).to_string()))); }; if let Some(season) = season { query_params.extend_pairs(season.iter().map(|w| ("season", Into::::into(*w).to_string()))); }; - if let Some(end_time) = end_time { query_params.append_pair("endTime", &*end_time.to_string()); }; - if let Some(begin_time) = begin_time { query_params.append_pair("beginTime", &*begin_time.to_string()); }; - if let Some(end_index) = end_index { query_params.append_pair("endIndex", &*end_index.to_string()); }; - if let Some(begin_index) = begin_index { query_params.append_pair("beginIndex", &*begin_index.to_string()); }; let query_string = query_params.finish(); let path_string = format!("/lol/match/v4/matchlists/by-account/{}", encrypted_account_id); self.base.get::("match-v4.getMatchlist", region, path_string, Some(query_string)) @@ -511,6 +532,191 @@ impl<'a> SummonerV4<'a> { } +/// TftLeagueV1 endpoints. This struct is automatically generated. +/// +/// Official API Reference +pub struct TftLeagueV1<'a> { + base: &'a RiotApi, +} +impl<'a> TftLeagueV1<'a> { + /// Get the challenger league. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + pub fn get_challenger_league(&self, region: Region) + -> impl Future>> + 'a + { + let path_string = "/tft/league/v1/challenger".to_owned(); + self.base.get::("tft-league-v1.getChallengerLeague", region, path_string, None) + } + + /// Get league entries for a given summoner ID. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `encryptedSummonerId` + pub fn get_league_entries_for_summoner(&self, region: Region, encrypted_summoner_id: &str) + -> impl Future>>> + 'a + { + let path_string = format!("/tft/league/v1/entries/by-summoner/{}", encrypted_summoner_id); + self.base.get::>("tft-league-v1.getLeagueEntriesForSummoner", region, path_string, None) + } + + /// Get all the league entries. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `tier` + /// * `division` + /// * `page` (optional) - Starts with page 1. + pub fn get_league_entries(&self, region: Region, tier: &str, division: &str, page: Option) + -> impl Future>>> + 'a + { + let mut query_params = Serializer::new(String::new()); + if let Some(page) = page { query_params.append_pair("page", &*page.to_string()); }; + let query_string = query_params.finish(); + let path_string = format!("/tft/league/v1/entries/{}/{}", tier, division); + self.base.get::>("tft-league-v1.getLeagueEntries", region, path_string, Some(query_string)) + } + + /// Get the grandmaster league. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + pub fn get_grandmaster_league(&self, region: Region) + -> impl Future>> + 'a + { + let path_string = "/tft/league/v1/grandmaster".to_owned(); + self.base.get::("tft-league-v1.getGrandmasterLeague", region, path_string, None) + } + + /// Get league with given ID, including inactive entries. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `leagueId` - The UUID of the league. + pub fn get_league_by_id(&self, region: Region, league_id: &str) + -> impl Future>> + 'a + { + let path_string = format!("/tft/league/v1/leagues/{}", league_id); + self.base.get::("tft-league-v1.getLeagueById", region, path_string, None) + } + + /// Get the master league. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + pub fn get_master_league(&self, region: Region) + -> impl Future>> + 'a + { + let path_string = "/tft/league/v1/master".to_owned(); + self.base.get::("tft-league-v1.getMasterLeague", region, path_string, None) + } + +} + +/// TftMatchV1 endpoints. This struct is automatically generated. +/// +/// Official API Reference +pub struct TftMatchV1<'a> { + base: &'a RiotApi, +} +impl<'a> TftMatchV1<'a> { + /// Get a list of match ids by PUUID. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `encryptedPUUID` (optional) + pub fn get_match_ids_by_puuid(&self, region: Region, encrypted_puuid: &str) + -> impl Future>>> + 'a + { + let path_string = format!("/tft/match/v1/matches/by-puuid/{}/ids", encrypted_puuid); + self.base.get::>("tft-match-v1.getMatchIdsByPUUID", region, path_string, None) + } + + /// Get a match by match id. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `matchId` + pub fn get_match(&self, region: Region, match_id: &str) + -> impl Future>> + 'a + { + let path_string = format!("/tft/match/v1/matches/{}", match_id); + self.base.get::("tft-match-v1.getMatch", region, path_string, None) + } + +} + +/// TftSummonerV1 endpoints. This struct is automatically generated. +/// +/// Official API Reference +pub struct TftSummonerV1<'a> { + base: &'a RiotApi, +} +impl<'a> TftSummonerV1<'a> { + /// Get a summoner by account ID. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `encryptedAccountId` + pub fn get_by_account_id(&self, region: Region, encrypted_account_id: &str) + -> impl Future>> + 'a + { + let path_string = format!("/tft/summoner/v1/summoners/by-account/{}", encrypted_account_id); + self.base.get::("tft-summoner-v1.getByAccountId", region, path_string, None) + } + + /// Get a summoner by summoner name. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `summonerName` - Summoner Name + pub fn get_by_summoner_name(&self, region: Region, summoner_name: &str) + -> impl Future>> + 'a + { + let path_string = format!("/tft/summoner/v1/summoners/by-name/{}", summoner_name); + self.base.get::("tft-summoner-v1.getBySummonerName", region, path_string, None) + } + + /// Get a summoner by PUUID. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `encryptedPUUID` - Summoner ID + pub fn get_by_puuid(&self, region: Region, encrypted_puuid: &str) + -> impl Future>> + 'a + { + let path_string = format!("/tft/summoner/v1/summoners/by-puuid/{}", encrypted_puuid); + self.base.get::("tft-summoner-v1.getByPUUID", region, path_string, None) + } + + /// Get a summoner by summoner ID. + /// + /// Official API Reference + /// # Parameters + /// * `region` - Region to query. + /// * `encryptedSummonerId` - Summoner ID + pub fn get_by_summoner_id(&self, region: Region, encrypted_summoner_id: &str) + -> impl Future>> + 'a + { + let path_string = format!("/tft/summoner/v1/summoners/{}", encrypted_summoner_id); + self.base.get::("tft-summoner-v1.getBySummonerId", region, path_string, None) + } + +} + /// ThirdPartyCodeV4 endpoints. This struct is automatically generated. /// /// Official API Reference diff --git a/src/endpoints/dto.rs b/src/endpoints/dto.rs index a0e39fb..f06300f 100644 --- a/src/endpoints/dto.rs +++ b/src/endpoints/dto.rs @@ -1,13 +1,13 @@ -/////////////////////////////////////////////// -// // -// ! // -// This file is automatically generated! // -// Do not directly edit! // -// // +/////////////////////////////////////////////// +// // +// ! // +// This file is automatically generated! // +// Do not directly edit! // +// // /////////////////////////////////////////////// // http://www.mingweisamuel.com/riotapi-schema/tool/ -// Version 85da12632b552f2033d1708c17b04306e90b935e +// Version 3bd5ca30e5a7aa15963ca4366e3b6be89defe567 // champion-mastery-v4 #[allow(dead_code)] @@ -56,9 +56,9 @@ pub mod champion_v3 { #[derive(serde::Serialize, serde::Deserialize)] pub struct ChampionInfo { #[serde(rename = "freeChampionIdsForNewPlayers")] - pub free_champion_ids_for_new_players: std::vec::Vec, + pub free_champion_ids_for_new_players: std::vec::Vec, #[serde(rename = "freeChampionIds")] - pub free_champion_ids: std::vec::Vec, + pub free_champion_ids: std::vec::Vec, #[serde(rename = "maxNewPlayerLevel")] pub max_new_player_level: i32, } @@ -482,7 +482,7 @@ pub mod match_v4 { #[serde(rename = "firstBloodAssist")] pub first_blood_assist: bool, #[serde(rename = "visionScore")] - pub vision_score: i64, + pub vision_score: Option, #[serde(rename = "magicDamageDealtToChampions")] pub magic_damage_dealt_to_champions: i64, #[serde(rename = "damageDealtToObjectives")] @@ -493,56 +493,56 @@ pub mod match_v4 { pub longest_time_spent_living: i32, /// Post game rune stats. #[serde(rename = "perk1Var1")] - pub perk1_var1: i32, + pub perk1_var1: Option, /// Post game rune stats. #[serde(rename = "perk1Var3")] - pub perk1_var3: i32, + pub perk1_var3: Option, /// Post game rune stats. #[serde(rename = "perk1Var2")] - pub perk1_var2: i32, + pub perk1_var2: Option, #[serde(rename = "tripleKills")] pub triple_kills: i32, /// Post game rune stats. #[serde(rename = "perk3Var3")] - pub perk3_var3: i32, + pub perk3_var3: Option, #[serde(rename = "nodeNeutralizeAssist")] pub node_neutralize_assist: Option, /// Post game rune stats. #[serde(rename = "perk3Var2")] - pub perk3_var2: i32, + pub perk3_var2: Option, #[serde(rename = "playerScore9")] - pub player_score9: i32, + pub player_score9: Option, #[serde(rename = "playerScore8")] - pub player_score8: i32, + pub player_score8: Option, #[serde(rename = "kills")] pub kills: i32, #[serde(rename = "playerScore1")] - pub player_score1: i32, + pub player_score1: Option, #[serde(rename = "playerScore0")] - pub player_score0: i32, + pub player_score0: Option, #[serde(rename = "playerScore3")] - pub player_score3: i32, + pub player_score3: Option, #[serde(rename = "playerScore2")] - pub player_score2: i32, + pub player_score2: Option, #[serde(rename = "playerScore5")] - pub player_score5: i32, + pub player_score5: Option, #[serde(rename = "playerScore4")] - pub player_score4: i32, + pub player_score4: Option, #[serde(rename = "playerScore7")] - pub player_score7: i32, + pub player_score7: Option, #[serde(rename = "playerScore6")] - pub player_score6: i32, + pub player_score6: Option, /// Post game rune stats. #[serde(rename = "perk5Var1")] - pub perk5_var1: i32, + pub perk5_var1: Option, /// Post game rune stats. #[serde(rename = "perk5Var3")] - pub perk5_var3: i32, + pub perk5_var3: Option, /// Post game rune stats. #[serde(rename = "perk5Var2")] - pub perk5_var2: i32, + pub perk5_var2: Option, #[serde(rename = "totalScoreRank")] - pub total_score_rank: i32, + pub total_score_rank: Option, #[serde(rename = "neutralMinionsKilled")] pub neutral_minions_killed: i32, #[serde(rename = "damageDealtToTurrets")] @@ -555,24 +555,24 @@ pub mod match_v4 { pub largest_multi_kill: i32, /// Post game rune stats. #[serde(rename = "perk2Var2")] - pub perk2_var2: i32, + pub perk2_var2: Option, /// Post game rune stats. #[serde(rename = "perk2Var3")] - pub perk2_var3: i32, + pub perk2_var3: Option, #[serde(rename = "totalUnitsHealed")] pub total_units_healed: i32, /// Post game rune stats. #[serde(rename = "perk2Var1")] - pub perk2_var1: i32, + pub perk2_var1: Option, /// Post game rune stats. #[serde(rename = "perk4Var1")] - pub perk4_var1: i32, + pub perk4_var1: Option, /// Post game rune stats. #[serde(rename = "perk4Var2")] - pub perk4_var2: i32, + pub perk4_var2: Option, /// Post game rune stats. #[serde(rename = "perk4Var3")] - pub perk4_var3: i32, + pub perk4_var3: Option, #[serde(rename = "wardsKilled")] pub wards_killed: i32, #[serde(rename = "largestCriticalStrike")] @@ -601,25 +601,25 @@ pub mod match_v4 { pub item5: i32, /// Primary path rune. #[serde(rename = "perk1")] - pub perk1: i32, + pub perk1: Option, /// Primary path keystone rune. #[serde(rename = "perk0")] - pub perk0: i32, + pub perk0: Option, /// Primary path rune. #[serde(rename = "perk3")] - pub perk3: i32, + pub perk3: Option, /// Primary path rune. #[serde(rename = "perk2")] - pub perk2: i32, + pub perk2: Option, /// Secondary path rune. #[serde(rename = "perk5")] - pub perk5: i32, + pub perk5: Option, /// Secondary path rune. #[serde(rename = "perk4")] - pub perk4: i32, + pub perk4: Option, /// Post game rune stats. #[serde(rename = "perk3Var1")] - pub perk3_var1: i32, + pub perk3_var1: Option, #[serde(rename = "damageSelfMitigated")] pub damage_self_mitigated: i64, #[serde(rename = "magicalDamageTaken")] @@ -633,10 +633,10 @@ pub mod match_v4 { #[serde(rename = "assists")] pub assists: i32, #[serde(rename = "combatPlayerScore")] - pub combat_player_score: i32, + pub combat_player_score: Option, /// Primary rune path #[serde(rename = "perkPrimaryStyle")] - pub perk_primary_style: i32, + pub perk_primary_style: Option, #[serde(rename = "goldSpent")] pub gold_spent: i32, #[serde(rename = "trueDamageDealt")] @@ -648,17 +648,17 @@ pub mod match_v4 { #[serde(rename = "physicalDamageDealt")] pub physical_damage_dealt: i64, #[serde(rename = "sightWardsBoughtInGame")] - pub sight_wards_bought_in_game: i32, + pub sight_wards_bought_in_game: Option, #[serde(rename = "totalDamageDealtToChampions")] pub total_damage_dealt_to_champions: i64, #[serde(rename = "physicalDamageTaken")] pub physical_damage_taken: i64, #[serde(rename = "totalPlayerScore")] - pub total_player_score: i32, + pub total_player_score: Option, #[serde(rename = "win")] pub win: bool, #[serde(rename = "objectivePlayerScore")] - pub objective_player_score: i32, + pub objective_player_score: Option, #[serde(rename = "totalDamageDealt")] pub total_damage_dealt: i64, #[serde(rename = "item1")] @@ -668,12 +668,12 @@ pub mod match_v4 { #[serde(rename = "deaths")] pub deaths: i32, #[serde(rename = "wardsPlaced")] - pub wards_placed: i32, + pub wards_placed: Option, /// Secondary rune path #[serde(rename = "perkSubStyle")] - pub perk_sub_style: i32, + pub perk_sub_style: Option, #[serde(rename = "turretKills")] - pub turret_kills: i32, + pub turret_kills: Option, #[serde(rename = "firstBloodKill")] pub first_blood_kill: bool, #[serde(rename = "trueDamageDealtToChampions")] @@ -687,9 +687,9 @@ pub mod match_v4 { #[serde(rename = "altarsCaptured")] pub altars_captured: Option, #[serde(rename = "firstTowerAssist")] - pub first_tower_assist: bool, + pub first_tower_assist: Option, #[serde(rename = "firstTowerKill")] - pub first_tower_kill: bool, + pub first_tower_kill: Option, #[serde(rename = "champLevel")] pub champ_level: i32, #[serde(rename = "doubleKills")] @@ -697,18 +697,18 @@ pub mod match_v4 { #[serde(rename = "nodeCaptureAssist")] pub node_capture_assist: Option, #[serde(rename = "inhibitorKills")] - pub inhibitor_kills: i32, + pub inhibitor_kills: Option, #[serde(rename = "firstInhibitorAssist")] pub first_inhibitor_assist: Option, /// Post game rune stats. #[serde(rename = "perk0Var1")] - pub perk0_var1: i32, + pub perk0_var1: Option, /// Post game rune stats. #[serde(rename = "perk0Var2")] - pub perk0_var2: i32, + pub perk0_var2: Option, /// Post game rune stats. #[serde(rename = "perk0Var3")] - pub perk0_var3: i32, + pub perk0_var3: Option, #[serde(rename = "visionWardsBoughtInGame")] pub vision_wards_bought_in_game: i32, #[serde(rename = "altarsNeutralized")] @@ -738,34 +738,34 @@ pub mod match_v4 { /// Participant's calculated lane. MID and BOT are legacy values.
/// (Legal values: MID, MIDDLE, TOP, JUNGLE, BOT, BOTTOM) #[serde(rename = "lane")] - pub lane: String, + pub lane: Option, #[serde(rename = "participantId")] - pub participant_id: i32, + pub participant_id: Option, /// Creep score difference versus the calculated lane opponent(s) for a specified period. #[serde(rename = "csDiffPerMinDeltas")] pub cs_diff_per_min_deltas: Option>, /// Gold for a specified period. #[serde(rename = "goldPerMinDeltas")] - pub gold_per_min_deltas: std::collections::HashMap, + pub gold_per_min_deltas: Option>, /// Experience difference versus the calculated lane opponent(s) for a specified period. #[serde(rename = "xpDiffPerMinDeltas")] pub xp_diff_per_min_deltas: Option>, /// Creeps for a specified period. #[serde(rename = "creepsPerMinDeltas")] - pub creeps_per_min_deltas: std::collections::HashMap, + pub creeps_per_min_deltas: Option>, /// Experience change for a specified period. #[serde(rename = "xpPerMinDeltas")] - pub xp_per_min_deltas: std::collections::HashMap, + pub xp_per_min_deltas: Option>, /// Participant's calculated role.
/// (Legal values: DUO, NONE, SOLO, DUO_CARRY, DUO_SUPPORT) #[serde(rename = "role")] - pub role: String, + pub role: Option, /// Damage taken difference versus the calculated lane opponent(s) for a specified period. #[serde(rename = "damageTakenDiffPerMinDeltas")] pub damage_taken_diff_per_min_deltas: Option>, /// Damage taken for a specified period. #[serde(rename = "damageTakenPerMinDeltas")] - pub damage_taken_per_min_deltas: std::collections::HashMap, + pub damage_taken_per_min_deltas: Option>, } /// Mastery data object. This struct is automatically generated. #[derive(Debug)] @@ -1153,6 +1153,277 @@ pub mod summoner_v4 { } } +// tft-league-v1 +#[allow(dead_code)] +pub mod tft_league_v1 { + /// LeagueList data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct LeagueList { + #[serde(rename = "leagueId")] + pub league_id: String, + #[serde(rename = "tier")] + pub tier: crate::consts::Tier, + #[serde(rename = "entries")] + pub entries: std::vec::Vec, + #[serde(rename = "queue")] + pub queue: crate::consts::QueueType, + #[serde(rename = "name")] + pub name: String, + } + /// LeagueItem data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct LeagueItem { + #[serde(rename = "summonerName")] + pub summoner_name: String, + #[serde(rename = "hotStreak")] + pub hot_streak: bool, + #[serde(rename = "miniSeries")] + pub mini_series: Option, + /// First placement. + #[serde(rename = "wins")] + pub wins: i32, + #[serde(rename = "veteran")] + pub veteran: bool, + /// Second through eighth placement. + #[serde(rename = "losses")] + pub losses: i32, + #[serde(rename = "freshBlood")] + pub fresh_blood: bool, + #[serde(rename = "inactive")] + pub inactive: bool, + #[serde(rename = "rank")] + pub rank: crate::consts::Division, + /// Player's encrypted summonerId. + #[serde(rename = "summonerId")] + pub summoner_id: String, + #[serde(rename = "leaguePoints")] + pub league_points: i32, + } + /// MiniSeries data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct MiniSeries { + #[serde(rename = "progress")] + pub progress: String, + #[serde(rename = "losses")] + pub losses: i32, + #[serde(rename = "target")] + pub target: i32, + #[serde(rename = "wins")] + pub wins: i32, + } + /// LeagueEntry data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct LeagueEntry { + #[serde(rename = "queueType")] + pub queue_type: crate::consts::QueueType, + #[serde(rename = "summonerName")] + pub summoner_name: String, + #[serde(rename = "hotStreak")] + pub hot_streak: bool, + #[serde(rename = "miniSeries")] + pub mini_series: Option, + /// First placement. + #[serde(rename = "wins")] + pub wins: i32, + #[serde(rename = "veteran")] + pub veteran: bool, + /// Second through eighth placement. + #[serde(rename = "losses")] + pub losses: i32, + #[serde(rename = "rank")] + pub rank: crate::consts::Division, + #[serde(rename = "leagueId")] + pub league_id: String, + #[serde(rename = "inactive")] + pub inactive: bool, + #[serde(rename = "freshBlood")] + pub fresh_blood: bool, + #[serde(rename = "tier")] + pub tier: crate::consts::Tier, + /// Player's encrypted summonerId. + #[serde(rename = "summonerId")] + pub summoner_id: String, + #[serde(rename = "leaguePoints")] + pub league_points: i32, + } +} + +// tft-match-v1 +#[allow(dead_code)] +pub mod tft_match_v1 { + /// Match data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Match { + /// Match info. + #[serde(rename = "info")] + pub info: Info, + /// Match metadata. + #[serde(rename = "metadata")] + pub metadata: Metadata, + } + /// Info data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Info { + /// Unix timestamp. + #[serde(rename = "game_datetime")] + pub game_datetime: i64, + /// Participants. + #[serde(rename = "participants")] + pub participants: std::vec::Vec, + /// Teamfight Tactics set number. + #[serde(rename = "tft_set_number")] + pub tft_set_number: i32, + /// Game length in seconds. + #[serde(rename = "game_length")] + pub game_length: f32, + /// Please refer to the League of Legends documentation. + #[serde(rename = "queue_id")] + pub queue_id: i32, + /// Game client version. + #[serde(rename = "game_version")] + pub game_version: String, + } + /// Participant data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Participant { + /// Participant placement upon elimination. + #[serde(rename = "placement")] + pub placement: i32, + /// Participant Little Legend level. Note: This is not the number of active units. + #[serde(rename = "level")] + pub level: i32, + /// The round the participant was eliminated in. Note: If the player was eliminated in stage 2-1 their last_round would be 5. + #[serde(rename = "last_round")] + pub last_round: i32, + /// The number of seconds before the participant was eliminated. + #[serde(rename = "time_eliminated")] + pub time_eliminated: f32, + /// Participant's companion. + #[serde(rename = "companion")] + pub companion: Companion, + /// A complete list of traits for the participant's active units. + #[serde(rename = "traits")] + pub traits: std::vec::Vec, + /// Number of players the participant eliminated. + #[serde(rename = "players_eliminated")] + pub players_eliminated: i32, + /// Encrypted PUUID. + #[serde(rename = "puuid")] + pub puuid: String, + /// Damage the participant dealt to other players. + #[serde(rename = "total_damage_to_players")] + pub total_damage_to_players: i32, + /// A list of active units for the participant. + #[serde(rename = "units")] + pub units: std::vec::Vec, + /// Gold left after participant was eliminated. + #[serde(rename = "gold_left")] + pub gold_left: i32, + } + /// Trait data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Trait { + /// Total tiers for the trait. + #[serde(rename = "tier_total")] + pub tier_total: i32, + /// Trait name. + #[serde(rename = "name")] + pub name: String, + /// Current active tier for the trait. + #[serde(rename = "tier_current")] + pub tier_current: i32, + /// Number of units with this trait. + #[serde(rename = "num_units")] + pub num_units: i32, + } + /// Unit data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Unit { + /// Unit tier. + #[serde(rename = "tier")] + pub tier: i32, + /// A list of the unit's items. Please refer to the Teamfight Tactics documentation for item ids. + #[serde(rename = "items")] + pub items: std::vec::Vec, + /// This field was introduced in patch 9.22 with data_version 2. + #[serde(rename = "character_id")] + pub character_id: String, + /// Unit name. + #[serde(rename = "name")] + pub name: String, + /// Unit rarity. This doesn't equate to the unit cost. + #[serde(rename = "rarity")] + pub rarity: i32, + } + /// Metadata data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Metadata { + /// Match data version. + #[serde(rename = "data_version")] + pub data_version: String, + /// A list of encrypted participant PUUIDs. + #[serde(rename = "participants")] + pub participants: std::vec::Vec, + /// Match id. + #[serde(rename = "match_id")] + pub match_id: String, + } + /// Companion data object. This struct is automatically generated. + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Companion { + #[serde(rename = "skin_ID")] + pub skin_id: i32, + #[serde(rename = "content_ID")] + pub content_id: String, + #[serde(rename = "species")] + pub species: String, + } +} + +// tft-summoner-v1 +#[allow(dead_code)] +pub mod tft_summoner_v1 { + /// Summoner data object. This struct is automatically generated. + /// # Description + /// represents a summoner + #[derive(Debug)] + #[derive(serde::Serialize, serde::Deserialize)] + pub struct Summoner { + /// ID of the summoner icon associated with the summoner. + #[serde(rename = "profileIconId")] + pub profile_icon_id: Option, + /// Summoner name. + #[serde(rename = "name")] + pub name: Option, + /// Encrypted PUUID. Exact length of 78 characters. + #[serde(rename = "puuid")] + pub puuid: Option, + /// Summoner level associated with the summoner. + #[serde(rename = "summonerLevel")] + pub summoner_level: Option, + /// Date summoner was last modified specified as epoch milliseconds. The following events will update this timestamp: profile icon change, playing the tutorial or advanced tutorial, finishing a game, summoner name change + #[serde(rename = "revisionDate")] + pub revision_date: Option, + /// Encrypted summoner ID. Max length 63 characters. + #[serde(rename = "id")] + pub id: Option, + /// Encrypted account ID. Max length 56 characters. + #[serde(rename = "accountId")] + pub account_id: Option, + } +} + // tournament-stub-v4 #[allow(dead_code)] pub mod tournament_stub_v4 { @@ -1173,14 +1444,14 @@ pub mod tournament_stub_v4 { pub pick_type: String, /// Optional list of encrypted summonerIds in order to validate the players eligible to join the lobby. NOTE: We currently do not enforce participants at the team level, but rather the aggregate of teamOne and teamTwo. We may add the ability to enforce at the team level in the future. #[serde(rename = "allowedSummonerIds")] - pub allowed_summoner_ids: std::vec::Vec, + pub allowed_summoner_ids: Option>, /// The map type of the game.
/// (Legal values: SUMMONERS_RIFT, TWISTED_TREELINE, HOWLING_ABYSS) #[serde(rename = "mapType")] pub map_type: String, /// Optional string that may contain any data in any format, if specified at all. Used to denote any custom information about the game. #[serde(rename = "metadata")] - pub metadata: String, + pub metadata: Option, } /// LobbyEventWrapper data object. This struct is automatically generated. #[derive(Debug)] @@ -1224,7 +1495,7 @@ pub mod tournament_stub_v4 { pub provider_id: i32, /// The optional name of the tournament. #[serde(rename = "name")] - pub name: String, + pub name: Option, } } @@ -1248,14 +1519,14 @@ pub mod tournament_v4 { pub pick_type: String, /// Optional list of encrypted summonerIds in order to validate the players eligible to join the lobby. NOTE: We currently do not enforce participants at the team level, but rather the aggregate of teamOne and teamTwo. We may add the ability to enforce at the team level in the future. #[serde(rename = "allowedSummonerIds")] - pub allowed_summoner_ids: std::vec::Vec, + pub allowed_summoner_ids: Option>, /// The map type of the game.
/// (Legal values: SUMMONERS_RIFT, TWISTED_TREELINE, HOWLING_ABYSS) #[serde(rename = "mapType")] pub map_type: String, /// Optional string that may contain any data in any format, if specified at all. Used to denote any custom information about the game. #[serde(rename = "metadata")] - pub metadata: String, + pub metadata: Option, } /// TournamentCode data object. This struct is automatically generated. #[derive(Debug)] @@ -1316,7 +1587,7 @@ pub mod tournament_v4 { pub pick_type: String, /// Optional list of encrypted summonerIds in order to validate the players eligible to join the lobby. NOTE: We currently do not enforce participants at the team level, but rather the aggregate of teamOne and teamTwo. We may add the ability to enforce at the team level in the future. #[serde(rename = "allowedSummonerIds")] - pub allowed_summoner_ids: std::vec::Vec, + pub allowed_summoner_ids: Option>, /// The map type
/// (Legal values: SUMMONERS_RIFT, TWISTED_TREELINE, HOWLING_ABYSS) #[serde(rename = "mapType")] @@ -1364,6 +1635,6 @@ pub mod tournament_v4 { pub provider_id: i32, /// The optional name of the tournament. #[serde(rename = "name")] - pub name: String, + pub name: Option, } } diff --git a/srcgen/consts/champion.rs.dt b/srcgen/consts/champion.rs.dt index e8a5ab9..ef56c35 100644 --- a/srcgen/consts/champion.rs.dt +++ b/srcgen/consts/champion.rs.dt @@ -1,7 +1,8 @@ {{ + const dotUtils = require('./dotUtils.js'); const champions = require('./.champion.json') .filter(({ id }) => id > 0) - .sort(({ name: a }, { name: b }) => a > b ? 1 : -1); + .sortBy(({ name }) => name); const hashFactor = 256; const enumName = name => name.replace(/[^a-z]+/i, ''); const strHash = function(str) { @@ -11,7 +12,7 @@ return h; }; const padId = function(id) { return ('' + id).padEnd(3); }; -}}{{= require('./dotUtils.js').preamble() }} +}}{{= dotUtils.preamble() }} use std::fmt; use num_enum::{ IntoPrimitive, TryFromPrimitive }; diff --git a/srcgen/dotUtils.js b/srcgen/dotUtils.js index 65c2748..5902ca6 100644 --- a/srcgen/dotUtils.js +++ b/srcgen/dotUtils.js @@ -20,7 +20,20 @@ Array.prototype.groupBy = function(lambda) { (agg[k] = agg[k] || []).push(x); return agg; }, {})); -} +}; +Array.prototype.sortBy = function(lambda) { + return this.sort((a, b) => { + const va = lambda(a); + const vb = lambda(b); + if ((typeof va) !== (typeof vb)) + throw Error(`Mismatched sort types: ${typeof va}, ${typeof vb}.`); + if (typeof va === 'number') + return va - vb; + if (typeof va === 'string') + return va.localeCompare(vb); + throw Error(`Unknown sort type: ${typeof va}.`); + }); +}; function preamble() { return `\ @@ -51,17 +64,20 @@ function normalizeArgName(name) { return 'base' === argName ? 'Base' : argName; } -function normalizePropName(propName, schemaName, value) { +function normalizePropName(propName) { const out = changeCase.snakeCase(propName); if ('type' === out) return 'r#' + out; return out; } -function stringifyType(prop, endpoint = null, optional = false, fullpath = true, owned = true) { +function stringifyType(prop, { endpoint = null, optional = false, fullpath = true, owned = true }) { if (prop.anyOf) { prop = prop.anyOf[0]; } + if (optional) { + return `Option<${stringifyType(prop, { endpoint, fullpath })}>`; + } let enumType = prop['x-enum']; if (enumType && 'locale' !== enumType) @@ -72,20 +88,17 @@ function stringifyType(prop, endpoint = null, optional = false, fullpath = true, return (!endpoint ? '' : changeCase.snakeCase(endpoint) + '::') + normalizeSchemaName(refType.slice(refType.indexOf('.') + 1)); } - if (optional) { - return `Option<${stringifyType(prop, endpoint, false, fullpath)}>`; - } switch (prop.type) { case 'boolean': return 'bool'; case 'integer': return ('int32' === prop.format ? 'i32' : 'i64'); case 'number': return ('float' === prop.format ? 'f32' : 'f64'); case 'array': - const subprop = stringifyType(prop.items, endpoint, optional, fullpath, owned); + const subprop = stringifyType(prop.items, { endpoint, optional, fullpath, owned }); return (owned ? (fullpath ? 'std::vec::' : '') + `Vec<${subprop}>` : `&[${subprop}]`); case 'string': return (owned ? 'String' : '&str'); case 'object': - return 'std::collections::HashMap<' + stringifyType(prop['x-key'], endpoint, optional, fullpath, owned) + ', ' + - stringifyType(prop.additionalProperties, endpoint, optional, fullpath, owned) + '>'; + return 'std::collections::HashMap<' + stringifyType(prop['x-key'], { endpoint, optional, fullpath, owned }) + ', ' + + stringifyType(prop.additionalProperties, { endpoint, optional, fullpath, owned }) + '>'; default: return prop.type; } } diff --git a/srcgen/endpoints.rs.dt b/srcgen/endpoints.rs.dt index d9d114e..95245de 100644 --- a/srcgen/endpoints.rs.dt +++ b/srcgen/endpoints.rs.dt @@ -67,7 +67,7 @@ impl<'a> {{= endpoint }}<'a> { let method = dotUtils.changeCase.snakeCase(operationId.slice(operationId.indexOf('.') + 1)); let jsonInfo = get.responses['200'].content['application/json']; - let returnType = dotUtils.stringifyType(jsonInfo.schema, endpoint, false, false); + let returnType = dotUtils.stringifyType(jsonInfo.schema, { endpoint, fullpath: false }); /* Cases if not rate limited. */ let rateLimitExcluded = get['x-app-rate-limit-excluded'] ? true : false; @@ -88,11 +88,11 @@ impl<'a> {{= endpoint }}<'a> { if (allParams && allParams.length) { let pathParams = allParams.filter(p => 'path' === p.in) - .sort(p => route.indexOf(p.name)); + .sortBy(({ name }) => route.indexOf(name)); let reqParams = allParams.filter(p => 'path' !== p.in && p.required); let optParams = allParams.filter(p => 'path' !== p.in && !p.required) - .sort(p => { - let match = /(^[a-z]+|[A-Z]+(?![a-z])|[A-Z][a-z]+)/.exec(p.name); + .sortBy(({ name }) => { + let match = /(^[a-z]+|[A-Z]+(?![a-z])|[A-Z][a-z]+)/.exec(name); return match.slice(1).reverse().join(''); }); queryParams = reqParams.concat(optParams); @@ -103,7 +103,7 @@ impl<'a> {{= endpoint }}<'a> { for (let param of paramList) { argBuilder.push(', ', dotUtils.changeCase.snakeCase(param.name), ': ', - dotUtils.stringifyType(param.schema, endpoint, !required, true, false)); + dotUtils.stringifyType(param.schema, { endpoint, optional: !required, owned: false })); } } diff --git a/srcgen/endpoints/dto.rs.dt b/srcgen/endpoints/dto.rs.dt index 5cace69..8e10dc1 100644 --- a/srcgen/endpoints/dto.rs.dt +++ b/srcgen/endpoints/dto.rs.dt @@ -19,10 +19,11 @@ pub mod {{= dotUtils.changeCase.snakeCase(endpoint) }} { {{ for (let schemaKey of schemaKeyGroup) { - let [endpoint, rawSchemaName] = schemaKey.split('.'); - let schemaName = dotUtils.normalizeSchemaName(rawSchemaName); - let schema = schemas[schemaKey]; - let props = schema.properties; + const [endpoint, rawSchemaName] = schemaKey.split('.'); + const schemaName = dotUtils.normalizeSchemaName(rawSchemaName); + const schema = schemas[schemaKey]; + const props = schema.properties; + const requiredSet = new Set(schema.required); }} /// {{= schemaName }} data object. This struct is automatically generated. {{? schema.description }} @@ -35,13 +36,14 @@ pub mod {{= dotUtils.changeCase.snakeCase(endpoint) }} { {{ for (let [ propKey, prop ] of Object.entries(props)) { - let name = dotUtils.normalizePropName(propKey, schemaName, prop); + const name = dotUtils.normalizePropName(propKey); + const required = requiredSet.has(propKey); }} {{? prop.description }} /// {{= prop.description.split('\n').map(x => x.trim()).join('
\r\n /// ') }} {{?}} {{= dotUtils.formatJsonProperty(propKey) }} - pub {{= name }}: {{= dotUtils.stringifyType(prop) }}, + pub {{= name }}: {{= dotUtils.stringifyType(prop, { optional: !required }) }}, {{ } }} diff --git a/tests/tests_na.rs b/tests/tests_na.rs index 5168613..3094c51 100644 --- a/tests/tests_na.rs +++ b/tests/tests_na.rs @@ -45,7 +45,7 @@ async_tests!{ Ok(()) }, leagueexp_get: async { - let p = RIOT_API.league_exp_v4().get_league_entries(Region::NA, Division::I, Tier::CHALLENGER, QueueType::RANKED_SOLO_5x5, None); + let p = RIOT_API.league_exp_v4().get_league_entries(Region::NA, QueueType::RANKED_SOLO_5x5, Tier::CHALLENGER, Division::I, None); let d = p.await.map_err(|e| e.to_string())?.ok_or("Failed to get challenger exp league entries.".to_owned())?; rassert!(!d.is_empty(), "Challenger shouldn't be empty."); Ok(())