Release 2.32.0

PR MingweiSamuel/riotapi-schema#43

.github/workflows/ci.yml

@@ -84,37 +84,37 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --features nightly,deny-unknown
+          args: --no-fail-fast --features nightly,deny-unknown
         env:
           RUST_BACKTRACE: 1
           RUSTLOG: riven=trace
           RGAPI_KEY: ${{ secrets.RGAPI_KEY }}
 
-  # lints:
+  lints:
-  #   name: Lints
+    name: Lints
-  #   needs: pre_job
+    needs: pre_job
-  #   if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-  #   runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-  #   steps:
+    steps:
-  #     - name: Checkout sources
+      - name: Checkout sources
-  #       uses: actions/checkout@v2
+        uses: actions/checkout@v2
 
-  #     - name: Install nightly toolchain
+      - name: Install nightly toolchain
-  #       uses: actions-rs/toolchain@v1
+        uses: actions-rs/toolchain@v1
-  #       with:
+        with:
-  #         profile: minimal
+          profile: minimal
-  #         toolchain: nightly
+          toolchain: nightly
-  #         override: true
+          override: true
-  #         components: rustfmt, clippy
+          components: rustfmt, clippy
 
-  #     - name: Run cargo fmt
+      - name: Run cargo fmt
-  #       uses: actions-rs/cargo@v1
+        uses: actions-rs/cargo@v1
-  #       with:
+        with:
-  #         command: fmt
+          command: fmt
-  #         args: --all -- --check
+          args: --all -- --check
 
-  #     - name: Run cargo clippy
+      - name: Run cargo clippy
-  #       uses: actions-rs/cargo@v1
+        uses: actions-rs/cargo@v1
-  #       with:
+        with:
-  #         command: clippy
+          command: clippy
-  #         args: -- -D warnings
+          args: -- -D warnings

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "rust-analyzer.runnableEnv": [
+        {
+            // Set output levels for `tracing` logging.
+            "env": {
+                "RUST_BACKTRACE": "1",
+                "RUST_LOG": "riven=debug"
+            }
+        }
+    ]
+}

Cargo.toml

@@ -1,5 +1,4 @@
 [workspace]
 members = [
     "riven",
-    "example/proxy",
 ]

README.md

@@ -45,7 +45,7 @@ rt.block_on(async {
 
     // Get champion mastery data.
     let masteries = riot_api.champion_mastery_v4()
-        .get_all_champion_masteries(PlatformRoute::NA1, &summoner.id).await
+        .get_all_champion_masteries_by_puuid(PlatformRoute::NA1, &summoner.puuid).await
         .expect("Get champion masteries failed.");
 
     // Print champion masteries.
@@ -72,7 +72,7 @@ Output:
 ```
 The [`RiotApi` struct documentation](https://docs.rs/riven/latest/riven/struct.RiotApi.html)
 contains additional usage information. The [tests](https://github.com/MingweiSamuel/Riven/tree/v/2.x.x/riven/tests)
-and [example proxy](https://github.com/MingweiSamuel/Riven/tree/v/2.x.x/example/proxy)
+and [example proxy](https://github.com/MingweiSamuel/Riven/tree/v/2.x.x/riven/examples/proxy)
 provide more example usage.
 
 ## Feature Flags

example/proxy/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-publish = false
-name = "riven_example_proxy"
-version = "0.0.0"
-authors = [ "Mingwei Samuel <mingwei.samuel@gmail.com>" ]
-edition = "2018"
-
-[dependencies]
-hyper = { version = "0.14", features = [ "server" ] }
-lazy_static = "1.4"
-riven = { path = "../../riven" }
-tokio = { version = "1.0", features = [ "full" ] }
-tracing = "0.1"
-tracing-subscriber = "0.2"

riven/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "riven"
-version = "2.17.0"
+version = "2.32.0"
 authors = ["Mingwei Samuel <mingwei.samuel@gmail.com>"]
 repository = "https://github.com/MingweiSamuel/Riven"
 description = "Riot Games API Library"
@@ -58,4 +58,7 @@ colored = "2"
 env_logger = "0.10.0"
 fake_instant = "0.5.0"
 futures = "0.3"
-tokio = { version = "1", default-features = false, features = [ "rt-multi-thread" ] }
+hyper = { version = "0.14", features = [ "server" ] }
+tokio = { version = "1", features = [ "full" ] }
+tracing = "0.1"
+tracing-subscriber = "0.2"

riven/examples/proxy/README.md

@@ -14,7 +14,7 @@ when Riven is at the rate limit.
 Set `RGAPI_KEY` env var then run:
 ```bash
 export RGAPI_KEY=RGAPI-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
-cargo run
+cargo run --example proxy
 ```
 
 Test in your browser or using `curl`. The first path segment specifies the region:
@@ -25,8 +25,8 @@ $ curl http://localhost:3000/na1/lol/summoner/v4/summoners/by-name/LugnutsK
 $ curl http://localhost:3000/eu/val/status/v1/platform-data
 {"id": "EU", "name": "Europe", "locales": ["..."], "maintenances": [], "incidents": []}
 
-$ curl http://localhost:3000/americas/lol/tournament-stub/v4/providers -H "Content-Type: application/json" -d '{"region":"JP","url":"https://github.com/MingweiSamuel/Riven"}'
+$ curl http://localhost:3000/americas/lol/tournament-stub/v5/providers -H "Content-Type: application/json" -d '{"region":"JP","url":"https://github.com/MingweiSamuel/Riven"}'
-764
+1
 
 $ curl http://localhost:3000/na1/unknown/endpoint
 {"error":"Riot API endpoint method not found."}

riven/examples/proxy/main.rs

@@ -2,16 +2,14 @@
 
 use std::convert::Infallible;
 
-use hyper::http;
+use http::{Method, Request, Response, StatusCode};
-use http::{ Method, Request, Response, StatusCode };
-use hyper::{ Body, Server };
-use hyper::service::{ make_service_fn, service_fn };
 use hyper::header::HeaderValue;
+use hyper::service::{make_service_fn, service_fn};
+use hyper::{http, Body, Server};
 use lazy_static::lazy_static;
-use tracing as log;
-
-use riven::{ RiotApi, RiotApiConfig };
 use riven::consts::Route;
+use riven::{RiotApi, RiotApiConfig};
+use tracing as log;
 
 lazy_static! {
     /// Create lazy static RiotApi instance.
@@ -31,47 +29,64 @@ lazy_static! {
 fn create_json_response(body: &'static str, status: StatusCode) -> Response<Body> {
     let mut resp = Response::new(Body::from(body));
     *resp.status_mut() = status;
-    resp.headers_mut().insert(hyper::header::CONTENT_TYPE, HeaderValue::from_static("application/json"));
+    resp.headers_mut().insert(
+        hyper::header::CONTENT_TYPE,
+        HeaderValue::from_static("application/json"),
+    );
     resp
 }
 
 /// Main request handler service.
 async fn handle_request(req: Request<Body>) -> Result<Response<Body>, Infallible> {
-
     let (parts, body) = req.into_parts();
     let http::request::Parts { method, uri, .. } = parts;
 
     // Handle path.
     let path_data_opt = parse_path(&method, uri.path());
-    let ( route, method_id, req_path ) = match path_data_opt {
+    let (route, method_id, req_path) = match path_data_opt {
-        None => return Ok(create_json_response(
+        None => {
-            r#"{"error":"Riot API endpoint method not found."}"#, StatusCode::NOT_FOUND)),
+            return Ok(create_json_response(
+                r#"{"error":"Riot API endpoint method not found."}"#,
+                StatusCode::NOT_FOUND,
+            ))
+        }
         Some(path_data) => path_data,
     };
 
-    log::debug!("Request to route {:?}, method ID {:?}: {} {:?}.", route, method_id, method, req_path);
+    log::debug!(
+        "Request to route {:?}, method ID {:?}: {} {:?}.",
+        route,
+        method_id,
+        method,
+        req_path
+    );
 
     // Convert http:request::Parts from hyper to reqwest's RequestBuilder.
     let body = match hyper::body::to_bytes(body).await {
         Err(err) => {
             log::info!("Error handling request body: {:#?}", err);
             return Ok(create_json_response(
-                r#"{"error":"Failed to handle request body."}"#, StatusCode::BAD_REQUEST));
+                r#"{"error":"Failed to handle request body."}"#,
-        },
+                StatusCode::BAD_REQUEST,
+            ));
+        }
         Ok(bytes) => bytes,
     };
 
-    let req_builder = RIOT_API.request(method, route.into(), req_path)
+    let req_builder = RIOT_API.request(method, route.into(), req_path).body(body);
-        .body(body);
 
     // Send request to Riot API.
-    let resp_result = RIOT_API.execute_raw(method_id, route.into(), req_builder).await;
+    let resp_result = RIOT_API
+        .execute_raw(method_id, route.into(), req_builder)
+        .await;
     let resp_info = match resp_result {
         Err(err) => {
             log::info!("Riot API error: {:#?}", err.source_reqwest_error());
             return Ok(create_json_response(
-                r#"{"error":"Riot API request failed."}"#, StatusCode::INTERNAL_SERVER_ERROR));
+                r#"{"error":"Riot API request failed."}"#,
-        },
+                StatusCode::INTERNAL_SERVER_ERROR,
+            ));
+        }
         Ok(resp_info) => resp_info,
     };
 
@@ -86,37 +101,43 @@ async fn handle_request(req: Request<Body>) -> Result<Response<Body>, Infallible
     }
     // Otherwise copy body.
     else {
-        *out_response.status_mut()  = api_response.status();
+        *out_response.status_mut() = api_response.status();
 
         // Using streams would be faster.
         let bytes_result = api_response.bytes().await;
         let bytes = match bytes_result {
-            Err(_err) => return Ok(create_json_response(
+            Err(_err) => {
-                    r#"{"error":"Failed to get body from Riot API response."}"#, StatusCode::INTERNAL_SERVER_ERROR)),
+                return Ok(create_json_response(
+                    r#"{"error":"Failed to get body from Riot API response."}"#,
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                ))
+            }
             Ok(bytes) => bytes,
         };
-        *out_response.body_mut() = Body::from((&bytes[..]).to_vec());
+        *out_response.body_mut() = Body::from(bytes);
     }
     Ok(out_response)
 }
 
 /// Gets the region, method_id, and Riot API path based on the given http method and path.
-fn parse_path<'a>(http_method: &Method, req_path: &'a str) -> Option<( Route, &'static str, &'a str )> {
+fn parse_path<'a>(
-
+    http_method: &Method,
+    req_path: &'a str,
+) -> Option<(Route, &'static str, &'a str)> {
     // Split URI into region and rest of path.
     let req_path = req_path.trim_start_matches('/');
-    let ( route, req_path ) = req_path.split_at(req_path.find('/')?);
+    let (route, req_path) = req_path.split_at(req_path.find('/')?);
     let route: Route = route.to_uppercase().parse().ok()?;
 
     // Find method_id for given path.
     let method_id = find_matching_method_id(http_method, req_path)?;
 
-    Some(( route, method_id, req_path ))
+    Some((route, method_id, req_path))
 }
 
 /// Finds the method_id given the request path.
 fn find_matching_method_id(http_method: &Method, req_path: &str) -> Option<&'static str> {
-    for ( endpoint_http_method, ref_path, method_id ) in &riven::meta::ALL_ENDPOINTS {
+    for (endpoint_http_method, ref_path, method_id) in &riven::meta::ALL_ENDPOINTS {
         if http_method == endpoint_http_method && paths_match(ref_path, req_path) {
             return Some(method_id);
         }
@@ -160,7 +181,7 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         async { Ok::<_, Infallible>(service_fn(handle_request)) }
     });
 
-    let addr = ([ 127, 0, 0, 1 ], 3000).into();
+    let addr = ([127, 0, 0, 1], 3000).into();
 
     let server = Server::bind(&addr).serve(make_svc);
 

riven/src/config.rs

@@ -1,12 +1,10 @@
 //! Configuration of RiotApi.
 use std::time::Duration;
 
+use reqwest::header::{HeaderMap, HeaderValue};
 use reqwest::ClientBuilder;
-use reqwest::header::{ HeaderMap, HeaderValue };
 
 /// Configuration for instantiating RiotApi.
-///
-///
 #[derive(Debug)]
 pub struct RiotApiConfig {
     pub(crate) base_url: String,
@@ -72,7 +70,7 @@ impl RiotApiConfig {
         let mut default_headers = HeaderMap::new();
         default_headers.insert(
             Self::RIOT_KEY_HEADER,
-            HeaderValue::from_bytes(api_key.as_ref()).unwrap()
+            HeaderValue::from_bytes(api_key.as_ref()).unwrap(),
         );
 
         Self {
@@ -82,10 +80,7 @@ impl RiotApiConfig {
             method_rate_usage_factor: Self::DEFAULT_RATE_USAGE_FACTOR,
             burst_factor: Self::PRECONFIG_BURST_BURST_FACTOR,
             duration_overhead: Self::PRECONFIG_BURST_DURATION_OVERHEAD,
-            client_builder: Some(
+            client_builder: Some(ClientBuilder::new().default_headers(default_headers)),
-                ClientBuilder::new()
-                    .default_headers(default_headers)
-            ),
         }
     }
 
@@ -191,7 +186,10 @@ impl RiotApiConfig {
             self.method_rate_usage_factor = rate_usage_factor;
             return self;
         }
-        panic!("rate_usage_factor \"{}\" not in range (0, 1].", rate_usage_factor);
+        panic!(
+            "rate_usage_factor \"{}\" not in range (0, 1].",
+            rate_usage_factor
+        );
     }
 
     /// See [Self::set_rate_usage_factor]. Setting this is useful if you have multiple
@@ -209,7 +207,10 @@ impl RiotApiConfig {
             self.app_rate_usage_factor = app_rate_usage_factor;
             return self;
         }
-        panic!("app_rate_usage_factor \"{}\" not in range (0, 1].", app_rate_usage_factor);
+        panic!(
+            "app_rate_usage_factor \"{}\" not in range (0, 1].",
+            app_rate_usage_factor
+        );
     }
 
     /// See [Self::set_rate_usage_factor] and [Self::set_app_rate_usage_factor].
@@ -227,7 +228,10 @@ impl RiotApiConfig {
             self.method_rate_usage_factor = method_rate_usage_factor;
             return self;
         }
-        panic!("method_rate_usage_factor \"{}\" not in range (0, 1].", method_rate_usage_factor);
+        panic!(
+            "method_rate_usage_factor \"{}\" not in range (0, 1].",
+            method_rate_usage_factor
+        );
     }
 
     /// Burst percentage controls how many burst requests are allowed and

riven/src/consts/champion.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -33,6 +34,7 @@ newtype_enum! {
     /// `BLITZCRANK` | "Blitzcrank" | "Blitzcrank" | 53
     /// `BRAND` | "Brand" | "Brand" | 63
     /// `BRAUM` | "Braum" | "Braum" | 201
+    /// `BRIAR` | "Briar" | "Briar" | 233
     /// `CAITLYN` | "Caitlyn" | "Caitlyn" | 51
     /// `CAMILLE` | "Camille" | "Camille" | 164
     /// `CASSIOPEIA` | "Cassiopeia" | "Cassiopeia" | 69
@@ -58,6 +60,7 @@ newtype_enum! {
     /// `GWEN` | "Gwen" | "Gwen" | 887
     /// `HECARIM` | "Hecarim" | "Hecarim" | 120
     /// `HEIMERDINGER` | "Heimerdinger" | "Heimerdinger" | 74
+    /// `HWEI` | "Hwei" | "Hwei" | 910
     /// `ILLAOI` | "Illaoi" | "Illaoi" | 420
     /// `IRELIA` | "Irelia" | "Irelia" | 39
     /// `IVERN` | "Ivern" | "Ivern" | 427
@@ -97,6 +100,7 @@ newtype_enum! {
     /// `MISS_FORTUNE` | "Miss Fortune" | "MissFortune" | 21
     /// `MORDEKAISER` | "Mordekaiser" | "Mordekaiser" | 82
     /// `MORGANA` | "Morgana" | "Morgana" | 25
+    /// `NAAFIRI` | "Naafiri" | "Naafiri" | 950
     /// `NAMI` | "Nami" | "Nami" | 267
     /// `NASUS` | "Nasus" | "Nasus" | 75
     /// `NAUTILUS` | "Nautilus" | "Nautilus" | 111
@@ -135,6 +139,7 @@ newtype_enum! {
     /// `SION` | "Sion" | "Sion" | 14
     /// `SIVIR` | "Sivir" | "Sivir" | 15
     /// `SKARNER` | "Skarner" | "Skarner" | 72
+    /// `SMOLDER` | "Smolder" | "Smolder" | 901
     /// `SONA` | "Sona" | "Sona" | 37
     /// `SORAKA` | "Soraka" | "Soraka" | 16
     /// `SWAIN` | "Swain" | "Swain" | 50
@@ -217,6 +222,8 @@ newtype_enum! {
         BRAND = 63,
         /// `201`.
         BRAUM = 201,
+        /// `233`.
+        BRIAR = 233,
         /// `51`.
         CAITLYN = 51,
         /// `164`.
@@ -267,6 +274,8 @@ newtype_enum! {
         HECARIM = 120,
         /// `74`.
         HEIMERDINGER = 74,
+        /// `910`.
+        HWEI = 910,
         /// `420`.
         ILLAOI = 420,
         /// `39`.
@@ -345,6 +354,8 @@ newtype_enum! {
         MORDEKAISER = 82,
         /// `25`.
         MORGANA = 25,
+        /// `950`.
+        NAAFIRI = 950,
         /// `267`.
         NAMI = 267,
         /// `75`.
@@ -421,6 +432,8 @@ newtype_enum! {
         SIVIR = 15,
         /// `72`.
         SKARNER = 72,
+        /// `901`.
+        SMOLDER = 901,
         /// `37`.
         SONA = 37,
         /// `16`.
@@ -533,6 +546,7 @@ impl Champion {
             Self::BLITZCRANK   => Some("Blitzcrank"),
             Self::BRAND        => Some("Brand"),
             Self::BRAUM        => Some("Braum"),
+            Self::BRIAR        => Some("Briar"),
             Self::CAITLYN      => Some("Caitlyn"),
             Self::CAMILLE      => Some("Camille"),
             Self::CASSIOPEIA   => Some("Cassiopeia"),
@@ -558,6 +572,7 @@ impl Champion {
             Self::GWEN         => Some("Gwen"),
             Self::HECARIM      => Some("Hecarim"),
             Self::HEIMERDINGER => Some("Heimerdinger"),
+            Self::HWEI         => Some("Hwei"),
             Self::ILLAOI       => Some("Illaoi"),
             Self::IRELIA       => Some("Irelia"),
             Self::IVERN        => Some("Ivern"),
@@ -597,6 +612,7 @@ impl Champion {
             Self::MISS_FORTUNE => Some("Miss Fortune"),
             Self::MORDEKAISER  => Some("Mordekaiser"),
             Self::MORGANA      => Some("Morgana"),
+            Self::NAAFIRI      => Some("Naafiri"),
             Self::NAMI         => Some("Nami"),
             Self::NASUS        => Some("Nasus"),
             Self::NAUTILUS     => Some("Nautilus"),
@@ -635,6 +651,7 @@ impl Champion {
             Self::SION         => Some("Sion"),
             Self::SIVIR        => Some("Sivir"),
             Self::SKARNER      => Some("Skarner"),
+            Self::SMOLDER      => Some("Smolder"),
             Self::SONA         => Some("Sona"),
             Self::SORAKA       => Some("Soraka"),
             Self::SWAIN        => Some("Swain"),
@@ -720,6 +737,7 @@ impl Champion {
             Self::BLITZCRANK   => Some("Blitzcrank"),
             Self::BRAND        => Some("Brand"),
             Self::BRAUM        => Some("Braum"),
+            Self::BRIAR        => Some("Briar"),
             Self::CAITLYN      => Some("Caitlyn"),
             Self::CAMILLE      => Some("Camille"),
             Self::CASSIOPEIA   => Some("Cassiopeia"),
@@ -745,6 +763,7 @@ impl Champion {
             Self::GWEN         => Some("Gwen"),
             Self::HECARIM      => Some("Hecarim"),
             Self::HEIMERDINGER => Some("Heimerdinger"),
+            Self::HWEI         => Some("Hwei"),
             Self::ILLAOI       => Some("Illaoi"),
             Self::IRELIA       => Some("Irelia"),
             Self::IVERN        => Some("Ivern"),
@@ -784,6 +803,7 @@ impl Champion {
             Self::MISS_FORTUNE => Some("MissFortune"),
             Self::MORDEKAISER  => Some("Mordekaiser"),
             Self::MORGANA      => Some("Morgana"),
+            Self::NAAFIRI      => Some("Naafiri"),
             Self::NAMI         => Some("Nami"),
             Self::NASUS        => Some("Nasus"),
             Self::NAUTILUS     => Some("Nautilus"),
@@ -822,6 +842,7 @@ impl Champion {
             Self::SION         => Some("Sion"),
             Self::SIVIR        => Some("Sivir"),
             Self::SKARNER      => Some("Skarner"),
+            Self::SMOLDER      => Some("Smolder"),
             Self::SONA         => Some("Sona"),
             Self::SORAKA       => Some("Soraka"),
             Self::SWAIN        => Some("Swain"),
@@ -938,6 +959,7 @@ impl std::str::FromStr for Champion {
             /* BLIT */ [ 'B',  'L',  'I',  'T'] => Ok(Champion::BLITZCRANK),
             /* BRAN */ [ 'B',  'R',  'A',  'N'] => Ok(Champion::BRAND),
             /* BRAU */ [ 'B',  'R',  'A',  'U'] => Ok(Champion::BRAUM),
+            /* BRIA */ [ 'B',  'R',  'I',  'A'] => Ok(Champion::BRIAR),
             /* CAIT */ [ 'C',  'A',  'I',  'T'] => Ok(Champion::CAITLYN),
             /* CAMI */ [ 'C',  'A',  'M',  'I'] => Ok(Champion::CAMILLE),
             /* CASS */ [ 'C',  'A',  'S',  'S'] => Ok(Champion::CASSIOPEIA),
@@ -965,6 +987,7 @@ impl std::str::FromStr for Champion {
             /* GWEN */ [ 'G',  'W',  'E',  'N'] => Ok(Champion::GWEN),
             /* HECA */ [ 'H',  'E',  'C',  'A'] => Ok(Champion::HECARIM),
             /* HEIM */ [ 'H',  'E',  'I',  'M'] => Ok(Champion::HEIMERDINGER),
+            /* HWEI */ [ 'H',  'W',  'E',  'I'] => Ok(Champion::HWEI),
             /* ILLA */ [ 'I',  'L',  'L',  'A'] => Ok(Champion::ILLAOI),
             /* IREL */ [ 'I',  'R',  'E',  'L'] => Ok(Champion::IRELIA),
             /* IVER */ [ 'I',  'V',  'E',  'R'] => Ok(Champion::IVERN),
@@ -1009,6 +1032,7 @@ impl std::str::FromStr for Champion {
             /* MISS */ [ 'M',  'I',  'S',  'S'] => Ok(Champion::MISS_FORTUNE),
             /* MORD */ [ 'M',  'O',  'R',  'D'] => Ok(Champion::MORDEKAISER),
             /* MORG */ [ 'M',  'O',  'R',  'G'] => Ok(Champion::MORGANA),
+            /* NAAF */ [ 'N',  'A',  'A',  'F'] => Ok(Champion::NAAFIRI),
             /* NAMI */ [ 'N',  'A',  'M',  'I'] => Ok(Champion::NAMI),
             /* NASU */ [ 'N',  'A',  'S',  'U'] => Ok(Champion::NASUS),
             /* NAUT */ [ 'N',  'A',  'U',  'T'] => Ok(Champion::NAUTILUS),
@@ -1048,6 +1072,7 @@ impl std::str::FromStr for Champion {
             /* SION */ [ 'S',  'I',  'O',  'N'] => Ok(Champion::SION),
             /* SIVI */ [ 'S',  'I',  'V',  'I'] => Ok(Champion::SIVIR),
             /* SKAR */ [ 'S',  'K',  'A',  'R'] => Ok(Champion::SKARNER),
+            /* SMOL */ [ 'S',  'M',  'O',  'L'] => Ok(Champion::SMOLDER),
             /* SONA */ [ 'S',  'O',  'N',  'A'] => Ok(Champion::SONA),
             /* SORA */ [ 'S',  'O',  'R',  'A'] => Ok(Champion::SORAKA),
             /* SWAI */ [ 'S',  'W',  'A',  'I'] => Ok(Champion::SWAIN),

riven/src/consts/division.rs

@@ -1,9 +1,9 @@
 use std::cmp::Ordering;
 
-use num_enum::{ IntoPrimitive, TryFromPrimitive };
+use num_enum::{IntoPrimitive, TryFromPrimitive};
-use serde::{ Serialize, Deserialize };
+use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
-use strum_macros::{ EnumString, Display, AsRefStr, IntoStaticStr };
+use strum_macros::{AsRefStr, Display, EnumString, IntoStaticStr};
 
 /// LoL and TFT rank divisions, I, II, III, IV, and (deprecated) V.
 ///
@@ -12,25 +12,36 @@ use strum_macros::{ EnumString, Display, AsRefStr, IntoStaticStr };
 /// Repr'd as equivalent numeric values, (1, 2, 3, 4, 5).
 ///
 /// Implements [IntoEnumIterator](super::IntoEnumIterator). Iterator excludes deprecated `Division::V`.
-#[derive(Debug, Copy, Clone)]
+#[derive(
-#[derive(Eq, PartialEq, Hash)]
+    Debug,
-#[derive(EnumString, Display, AsRefStr, IntoStaticStr)]
+    Copy,
-#[derive(IntoPrimitive, TryFromPrimitive)]
+    Clone,
-#[derive(Serialize, Deserialize)]
+    Eq,
+    PartialEq,
+    Hash,
+    EnumString,
+    Display,
+    AsRefStr,
+    IntoStaticStr,
+    IntoPrimitive,
+    TryFromPrimitive,
+    Serialize,
+    Deserialize,
+)]
 #[repr(u8)]
 pub enum Division {
     /// Division 1, the best/highest division in a [`Tier`](crate::consts::Tier), or the only division in
     /// [apex tiers](crate::consts::Tier::is_apex).
-    I   = 1,
+    I = 1,
     /// Division 2, the second highest division.
-    II  = 2,
+    II = 2,
     /// Division 3, the third highest division.
     III = 3,
     /// Division 4, the fourth and lowest division since 2019.
-    IV  = 4,
+    IV = 4,
     /// Division 5, the lowest division, only used before 2019.
-    #[deprecated(note="Removed for 2019.")]
+    #[deprecated(note = "Removed for 2019.")]
-    V   = 5,
+    V = 5,
 }
 
 /// Returns a DoubleEndedIterator of I, II, III, IV.
@@ -39,7 +50,7 @@ pub enum Division {
 impl IntoEnumIterator for Division {
     type Iterator = std::iter::Copied<std::slice::Iter<'static, Self>>;
     fn iter() -> Self::Iterator {
-        [ Self::I, Self::II, Self::III, Self::IV ].iter().copied()
+        [Self::I, Self::II, Self::III, Self::IV].iter().copied()
     }
 }
 

riven/src/consts/game_mode.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -28,6 +29,8 @@ pub enum GameMode {
     ASCENSION,
     /// Blood Hunt Assassin games
     ASSASSINATE,
+    /// 2v2v2v2
+    CHERRY,
     /// Classic Summoner's Rift and Twisted Treeline games
     CLASSIC,
     /// Dark Star: Singularity games
@@ -56,6 +59,8 @@ pub enum GameMode {
     SIEGE,
     /// Star Guardian Invasion games
     STARGUARDIAN,
+    /// Teamfight Tactics, used in `spectator-v4` endpoints.
+    TFT,
     /// Tutorial games
     TUTORIAL,
     /// Tutorial: Welcome to League.

riven/src/consts/game_type.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -17,9 +18,18 @@ use strum_macros::{ EnumString, Display, AsRefStr, IntoStaticStr };
 #[repr(u8)]
 pub enum GameType {
     /// Custom games
+    #[strum(to_string = "CUSTOM_GAME", serialize = "CUSTOM")]
+    #[serde(alias = "CUSTOM")]
     CUSTOM_GAME,
     /// all other games
+    #[strum(to_string = "MATCHED_GAME", serialize = "MATCHED")]
+    #[serde(alias = "MATCHED")]
     MATCHED_GAME,
     /// Tutorial games
+    #[strum(to_string = "TUTORIAL_GAME", serialize = "TUTORIAL")]
+    #[serde(alias = "TUTORIAL")]
     TUTORIAL_GAME,
 }
+
+#[cfg(test)]
+mod test;

riven/src/consts/game_type/test.rs

@@ -0,0 +1,24 @@
+use super::*;
+
+#[test]
+fn check_as_ref() {
+    assert_eq!("MATCHED_GAME", GameType::MATCHED_GAME.as_ref());
+}
+
+#[test]
+fn check_to_string() {
+    assert_eq!("MATCHED_GAME", GameType::MATCHED_GAME.to_string());
+}
+
+#[test]
+fn check_from_string() {
+    assert_eq!(Ok(GameType::MATCHED_GAME), "MATCHED_GAME".parse());
+    assert_eq!(Ok(GameType::MATCHED_GAME), "MATCHED".parse());
+}
+
+#[test]
+fn check_serialize() {
+    assert_eq!(Some("\"MATCHED_GAME\""),
+        serde_json::to_string(&GameType::MATCHED_GAME)
+            .ok().as_deref());
+}

riven/src/consts/macros.rs

@@ -7,7 +7,7 @@
 ///
 /// Also implements `AsRef<str>`, `Display`, and `From<&str>`.
 macro_rules! serde_strum_unknown {
-    ( $name:ident ) => {
+    ($name:ident) => {
         impl AsRef<str> for $name {
             fn as_ref(&self) -> &str {
                 match self {
@@ -38,7 +38,7 @@ macro_rules! serde_strum_unknown {
         impl<'de> serde::de::Deserialize<'de> for $name {
             fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
             where
-                D: serde::de::Deserializer<'de>
+                D: serde::de::Deserializer<'de>,
             {
                 #[cfg(not(feature = "deny-unknown-enum-variants-strings"))]
                 {
@@ -46,20 +46,19 @@ macro_rules! serde_strum_unknown {
                 }
                 #[cfg(feature = "deny-unknown-enum-variants-strings")]
                 {
-                    <&str>::deserialize(deserializer).map(Into::into)
+                    <&str>::deserialize(deserializer)
-                        .and_then(|item| {
+                        .map(Into::into)
-                            match item {
+                        .and_then(|item| match item {
-                                Self::UNKNOWN(unknown) => Err(serde::de::Error::unknown_variant(
+                            Self::UNKNOWN(unknown) => Err(serde::de::Error::unknown_variant(
-                                    &*unknown,
+                                &*unknown,
-                                    <Self as strum::VariantNames>::VARIANTS,
+                                <Self as strum::VariantNames>::VARIANTS,
-                                )),
+                            )),
-                                other => Ok(other),
+                            other => Ok(other),
-                            }
                         })
                 }
             }
         }
-    }
+    };
 }
 
 macro_rules! arr {

riven/src/consts/map.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -69,5 +70,9 @@ newtype_enum! {
         /// Convergence
         /// Teamfight Tactics map
         CONVERGENCE = 22,
+        /// `30`.
+        /// Arena
+        /// Map for 2v2v2v2 (`CHERRY`). Team up with a friend or venture solo in this new game mode. Face against multiple teams in chaotic battles across diverse arenas
+        ARENA = 30,
     }
 }

riven/src/consts/mod.rs

@@ -8,42 +8,47 @@
 
 mod macros;
 
+#[rustfmt::skip]
 mod champion;
 pub use champion::*;
 
 mod division;
 pub use division::*;
 
+#[rustfmt::skip]
 mod game_mode;
 pub use game_mode::*;
 
+#[rustfmt::skip]
 mod game_type;
 pub use game_type::*;
 
+#[rustfmt::skip]
 mod map;
 pub use map::*;
 
+#[rustfmt::skip]
 mod queue_type;
 pub use queue_type::*;
 
+#[rustfmt::skip]
 mod queue;
 pub use queue::*;
 
 pub mod ranks;
 
+#[rustfmt::skip]
 mod route;
 pub use route::*;
 
 mod route_ext;
 pub use route_ext::*;
 
+#[rustfmt::skip]
 mod season;
 pub use season::*;
-
 /// Trait allowing iteration of enum types, implemented by several enums in this module.
 /// Re-exported from strum.
-///
-///
 pub use strum::IntoEnumIterator;
 
 mod team;

riven/src/consts/queue.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -14,101 +15,121 @@ newtype_enum! {
         CUSTOM = 0,
         /// `2`.
         /// 5v5 Blind Pick games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 430
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 430")]
         SUMMONERS_RIFT_5V5_BLIND_PICK_DEPRECATED_2 = 2,
         /// `4`.
         /// 5v5 Ranked Solo games on Summoner's Rift
+        ///
         /// Deprecated in favor of queueId 420
         #[deprecated(note="Deprecated in favor of queueId 420")]
         SUMMONERS_RIFT_5V5_RANKED_SOLO_DEPRECATED_4 = 4,
         /// `6`.
         /// 5v5 Ranked Premade games on Summoner's Rift
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         SUMMONERS_RIFT_5V5_RANKED_PREMADE = 6,
         /// `7`.
         /// Co-op vs AI games on Summoner's Rift
+        ///
         /// Deprecated in favor of queueId 32 and 33
         #[deprecated(note="Deprecated in favor of queueId 32 and 33")]
         SUMMONERS_RIFT_CO_OP_VS_AI = 7,
         /// `8`.
         /// 3v3 Normal games on Twisted Treeline
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 460
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 460")]
         TWISTED_TREELINE_3V3_NORMAL = 8,
         /// `9`.
         /// 3v3 Ranked Flex games on Twisted Treeline
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 470
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 470")]
         TWISTED_TREELINE_3V3_RANKED_FLEX_DEPRECATED_9 = 9,
         /// `14`.
         /// 5v5 Draft Pick games on Summoner's Rift
+        ///
         /// Deprecated in favor of queueId 400
         #[deprecated(note="Deprecated in favor of queueId 400")]
         SUMMONERS_RIFT_5V5_DRAFT_PICK_DEPRECATED_14 = 14,
         /// `16`.
         /// 5v5 Dominion Blind Pick games on Crystal Scar
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         CRYSTAL_SCAR_5V5_DOMINION_BLIND_PICK = 16,
         /// `17`.
         /// 5v5 Dominion Draft Pick games on Crystal Scar
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         CRYSTAL_SCAR_5V5_DOMINION_DRAFT_PICK = 17,
         /// `25`.
         /// Dominion Co-op vs AI games on Crystal Scar
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         CRYSTAL_SCAR_DOMINION_CO_OP_VS_AI = 25,
         /// `31`.
         /// Co-op vs AI Intro Bot games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 830
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 830")]
         SUMMONERS_RIFT_CO_OP_VS_AI_INTRO_BOT_DEPRECATED_31 = 31,
         /// `32`.
         /// Co-op vs AI Beginner Bot games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 840
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 840")]
         SUMMONERS_RIFT_CO_OP_VS_AI_BEGINNER_BOT_DEPRECATED_32 = 32,
         /// `33`.
         /// Co-op vs AI Intermediate Bot games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 850
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 850")]
         SUMMONERS_RIFT_CO_OP_VS_AI_INTERMEDIATE_BOT_DEPRECATED_33 = 33,
         /// `41`.
         /// 3v3 Ranked Team games on Twisted Treeline
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         TWISTED_TREELINE_3V3_RANKED_TEAM = 41,
         /// `42`.
         /// 5v5 Ranked Team games on Summoner's Rift
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         SUMMONERS_RIFT_5V5_RANKED_TEAM = 42,
         /// `52`.
         /// Co-op vs AI games on Twisted Treeline
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 800
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 800")]
         TWISTED_TREELINE_CO_OP_VS_AI = 52,
         /// `61`.
         /// 5v5 Team Builder games on Summoner's Rift
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         SUMMONERS_RIFT_5V5_TEAM_BUILDER = 61,
         /// `65`.
         /// 5v5 ARAM games on Howling Abyss
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 450
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 450")]
         HOWLING_ABYSS_5V5_ARAM_DEPRECATED_65 = 65,
         /// `67`.
         /// ARAM Co-op vs AI games on Howling Abyss
+        ///
         /// Game mode deprecated
         #[deprecated(note="Game mode deprecated")]
         HOWLING_ABYSS_ARAM_CO_OP_VS_AI = 67,
         /// `70`.
         /// One for All games on Summoner's Rift
+        ///
         /// Deprecated in patch 8.6 in favor of queueId 1020
         #[deprecated(note="Deprecated in patch 8.6 in favor of queueId 1020")]
         SUMMONERS_RIFT_ONE_FOR_ALL_DEPRECATED_70 = 70,
@@ -132,21 +153,25 @@ newtype_enum! {
         SUMMONERS_RIFT_CO_OP_VS_AI_ULTRA_RAPID_FIRE = 83,
         /// `91`.
         /// Doom Bots Rank 1 games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 950
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 950")]
         SUMMONERS_RIFT_DOOM_BOTS_RANK_1 = 91,
         /// `92`.
         /// Doom Bots Rank 2 games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 950
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 950")]
         SUMMONERS_RIFT_DOOM_BOTS_RANK_2 = 92,
         /// `93`.
         /// Doom Bots Rank 5 games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 950
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 950")]
         SUMMONERS_RIFT_DOOM_BOTS_RANK_5 = 93,
         /// `96`.
         /// Ascension games on Crystal Scar
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 910
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 910")]
         CRYSTAL_SCAR_ASCENSION_DEPRECATED_96 = 96,
@@ -158,6 +183,7 @@ newtype_enum! {
         BUTCHERS_BRIDGE_5V5_ARAM = 100,
         /// `300`.
         /// Legend of the Poro King games on Howling Abyss
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 920
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 920")]
         HOWLING_ABYSS_LEGEND_OF_THE_PORO_KING_DEPRECATED_300 = 300,
@@ -169,6 +195,7 @@ newtype_enum! {
         SUMMONERS_RIFT_BLACK_MARKET_BRAWLERS = 313,
         /// `315`.
         /// Nexus Siege games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 940
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 940")]
         SUMMONERS_RIFT_NEXUS_SIEGE_DEPRECATED_315 = 315,
@@ -177,6 +204,7 @@ newtype_enum! {
         CRYSTAL_SCAR_DEFINITELY_NOT_DOMINION = 317,
         /// `318`.
         /// ARURF games on Summoner's Rift
+        ///
         /// Deprecated in patch 7.19 in favor of queueId 900
         #[deprecated(note="Deprecated in patch 7.19 in favor of queueId 900")]
         SUMMONERS_RIFT_ARURF_DEPRECATED_318 = 318,
@@ -188,6 +216,7 @@ newtype_enum! {
         SUMMONERS_RIFT_5V5_DRAFT_PICK = 400,
         /// `410`.
         /// 5v5 Ranked Dynamic games on Summoner's Rift
+        ///
         /// Game mode deprecated in patch 6.22
         #[deprecated(note="Game mode deprecated in patch 6.22")]
         SUMMONERS_RIFT_5V5_RANKED_DYNAMIC = 410,
@@ -205,14 +234,21 @@ newtype_enum! {
         HOWLING_ABYSS_5V5_ARAM = 450,
         /// `460`.
         /// 3v3 Blind Pick games on Twisted Treeline
+        ///
         /// Deprecated in patch 9.23
         #[deprecated(note="Deprecated in patch 9.23")]
         TWISTED_TREELINE_3V3_BLIND_PICK = 460,
         /// `470`.
         /// 3v3 Ranked Flex games on Twisted Treeline
+        ///
         /// Deprecated in patch 9.23
         #[deprecated(note="Deprecated in patch 9.23")]
         TWISTED_TREELINE_3V3_RANKED_FLEX_DEPRECATED_470 = 470,
+        /// `490`.
+        /// Normal (Quickplay) games on Summoner's Rift
+        ///
+        /// https://github.com/RiotGames/developer-relations/issues/846
+        SUMMONERS_RIFT_NORMAL_QUICKPLAY_ = 490,
         /// `600`.
         /// Blood Hunt Assassin games on Summoner's Rift
         SUMMONERS_RIFT_BLOOD_HUNT_ASSASSIN = 600,
@@ -227,11 +263,13 @@ newtype_enum! {
         HOWLING_ABYSS_ARAM_CLASH = 720,
         /// `800`.
         /// Co-op vs. AI Intermediate Bot games on Twisted Treeline
+        ///
         /// Deprecated in patch 9.23
         #[deprecated(note="Deprecated in patch 9.23")]
         TWISTED_TREELINE_CO_OP_VS_AI_INTERMEDIATE_BOT = 800,
         /// `810`.
         /// Co-op vs. AI Intro Bot games on Twisted Treeline
+        ///
         /// Deprecated in patch 9.23
         #[deprecated(note="Deprecated in patch 9.23")]
         TWISTED_TREELINE_CO_OP_VS_AI_INTRO_BOT = 810,
@@ -318,6 +356,7 @@ newtype_enum! {
         CONVERGENCE_RANKED_TEAMFIGHT_TACTICS_HYPER_ROLL_ = 1130,
         /// `1150`.
         /// Ranked Teamfight Tactics (Double Up Workshop) games on Convergence
+        ///
         /// Deprecated in patch 12.11 in favor of queueId 1160
         #[deprecated(note="Deprecated in patch 12.11 in favor of queueId 1160")]
         CONVERGENCE_RANKED_TEAMFIGHT_TACTICS_DOUBLE_UP_WORKSHOP__DEPRECATED_1150 = 1150,
@@ -326,6 +365,7 @@ newtype_enum! {
         CONVERGENCE_RANKED_TEAMFIGHT_TACTICS_DOUBLE_UP_WORKSHOP_ = 1160,
         /// `1200`.
         /// Nexus Blitz games on Nexus Blitz
+        ///
         /// Deprecated in patch 9.2 in favor of queueId 1300
         #[deprecated(note="Deprecated in patch 9.2 in favor of queueId 1300")]
         NEXUS_BLITZ_DEPRECATED_1200 = 1200,
@@ -335,6 +375,9 @@ newtype_enum! {
         /// `1400`.
         /// Ultimate Spellbook games on Summoner's Rift
         SUMMONERS_RIFT_ULTIMATE_SPELLBOOK = 1400,
+        /// `1700`.
+        /// 2v2v2v2 `CHERRY` games on Arena
+        ARENA_2V2V2V2_CHERRY_ = 1700,
         /// `1900`.
         /// Pick URF games on Summoner's Rift
         SUMMONERS_RIFT_PICK_URF = 1900,
@@ -347,5 +390,8 @@ newtype_enum! {
         /// `2020`.
         /// Tutorial 3 games on Summoner's Rift
         SUMMONERS_RIFT_TUTORIAL_3 = 2020,
+        /// `6000`.
+        /// Teamfight Tactics Set 3.5 Revival games on Convergence
+        CONVERGENCE_TEAMFIGHT_TACTICS_SET_3_5_REVIVAL = 6000,
     }
 }

riven/src/consts/queue_type.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -32,11 +33,13 @@ pub enum QueueType {
     /// Ranked Teamfight Tactics (Hyper Roll) games
     RANKED_TFT_TURBO,
     /// Ranked Teamfight Tactics (Double Up Workshop) games
-    /// Deprecated in patch 12.11 in favor of queueId 1160
+    /// Deprecated in patch 12.11 in favor of queueId 1160 (`RANKED_TFT_DOUBLE_UP`)
-    #[deprecated(note="Deprecated in patch 12.11 in favor of queueId 1160")]
+    #[deprecated(note="Deprecated in patch 12.11 in favor of queueId 1160 (`RANKED_TFT_DOUBLE_UP`)")]
     RANKED_TFT_PAIRS,
     /// Ranked Teamfight Tactics (Double Up Workshop) games
     RANKED_TFT_DOUBLE_UP,
+    /// 2v2v2v2 "Arena" games
+    CHERRY,
 }
 
 serde_strum_unknown!(QueueType);

riven/src/consts/ranks.rs

@@ -4,10 +4,10 @@ use std::iter::Peekable;
 
 use strum::IntoEnumIterator;
 
-use super::{ Tier, Division };
+use super::{Division, Tier};
 
 /// (Tier, Division) tuple representing a rank.
-pub type Rank = ( Tier, Division );
+pub type Rank = (Tier, Division);
 
 /// Iterator for iterating `(Tier, Division)` rank tuples.
 pub struct Iter {
@@ -20,13 +20,12 @@ impl Iterator for Iter {
     fn next(&mut self) -> Option<Self::Item> {
         // First find the tier (innermost loop).
         // If none found, we go to next tier (in unwrap_or_else case).
-        let div = self.div_iter.next()
+        let div = self.div_iter.next().unwrap_or_else(|| {
-            .unwrap_or_else(|| {
+            // If no divisions available, go to next tier, reset the divisions, and return I.
-                // If no divisions available, go to next tier, reset the divisions, and return I.
+            self.tier_iter.next();
-                self.tier_iter.next();
+            self.div_iter = Division::iter();
-                self.div_iter = Division::iter();
+            self.div_iter.next().unwrap()
-                self.div_iter.next().unwrap()
+        });
-            });
 
         // Then find the tier.
         let tier = *self.tier_iter.peek()?;
@@ -36,7 +35,7 @@ impl Iterator for Iter {
             self.div_iter = Division::iter();
         }
 
-        Some(( tier, div ))
+        Some((tier, div))
     }
 }
 
@@ -66,33 +65,16 @@ pub fn non_apex_iter() -> Iter {
 
 #[cfg(test)]
 mod tests {
-    use super::{ Tier, Division };
+    use super::{Division, Tier};
 
     #[test]
     fn iter() {
         let mut it = super::iter();
-        assert_eq!(Some(( Tier::CHALLENGER,  Division::I )),  it.next());
+        assert_eq!(Some((Tier::CHALLENGER, Division::I)), it.next());
-        assert_eq!(Some(( Tier::GRANDMASTER, Division::I )),  it.next());
+        assert_eq!(Some((Tier::GRANDMASTER, Division::I)), it.next());
-        assert_eq!(Some(( Tier::MASTER,      Division::I )),  it.next());
+        assert_eq!(Some((Tier::MASTER, Division::I)), it.next());
-        assert_eq!(Some(( Tier::DIAMOND,     Division::I )),  it.next());
+        assert_eq!(Some((Tier::DIAMOND, Division::I)), it.next());
-        assert_eq!(Some(( Tier::DIAMOND,     Division::II )), it.next());
+        assert_eq!(Some((Tier::DIAMOND, Division::II)), it.next());
-        let mut last = None;
-        for next in &mut it {
-            last = Some(next);
-        }
-        assert_eq!(Some(( Tier::IRON, Division::IV )), last);
-        assert_eq!(None, it.next());
-    }
-
-    
-    #[test]
-    fn non_apex_iter() {
-        let mut it = super::non_apex_iter();
-        assert_eq!(Some((Tier::DIAMOND,  Division::I)),   it.next());
-        assert_eq!(Some((Tier::DIAMOND,  Division::II)),  it.next());
-        assert_eq!(Some((Tier::DIAMOND,  Division::III)), it.next());
-        assert_eq!(Some((Tier::DIAMOND,  Division::IV)),  it.next());
-        assert_eq!(Some((Tier::PLATINUM, Division::I)),   it.next());
         let mut last = None;
         for next in &mut it {
             last = Some(next);
@@ -100,4 +82,20 @@ mod tests {
         assert_eq!(Some((Tier::IRON, Division::IV)), last);
         assert_eq!(None, it.next());
     }
+
+    #[test]
+    fn non_apex_iter() {
+        let mut it = super::non_apex_iter();
+        assert_eq!(Some((Tier::DIAMOND, Division::I)), it.next());
+        assert_eq!(Some((Tier::DIAMOND, Division::II)), it.next());
+        assert_eq!(Some((Tier::DIAMOND, Division::III)), it.next());
+        assert_eq!(Some((Tier::DIAMOND, Division::IV)), it.next());
+        assert_eq!(Some((Tier::EMERALD, Division::I)), it.next());
+        assert_eq!(Some((Tier::EMERALD, Division::II)), it.next());
+        assert_eq!(Some((Tier::EMERALD, Division::III)), it.next());
+        assert_eq!(Some((Tier::EMERALD, Division::IV)), it.next());
+        assert_eq!(Some((Tier::PLATINUM, Division::I)), it.next());
+        let last = it.last();
+        assert_eq!(Some((Tier::IRON, Division::IV)), last);
+    }
 }

riven/src/consts/route.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -108,7 +109,7 @@ pub enum PlatformRoute {
     #[strum(to_string="NA1", serialize="NA")]
     NA1 = 23,
 
-    /// Oceana.
+    /// Oceania.
     ///
     /// `24` (riotapi-schema ID/repr)
     #[strum(to_string="OC1", serialize="OCE")]
@@ -335,7 +336,7 @@ pub enum TournamentRegion {
     LAS = 22,
     /// North America.
     NA = 23,
-    /// Oceana.
+    /// Oceania.
     OCE = 24,
     /// Turkey
     TR = 26,

riven/src/consts/route_ext.rs

@@ -1,9 +1,7 @@
-use super::{ RegionalRoute, PlatformRoute, ValPlatformRoute };
+use super::{PlatformRoute, RegionalRoute, ValPlatformRoute};
 
 /// Utility enum containing all routing variants.
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone, Copy)]
-#[derive(PartialEq, Eq, Hash, PartialOrd, Ord)]
-#[derive(Clone, Copy)]
 #[repr(u8)]
 #[non_exhaustive]
 pub enum Route {
@@ -40,13 +38,13 @@ impl num_enum::TryFromPrimitive for Route {
 
     const NAME: &'static str = stringify!(Route);
 
-    fn try_from_primitive(number: Self::Primitive) -> Result<Self, num_enum::TryFromPrimitiveError<Self>> {
+    fn try_from_primitive(
+        number: Self::Primitive,
+    ) -> Result<Self, num_enum::TryFromPrimitiveError<Self>> {
         RegionalRoute::try_from_primitive(number)
             .map(Route::Regional)
-            .or_else(|_| PlatformRoute::try_from_primitive(number)
+            .or_else(|_| PlatformRoute::try_from_primitive(number).map(Route::Platform))
-                .map(Route::Platform))
+            .or_else(|_| ValPlatformRoute::try_from_primitive(number).map(Route::ValPlatform))
-            .or_else(|_| ValPlatformRoute::try_from_primitive(number)
-                .map(Route::ValPlatform))
             .map_err(|_| num_enum::TryFromPrimitiveError { number })
     }
 }
@@ -73,10 +71,8 @@ impl std::str::FromStr for Route {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         RegionalRoute::from_str(s)
             .map(Self::Regional)
-            .or_else(|_| PlatformRoute::from_str(s)
+            .or_else(|_| PlatformRoute::from_str(s).map(Self::Platform))
-                .map(Self::Platform))
+            .or_else(|_| ValPlatformRoute::from_str(s).map(Self::ValPlatform))
-            .or_else(|_| ValPlatformRoute::from_str(s)
-                .map(Self::ValPlatform))
             .map_err(|_| strum::ParseError::VariantNotFound)
     }
 }
@@ -87,16 +83,11 @@ impl Route {
     pub fn iter() -> impl Iterator<Item = Self> {
         use strum::IntoEnumIterator;
 
-        let regional = RegionalRoute::iter()
+        let regional = RegionalRoute::iter().map(Self::Regional);
-            .map(Self::Regional);
+        let platform = PlatformRoute::iter().map(Self::Platform);
-        let platform = PlatformRoute::iter()
+        let val_platform = ValPlatformRoute::iter().map(Self::ValPlatform);
-            .map(Self::Platform);
-        let val_platform = ValPlatformRoute::iter()
-            .map(Self::ValPlatform);
 
-        regional
+        regional.chain(platform).chain(val_platform)
-            .chain(platform)
-            .chain(val_platform)
     }
 }
 
@@ -106,9 +97,18 @@ mod tests {
 
     #[test]
     fn test_route_tostring() {
-        assert_eq!("AMERICAS", Into::<&'static str>::into(Route::Regional(RegionalRoute::AMERICAS)));
+        assert_eq!(
-        assert_eq!("KR", Into::<&'static str>::into(Route::Platform(PlatformRoute::KR)));
+            "AMERICAS",
-        assert_eq!("KR", Into::<&'static str>::into(Route::ValPlatform(ValPlatformRoute::KR)));
+            Into::<&'static str>::into(Route::Regional(RegionalRoute::AMERICAS))
+        );
+        assert_eq!(
+            "KR",
+            Into::<&'static str>::into(Route::Platform(PlatformRoute::KR))
+        );
+        assert_eq!(
+            "KR",
+            Into::<&'static str>::into(Route::ValPlatform(ValPlatformRoute::KR))
+        );
     }
 
     #[test]
@@ -132,7 +132,10 @@ mod tests {
         assert_eq!("AMERICAS", RegionalRoute::AMERICAS.to_string());
         assert_eq!("SEA", RegionalRoute::SEA.to_string());
 
-        assert_eq!("AMERICAS", Into::<&'static str>::into(RegionalRoute::AMERICAS));
+        assert_eq!(
+            "AMERICAS",
+            Into::<&'static str>::into(RegionalRoute::AMERICAS)
+        );
         assert_eq!("SEA", Into::<&'static str>::into(RegionalRoute::SEA));
     }
 
@@ -171,7 +174,10 @@ mod tests {
 
         assert_eq!("AP", Into::<&'static str>::into(ValPlatformRoute::AP));
         assert_eq!("KR", Into::<&'static str>::into(ValPlatformRoute::KR));
-        assert_eq!("ESPORTS", Into::<&'static str>::into(ValPlatformRoute::ESPORTS));
+        assert_eq!(
+            "ESPORTS",
+            Into::<&'static str>::into(ValPlatformRoute::ESPORTS)
+        );
     }
 
     #[test]

riven/src/consts/season.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //

riven/src/consts/team.rs

@@ -1,13 +1,26 @@
-use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{IntoPrimitive, TryFromPrimitive};
-use num_enum::{ IntoPrimitive, TryFromPrimitive };
+use serde_repr::{Deserialize_repr, Serialize_repr};
 
 /// League of Legends team.
-#[derive(Debug, Copy, Clone)]
+#[derive(
-#[derive(Eq, PartialEq, Hash, Ord, PartialOrd)]
+    Debug,
-#[derive(Serialize_repr, Deserialize_repr)]
+    Copy,
-#[derive(IntoPrimitive, TryFromPrimitive)]
+    Clone,
+    Eq,
+    PartialEq,
+    Hash,
+    Ord,
+    PartialOrd,
+    Serialize_repr,
+    Deserialize_repr,
+    IntoPrimitive,
+    TryFromPrimitive,
+)]
 #[repr(u16)]
 pub enum Team {
+    /// Team ID zero for 2v2v2v2 Arena `CHERRY` game mode. (TODO: SUBJECT TO CHANGE?)
+    ZERO = 0,
+
     /// Blue team (bottom left on Summoner's Rift).
     BLUE = 100,
     /// Red team (top right on Summoner's Rift).

riven/src/consts/tier.rs

@@ -1,7 +1,7 @@
-use num_enum::{ IntoPrimitive, TryFromPrimitive };
+use num_enum::{IntoPrimitive, TryFromPrimitive};
-use serde::{ Serialize, Deserialize };
+use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
-use strum_macros::{ EnumString, Display, AsRefStr, IntoStaticStr };
+use strum_macros::{AsRefStr, Display, EnumString, IntoStaticStr};
 
 /// LoL and TFT ranked tiers, such as gold, diamond, challenger, etc.
 ///
@@ -10,36 +10,51 @@ use strum_macros::{ EnumString, Display, AsRefStr, IntoStaticStr };
 /// Repr'd as arbitrary `u8` values.
 ///
 /// Implements [IntoEnumIterator](super::IntoEnumIterator).
-#[derive(Debug, Copy, Clone)]
+#[derive(
-#[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
+    Debug,
-#[derive(IntoPrimitive, TryFromPrimitive)]
+    Copy,
-#[derive(EnumString, Display, AsRefStr, IntoStaticStr)]
+    Clone,
-#[derive(Serialize, Deserialize)]
+    Eq,
+    PartialEq,
+    Hash,
+    PartialOrd,
+    Ord,
+    IntoPrimitive,
+    TryFromPrimitive,
+    EnumString,
+    Display,
+    AsRefStr,
+    IntoStaticStr,
+    Serialize,
+    Deserialize,
+)]
 #[repr(u8)]
 pub enum Tier {
     /// Challenger, the highest tier, an apex tier. Repr: `220_u8`.
-    CHALLENGER  = 220,
+    CHALLENGER = 220,
     /// Grand Master, an apex tier. Repr: `200_u8`.
     GRANDMASTER = 200,
     /// Master, an apex tier. Repr: `180_u8`.
-    MASTER      = 180,
+    MASTER = 180,
     /// Diamond, the higest non-apex tier. Repr: `140_u8`.
-    DIAMOND     = 140,
+    DIAMOND = 140,
+    /// Emerald. Added in 2023. Repr: `130_u8`.
+    EMERALD = 130,
     /// Platinum. Repr: `120_u8`.
-    PLATINUM    = 120,
+    PLATINUM = 120,
     /// Gold. Repr: `100_u8`.
-    GOLD        = 100,
+    GOLD = 100,
     /// Silver. Repr: `80_u8`.
-    SILVER      =  80,
+    SILVER = 80,
     /// Bronze. Repr: `60_u8`.
-    BRONZE      =  60,
+    BRONZE = 60,
     /// Iron, the lowest tier. Repr: `40_u8`.
-    IRON        =  40,
+    IRON = 40,
 
     /// Unranked, no tier. Repr: `0_u8`.
     /// Also deserializes from "NONE" returned by `lol-challenges-v1.getChallengePercentiles`.
     #[serde(alias = "NONE")]
-    UNRANKED    =   0,
+    UNRANKED = 0,
 }
 
 impl Tier {
@@ -63,7 +78,7 @@ impl Tier {
 
     /// If this tier is ranked. Returns true for iron through challenger, false for unranked.
     pub const fn is_ranked(self) -> bool {
-         // Casts needed for const.
+        // Casts needed for const.
         (Self::UNRANKED as u8) < (self as u8)
     }
 
@@ -77,7 +92,11 @@ impl Tier {
 
     /// Converts UNRANKED to None and all ranked tiers to Some(...).
     pub fn to_ranked(self) -> Option<Self> {
-        if self.is_unranked() { None } else { Some(self) }
+        if self.is_unranked() {
+            None
+        } else {
+            Some(self)
+        }
     }
 }
 
@@ -88,10 +107,19 @@ impl IntoEnumIterator for Tier {
     type Iterator = std::iter::Copied<std::slice::Iter<'static, Self>>;
     fn iter() -> Self::Iterator {
         [
-            Self::CHALLENGER, Self::GRANDMASTER, Self::MASTER,
+            Self::CHALLENGER,
-            Self::DIAMOND, Self::PLATINUM, Self::GOLD,
+            Self::GRANDMASTER,
-            Self::SILVER, Self::BRONZE, Self::IRON
+            Self::MASTER,
-        ].iter().copied()
+            Self::DIAMOND,
+            Self::EMERALD,
+            Self::PLATINUM,
+            Self::GOLD,
+            Self::SILVER,
+            Self::BRONZE,
+            Self::IRON,
+        ]
+        .iter()
+        .copied()
     }
 }
 
@@ -163,6 +191,7 @@ mod tests {
         iter.next();
         iter.next();
         assert_eq!(Some(Tier::DIAMOND), iter.next());
+        assert_eq!(Some(Tier::EMERALD), iter.next());
         iter.next();
         iter.next();
         iter.next();
@@ -177,6 +206,7 @@ mod tests {
         iter.next();
         iter.next();
         iter.next();
+        assert_eq!(Some(Tier::EMERALD), iter.next());
         assert_eq!(Some(Tier::DIAMOND), iter.next());
         iter.next();
         iter.next();

riven/src/endpoints.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -7,7 +8,7 @@
 ///////////////////////////////////////////////
 
 // http://www.mingweisamuel.com/riotapi-schema/tool/
-// Version f6d4267816b00afc365920f4f5926fd725eb8674
+// Version d4f02b20da80dd2c869da349ba774ef6eddc22fa
 
 //! Automatically generated endpoint handles.
 #![allow(clippy::let_and_return, clippy::too_many_arguments)]
@@ -215,23 +216,23 @@ impl RiotApi {
     pub fn tft_summoner_v1(&self) -> TftSummonerV1 {
         TftSummonerV1 { base: self }
     }
-    /// Returns a handle for accessing [TournamentStubV4](crate::endpoints::TournamentStubV4) endpoints.
+    /// Returns a handle for accessing [TournamentStubV5](crate::endpoints::TournamentStubV5) endpoints.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/apis#tournament-stub-v4" target="_blank">`tournament-stub-v4`</a>
+    /// <a href="https://developer.riotgames.com/apis#tournament-stub-v5" target="_blank">`tournament-stub-v5`</a>
     ///
     /// Note: this method is automatically generated.
     #[inline]
-    pub fn tournament_stub_v4(&self) -> TournamentStubV4 {
+    pub fn tournament_stub_v5(&self) -> TournamentStubV5 {
-        TournamentStubV4 { base: self }
+        TournamentStubV5 { base: self }
     }
-    /// Returns a handle for accessing [TournamentV4](crate::endpoints::TournamentV4) endpoints.
+    /// Returns a handle for accessing [TournamentV5](crate::endpoints::TournamentV5) endpoints.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/apis#tournament-v4" target="_blank">`tournament-v4`</a>
+    /// <a href="https://developer.riotgames.com/apis#tournament-v5" target="_blank">`tournament-v5`</a>
     ///
     /// Note: this method is automatically generated.
     #[inline]
-    pub fn tournament_v4(&self) -> TournamentV4 {
+    pub fn tournament_v5(&self) -> TournamentV5 {
-        TournamentV4 { base: self }
+        TournamentV5 { base: self }
     }
     /// Returns a handle for accessing [ValContentV1](crate::endpoints::ValContentV1) endpoints.
     /// # Riot Developer API Reference
@@ -303,8 +304,8 @@ impl<'a> AccountV1<'a> {
     /// Get account by riot id
     /// # Parameters
     /// * `route` - Route to query.
-    /// * `tag_line` (required, in path) - When querying for a player by their riot id, the gameName and tagLine query params are required. However not all accounts have a gameName and tagLine associated so these fields may not be included in the response.
+    /// * `tag_line` (required, in path) - When querying for a player by their riot id, the gameName and tagLine query params are required.
-    /// * `game_name` (required, in path) - When querying for a player by their riot id, the gameName and tagLine query params are required. However not all accounts have a gameName and tagLine associated so these fields may not be included in the response.
+    /// * `game_name` (required, in path) - When querying for a player by their riot id, the gameName and tagLine query params are required.
     /// # Riot Developer API Reference
     /// <a href="https://developer.riotgames.com/api-methods/#account-v1/GET_getByRiotId" target="_blank">`account-v1.getByRiotId`</a>
     ///
@@ -372,82 +373,82 @@ pub struct ChampionMasteryV4<'a> {
     base: &'a RiotApi,
 }
 impl<'a> ChampionMasteryV4<'a> {
-    /// Get all champion mastery entries sorted by number of champion points descending,
+    /// Get all champion mastery entries sorted by number of champion points descending.
     /// # Parameters
     /// * `route` - Route to query.
-    /// * `encrypted_summoner_id` (required, in path) - Summoner ID associated with the player
+    /// * `encrypted_puuid` (required, in path)
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getAllChampionMasteries" target="_blank">`champion-mastery-v4.getAllChampionMasteries`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getAllChampionMasteriesByPUUID" target="_blank">`champion-mastery-v4.getAllChampionMasteriesByPUUID`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_all_champion_masteries(&self, route: PlatformRoute, encrypted_summoner_id: &str)
+    pub fn get_all_champion_masteries_by_puuid(&self, route: PlatformRoute, encrypted_puuid: &str)
         -> impl Future<Output = Result<Vec<champion_mastery_v4::ChampionMastery>>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/champion-masteries/by-summoner/{}", encrypted_summoner_id));
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/champion-masteries/by-puuid/{}", encrypted_puuid));
-        let future = self.base.execute_val::<Vec<champion_mastery_v4::ChampionMastery>>("champion-mastery-v4.getAllChampionMasteries", route_str, request);
+        let future = self.base.execute_val::<Vec<champion_mastery_v4::ChampionMastery>>("champion-mastery-v4.getAllChampionMasteriesByPUUID", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getAllChampionMasteries"));
+        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getAllChampionMasteriesByPUUID"));
         future
     }
 
-    /// Get a champion mastery by player ID and champion ID.
+    /// Get a champion mastery by puuid and champion ID.
     /// # Parameters
     /// * `route` - Route to query.
-    /// * `champion_id` (required, in path) - Champion ID to retrieve Champion Mastery for
+    /// * `encrypted_puuid` (required, in path)
-    /// * `encrypted_summoner_id` (required, in path) - Summoner ID associated with the player
+    /// * `champion_id` (required, in path) - Champion ID to retrieve Champion Mastery.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getChampionMastery" target="_blank">`champion-mastery-v4.getChampionMastery`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getChampionMasteryByPUUID" target="_blank">`champion-mastery-v4.getChampionMasteryByPUUID`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_champion_mastery(&self, route: PlatformRoute, encrypted_summoner_id: &str, champion_id: crate::consts::Champion)
+    pub fn get_champion_mastery_by_puuid(&self, route: PlatformRoute, encrypted_puuid: &str, champion_id: crate::consts::Champion)
-        -> impl Future<Output = Result<Option<champion_mastery_v4::ChampionMastery>>> + 'a
+        -> impl Future<Output = Result<champion_mastery_v4::ChampionMastery>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/champion-masteries/by-summoner/{}/by-champion/{}", encrypted_summoner_id, champion_id));
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/champion-masteries/by-puuid/{}/by-champion/{}", encrypted_puuid, champion_id));
-        let future = self.base.execute_opt::<champion_mastery_v4::ChampionMastery>("champion-mastery-v4.getChampionMastery", route_str, request);
+        let future = self.base.execute_val::<champion_mastery_v4::ChampionMastery>("champion-mastery-v4.getChampionMasteryByPUUID", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getChampionMastery"));
+        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getChampionMasteryByPUUID"));
         future
     }
 
     /// Get specified number of top champion mastery entries sorted by number of champion points descending.
     /// # Parameters
     /// * `route` - Route to query.
-    /// * `encrypted_summoner_id` (required, in path) - Summoner ID associated with the player
+    /// * `encrypted_puuid` (required, in path)
-    /// * `count` (optional, in query) - Number of entries to retrieve, defaults to 3
+    /// * `count` (optional, in query) - Number of entries to retrieve, defaults to 3.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getTopChampionMasteries" target="_blank">`champion-mastery-v4.getTopChampionMasteries`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getTopChampionMasteriesByPUUID" target="_blank">`champion-mastery-v4.getTopChampionMasteriesByPUUID`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_top_champion_masteries(&self, route: PlatformRoute, encrypted_summoner_id: &str, count: Option<i32>)
+    pub fn get_top_champion_masteries_by_puuid(&self, route: PlatformRoute, encrypted_puuid: &str, count: Option<i32>)
         -> impl Future<Output = Result<Vec<champion_mastery_v4::ChampionMastery>>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/champion-masteries/by-summoner/{}/top", encrypted_summoner_id));
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/champion-masteries/by-puuid/{}/top", encrypted_puuid));
-        let mut request = request; if let Some(count) = count { request = request.query(&[ ("count", count) ]); }
+        let request = if let Some(count) = count { request.query(&[ ("count", count) ]) } else { request };
-        let future = self.base.execute_val::<Vec<champion_mastery_v4::ChampionMastery>>("champion-mastery-v4.getTopChampionMasteries", route_str, request);
+        let future = self.base.execute_val::<Vec<champion_mastery_v4::ChampionMastery>>("champion-mastery-v4.getTopChampionMasteriesByPUUID", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getTopChampionMasteries"));
+        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getTopChampionMasteriesByPUUID"));
         future
     }
 
     /// Get a player's total champion mastery score, which is the sum of individual champion mastery levels.
     /// # Parameters
     /// * `route` - Route to query.
-    /// * `encrypted_summoner_id` (required, in path) - Summoner ID associated with the player
+    /// * `encrypted_puuid` (required, in path)
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getChampionMasteryScore" target="_blank">`champion-mastery-v4.getChampionMasteryScore`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#champion-mastery-v4/GET_getChampionMasteryScoreByPUUID" target="_blank">`champion-mastery-v4.getChampionMasteryScoreByPUUID`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_champion_mastery_score(&self, route: PlatformRoute, encrypted_summoner_id: &str)
+    pub fn get_champion_mastery_score_by_puuid(&self, route: PlatformRoute, encrypted_puuid: &str)
         -> impl Future<Output = Result<i32>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/scores/by-summoner/{}", encrypted_summoner_id));
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/champion-mastery/v4/scores/by-puuid/{}", encrypted_puuid));
-        let future = self.base.execute_val::<i32>("champion-mastery-v4.getChampionMasteryScore", route_str, request);
+        let future = self.base.execute_val::<i32>("champion-mastery-v4.getChampionMasteryScoreByPUUID", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getChampionMasteryScore"));
+        let future = future.instrument(tracing::info_span!("champion-mastery-v4.getChampionMasteryScoreByPUUID"));
         future
     }
 
@@ -493,27 +494,6 @@ pub struct ClashV1<'a> {
     base: &'a RiotApi,
 }
 impl<'a> ClashV1<'a> {
-    /// Get players by puuid
-    /// ## Implementation Notes
-    /// This endpoint returns a list of active Clash players for a given PUUID. If a summoner registers for multiple tournaments at the same time (e.g., Saturday and Sunday) then both registrations would appear in this list.
-    /// # Parameters
-    /// * `route` - Route to query.
-    /// * `encrypted_puuid` (required, in path)
-    /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#clash-v1/GET_getPlayersByPUUID" target="_blank">`clash-v1.getPlayersByPUUID`</a>
-    ///
-    /// Note: this method is automatically generated.
-    pub fn get_players_by_puuid(&self, route: PlatformRoute, encrypted_puuid: &str)
-        -> impl Future<Output = Result<Vec<clash_v1::Player>>> + 'a
-    {
-        let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/clash/v1/players/by-puuid/{}", encrypted_puuid));
-        let future = self.base.execute_val::<Vec<clash_v1::Player>>("clash-v1.getPlayersByPUUID", route_str, request);
-        #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("clash-v1.getPlayersByPUUID"));
-        future
-    }
-
     /// Get players by summoner ID.
     /// ## Implementation Notes
     /// This endpoint returns a list of active Clash players for a given summoner ID. If a summoner registers for multiple tournaments at the same time (e.g., Saturday and Sunday) then both registrations would appear in this list.
@@ -638,7 +618,7 @@ impl<'a> LeagueExpV4<'a> {
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, &format!("/lol/league-exp/v4/entries/{}/{}/{}", queue, tier, division));
-        let mut request = request; if let Some(page) = page { request = request.query(&[ ("page", page) ]); }
+        let request = if let Some(page) = page { request.query(&[ ("page", page) ]) } else { request };
         let future = self.base.execute_val::<Vec<league_exp_v4::LeagueEntry>>("league-exp-v4.getLeagueEntries", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("league-exp-v4.getLeagueEntries"));
@@ -711,7 +691,7 @@ impl<'a> LeagueV4<'a> {
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, &format!("/lol/league/v4/entries/{}/{}/{}", queue, tier, division));
-        let mut request = request; if let Some(page) = page { request = request.query(&[ ("page", page) ]); }
+        let request = if let Some(page) = page { request.query(&[ ("page", page) ]) } else { request };
         let future = self.base.execute_val::<Vec<league_v4::LeagueEntry>>("league-v4.getLeagueEntries", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("league-v4.getLeagueEntries"));
@@ -857,7 +837,7 @@ impl<'a> LolChallengesV1<'a> {
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, &format!("/lol/challenges/v1/challenges/{}/leaderboards/by-level/{}", challenge_id, level));
-        let mut request = request; if let Some(limit) = limit { request = request.query(&[ ("limit", limit) ]); }
+        let request = if let Some(limit) = limit { request.query(&[ ("limit", limit) ]) } else { request };
         let future = self.base.execute_opt::<Vec<lol_challenges_v1::ApexPlayerInfo>>("lol-challenges-v1.getChallengeLeaderboards", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("lol-challenges-v1.getChallengeLeaderboards"));
@@ -1190,12 +1170,12 @@ impl<'a> MatchV5<'a> {
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, &format!("/lol/match/v5/matches/by-puuid/{}/ids", puuid));
-        let mut request = request; if let Some(count) = count { request = request.query(&[ ("count", count) ]); }
+        let request = if let Some(count) = count { request.query(&[ ("count", count) ]) } else { request };
-        let mut request = request; if let Some(end_time) = end_time { request = request.query(&[ ("endTime", end_time) ]); }
+        let request = if let Some(end_time) = end_time { request.query(&[ ("endTime", end_time) ]) } else { request };
-        let mut request = request; if let Some(queue) = queue { request = request.query(&[ ("queue", queue) ]); }
+        let request = if let Some(queue) = queue { request.query(&[ ("queue", queue) ]) } else { request };
-        let mut request = request; if let Some(start_time) = start_time { request = request.query(&[ ("startTime", start_time) ]); }
+        let request = if let Some(start_time) = start_time { request.query(&[ ("startTime", start_time) ]) } else { request };
-        let mut request = request; if let Some(start) = start { request = request.query(&[ ("start", start) ]); }
+        let request = if let Some(start) = start { request.query(&[ ("start", start) ]) } else { request };
-        let mut request = request; if let Some(r#type) = r#type { request = request.query(&[ ("type", r#type) ]); }
+        let request = if let Some(r#type) = r#type { request.query(&[ ("type", r#type) ]) } else { request };
         let future = self.base.execute_val::<Vec<String>>("match-v5.getMatchIdsByPUUID", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("match-v5.getMatchIdsByPUUID"));
@@ -1431,15 +1411,17 @@ impl<'a> TftLeagueV1<'a> {
     /// Get the challenger league.
     /// # Parameters
     /// * `route` - Route to query.
+    /// * `queue` (optional, in query) - Defaults to RANKED_TFT.
     /// # Riot Developer API Reference
     /// <a href="https://developer.riotgames.com/api-methods/#tft-league-v1/GET_getChallengerLeague" target="_blank">`tft-league-v1.getChallengerLeague`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_challenger_league(&self, route: PlatformRoute)
+    pub fn get_challenger_league(&self, route: PlatformRoute, queue: Option<&str>)
         -> impl Future<Output = Result<tft_league_v1::LeagueList>> + 'a
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, "/tft/league/v1/challenger");
+        let request = if let Some(queue) = queue { request.query(&[ ("queue", queue) ]) } else { request };
         let future = self.base.execute_val::<tft_league_v1::LeagueList>("tft-league-v1.getChallengerLeague", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("tft-league-v1.getChallengerLeague"));
@@ -1470,17 +1452,19 @@ impl<'a> TftLeagueV1<'a> {
     /// * `route` - Route to query.
     /// * `tier` (required, in path)
     /// * `division` (required, in path)
+    /// * `queue` (optional, in query) - Defaults to RANKED_TFT.
     /// * `page` (optional, in query) - Defaults to 1. Starts with page 1.
     /// # Riot Developer API Reference
     /// <a href="https://developer.riotgames.com/api-methods/#tft-league-v1/GET_getLeagueEntries" target="_blank">`tft-league-v1.getLeagueEntries`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_league_entries(&self, route: PlatformRoute, tier: crate::consts::Tier, division: &str, page: Option<i32>)
+    pub fn get_league_entries(&self, route: PlatformRoute, tier: crate::consts::Tier, division: &str, page: Option<i32>, queue: Option<&str>)
         -> impl Future<Output = Result<Vec<tft_league_v1::LeagueEntry>>> + 'a
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, &format!("/tft/league/v1/entries/{}/{}", tier, division));
-        let mut request = request; if let Some(page) = page { request = request.query(&[ ("page", page) ]); }
+        let request = if let Some(page) = page { request.query(&[ ("page", page) ]) } else { request };
+        let request = if let Some(queue) = queue { request.query(&[ ("queue", queue) ]) } else { request };
         let future = self.base.execute_val::<Vec<tft_league_v1::LeagueEntry>>("tft-league-v1.getLeagueEntries", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("tft-league-v1.getLeagueEntries"));
@@ -1490,15 +1474,17 @@ impl<'a> TftLeagueV1<'a> {
     /// Get the grandmaster league.
     /// # Parameters
     /// * `route` - Route to query.
+    /// * `queue` (optional, in query) - Defaults to RANKED_TFT.
     /// # Riot Developer API Reference
     /// <a href="https://developer.riotgames.com/api-methods/#tft-league-v1/GET_getGrandmasterLeague" target="_blank">`tft-league-v1.getGrandmasterLeague`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_grandmaster_league(&self, route: PlatformRoute)
+    pub fn get_grandmaster_league(&self, route: PlatformRoute, queue: Option<&str>)
         -> impl Future<Output = Result<tft_league_v1::LeagueList>> + 'a
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, "/tft/league/v1/grandmaster");
+        let request = if let Some(queue) = queue { request.query(&[ ("queue", queue) ]) } else { request };
         let future = self.base.execute_val::<tft_league_v1::LeagueList>("tft-league-v1.getGrandmasterLeague", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("tft-league-v1.getGrandmasterLeague"));
@@ -1527,15 +1513,17 @@ impl<'a> TftLeagueV1<'a> {
     /// Get the master league.
     /// # Parameters
     /// * `route` - Route to query.
+    /// * `queue` (optional, in query) - Defaults to RANKED_TFT.
     /// # Riot Developer API Reference
     /// <a href="https://developer.riotgames.com/api-methods/#tft-league-v1/GET_getMasterLeague" target="_blank">`tft-league-v1.getMasterLeague`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn get_master_league(&self, route: PlatformRoute)
+    pub fn get_master_league(&self, route: PlatformRoute, queue: Option<&str>)
         -> impl Future<Output = Result<tft_league_v1::LeagueList>> + 'a
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, "/tft/league/v1/master");
+        let request = if let Some(queue) = queue { request.query(&[ ("queue", queue) ]) } else { request };
         let future = self.base.execute_val::<tft_league_v1::LeagueList>("tft-league-v1.getMasterLeague", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("tft-league-v1.getMasterLeague"));
@@ -1590,10 +1578,10 @@ impl<'a> TftMatchV1<'a> {
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, &format!("/tft/match/v1/matches/by-puuid/{}/ids", puuid));
-        let mut request = request; if let Some(count) = count { request = request.query(&[ ("count", count) ]); }
+        let request = if let Some(count) = count { request.query(&[ ("count", count) ]) } else { request };
-        let mut request = request; if let Some(end_time) = end_time { request = request.query(&[ ("endTime", end_time) ]); }
+        let request = if let Some(end_time) = end_time { request.query(&[ ("endTime", end_time) ]) } else { request };
-        let mut request = request; if let Some(start) = start { request = request.query(&[ ("start", start) ]); }
+        let request = if let Some(start) = start { request.query(&[ ("start", start) ]) } else { request };
-        let mut request = request; if let Some(start_time) = start_time { request = request.query(&[ ("startTime", start_time) ]); }
+        let request = if let Some(start_time) = start_time { request.query(&[ ("startTime", start_time) ]) } else { request };
         let future = self.base.execute_val::<Vec<String>>("tft-match-v1.getMatchIdsByPUUID", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("tft-match-v1.getMatchIdsByPUUID"));
@@ -1759,130 +1747,149 @@ impl<'a> TftSummonerV1<'a> {
 
 }
 
-/// TournamentStubV4 endpoints handle, accessed by calling [`tournament_stub_v4()`](crate::RiotApi::tournament_stub_v4) on a [`RiotApi`](crate::RiotApi) instance.
+/// TournamentStubV5 endpoints handle, accessed by calling [`tournament_stub_v5()`](crate::RiotApi::tournament_stub_v5) on a [`RiotApi`](crate::RiotApi) instance.
 /// # Riot Developer API Reference
-/// <a href="https://developer.riotgames.com/apis#tournament-stub-v4" target="_blank">`tournament-stub-v4`</a>
+/// <a href="https://developer.riotgames.com/apis#tournament-stub-v5" target="_blank">`tournament-stub-v5`</a>
 ///
 /// Note: this struct is automatically generated.
 #[repr(transparent)]
-pub struct TournamentStubV4<'a> {
+pub struct TournamentStubV5<'a> {
     base: &'a RiotApi,
 }
-impl<'a> TournamentStubV4<'a> {
+impl<'a> TournamentStubV5<'a> {
-    /// Create a mock tournament code for the given tournament.
+    /// Create a tournament code for the given tournament - Stub method
     /// # Parameters
     /// * `route` - Route to query.
     /// * `count` (optional, in query) - The number of codes to create (max 1000)
     /// * `tournament_id` (required, in query) - The tournament ID
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v4/POST_createTournamentCode" target="_blank">`tournament-stub-v4.createTournamentCode`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v5/POST_createTournamentCode" target="_blank">`tournament-stub-v5.createTournamentCode`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn create_tournament_code(&self, route: RegionalRoute, body: &tournament_stub_v4::TournamentCodeParameters, tournament_id: i64, count: Option<i32>)
+    pub fn create_tournament_code(&self, route: RegionalRoute, body: &tournament_stub_v5::TournamentCodeParametersV5, tournament_id: i64, count: Option<i32>)
         -> impl Future<Output = Result<Vec<String>>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::POST, route_str, "/lol/tournament-stub/v4/codes");
+        let request = self.base.request(Method::POST, route_str, "/lol/tournament-stub/v5/codes");
         let request = request.query(&[ ("tournamentId", tournament_id) ]);
-        let mut request = request; if let Some(count) = count { request = request.query(&[ ("count", count) ]); }
+        let request = if let Some(count) = count { request.query(&[ ("count", count) ]) } else { request };
         let request = request.body(serde_json::ser::to_vec(body).unwrap());
-        let future = self.base.execute_val::<Vec<String>>("tournament-stub-v4.createTournamentCode", route_str, request);
+        let future = self.base.execute_val::<Vec<String>>("tournament-stub-v5.createTournamentCode", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-stub-v4.createTournamentCode"));
+        let future = future.instrument(tracing::info_span!("tournament-stub-v5.createTournamentCode"));
         future
     }
 
-    /// Gets a mock list of lobby events by tournament code.
+    /// Returns the tournament code DTO associated with a tournament code string - Stub Method
+    /// # Parameters
+    /// * `route` - Route to query.
+    /// * `tournament_code` (required, in path) - The tournament code string.
+    /// # Riot Developer API Reference
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v5/GET_getTournamentCode" target="_blank">`tournament-stub-v5.getTournamentCode`</a>
+    ///
+    /// Note: this method is automatically generated.
+    pub fn get_tournament_code(&self, route: RegionalRoute, tournament_code: &str)
+        -> impl Future<Output = Result<tournament_stub_v5::TournamentCodeV5>> + 'a
+    {
+        let route_str = route.into();
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament-stub/v5/codes/{}", tournament_code));
+        let future = self.base.execute_val::<tournament_stub_v5::TournamentCodeV5>("tournament-stub-v5.getTournamentCode", route_str, request);
+        #[cfg(feature = "tracing")]
+        let future = future.instrument(tracing::info_span!("tournament-stub-v5.getTournamentCode"));
+        future
+    }
+
+    /// Gets a list of lobby events by tournament code - Stub method
     /// # Parameters
     /// * `route` - Route to query.
     /// * `tournament_code` (required, in path) - The short code to look up lobby events for
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v4/GET_getLobbyEventsByCode" target="_blank">`tournament-stub-v4.getLobbyEventsByCode`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v5/GET_getLobbyEventsByCode" target="_blank">`tournament-stub-v5.getLobbyEventsByCode`</a>
     ///
     /// Note: this method is automatically generated.
     pub fn get_lobby_events_by_code(&self, route: RegionalRoute, tournament_code: &str)
-        -> impl Future<Output = Result<tournament_stub_v4::LobbyEventWrapper>> + 'a
+        -> impl Future<Output = Result<tournament_stub_v5::LobbyEventV5Wrapper>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament-stub/v4/lobby-events/by-code/{}", tournament_code));
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament-stub/v5/lobby-events/by-code/{}", tournament_code));
-        let future = self.base.execute_val::<tournament_stub_v4::LobbyEventWrapper>("tournament-stub-v4.getLobbyEventsByCode", route_str, request);
+        let future = self.base.execute_val::<tournament_stub_v5::LobbyEventV5Wrapper>("tournament-stub-v5.getLobbyEventsByCode", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-stub-v4.getLobbyEventsByCode"));
+        let future = future.instrument(tracing::info_span!("tournament-stub-v5.getLobbyEventsByCode"));
         future
     }
 
-    /// Creates a mock tournament provider and returns its ID.
+    /// Creates a tournament provider and returns its ID - Stub method
     /// ## Implementation Notes
     /// Providers will need to call this endpoint first to register their callback URL and their API key with the tournament system before any other tournament provider endpoints will work.
     /// # Parameters
     /// * `route` - Route to query.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v4/POST_registerProviderData" target="_blank">`tournament-stub-v4.registerProviderData`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v5/POST_registerProviderData" target="_blank">`tournament-stub-v5.registerProviderData`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn register_provider_data(&self, route: RegionalRoute, body: &tournament_stub_v4::ProviderRegistrationParameters)
+    pub fn register_provider_data(&self, route: RegionalRoute, body: &tournament_stub_v5::ProviderRegistrationParametersV5)
         -> impl Future<Output = Result<i32>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::POST, route_str, "/lol/tournament-stub/v4/providers");
+        let request = self.base.request(Method::POST, route_str, "/lol/tournament-stub/v5/providers");
         let request = request.body(serde_json::ser::to_vec(body).unwrap());
-        let future = self.base.execute_val::<i32>("tournament-stub-v4.registerProviderData", route_str, request);
+        let future = self.base.execute_val::<i32>("tournament-stub-v5.registerProviderData", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-stub-v4.registerProviderData"));
+        let future = future.instrument(tracing::info_span!("tournament-stub-v5.registerProviderData"));
         future
     }
 
-    /// Creates a mock tournament and returns its ID.
+    /// Creates a tournament and returns its ID - Stub method
     /// # Parameters
     /// * `route` - Route to query.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v4/POST_registerTournament" target="_blank">`tournament-stub-v4.registerTournament`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-stub-v5/POST_registerTournament" target="_blank">`tournament-stub-v5.registerTournament`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn register_tournament(&self, route: RegionalRoute, body: &tournament_stub_v4::TournamentRegistrationParameters)
+    pub fn register_tournament(&self, route: RegionalRoute, body: &tournament_stub_v5::TournamentRegistrationParametersV5)
         -> impl Future<Output = Result<i32>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::POST, route_str, "/lol/tournament-stub/v4/tournaments");
+        let request = self.base.request(Method::POST, route_str, "/lol/tournament-stub/v5/tournaments");
         let request = request.body(serde_json::ser::to_vec(body).unwrap());
-        let future = self.base.execute_val::<i32>("tournament-stub-v4.registerTournament", route_str, request);
+        let future = self.base.execute_val::<i32>("tournament-stub-v5.registerTournament", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-stub-v4.registerTournament"));
+        let future = future.instrument(tracing::info_span!("tournament-stub-v5.registerTournament"));
         future
     }
 
 }
 
-/// TournamentV4 endpoints handle, accessed by calling [`tournament_v4()`](crate::RiotApi::tournament_v4) on a [`RiotApi`](crate::RiotApi) instance.
+/// TournamentV5 endpoints handle, accessed by calling [`tournament_v5()`](crate::RiotApi::tournament_v5) on a [`RiotApi`](crate::RiotApi) instance.
 /// # Riot Developer API Reference
-/// <a href="https://developer.riotgames.com/apis#tournament-v4" target="_blank">`tournament-v4`</a>
+/// <a href="https://developer.riotgames.com/apis#tournament-v5" target="_blank">`tournament-v5`</a>
 ///
 /// Note: this struct is automatically generated.
 #[repr(transparent)]
-pub struct TournamentV4<'a> {
+pub struct TournamentV5<'a> {
     base: &'a RiotApi,
 }
-impl<'a> TournamentV4<'a> {
+impl<'a> TournamentV5<'a> {
     /// Create a tournament code for the given tournament.
     /// # Parameters
     /// * `route` - Route to query.
-    /// * `count` (optional, in query) - The number of codes to create (max 1000)
     /// * `tournament_id` (required, in query) - The tournament ID
+    /// * `count` (optional, in query) - The number of codes to create (max 1000)
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v4/POST_createTournamentCode" target="_blank">`tournament-v4.createTournamentCode`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v5/POST_createTournamentCode" target="_blank">`tournament-v5.createTournamentCode`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn create_tournament_code(&self, route: RegionalRoute, body: &tournament_v4::TournamentCodeParameters, tournament_id: i64, count: Option<i32>)
+    pub fn create_tournament_code(&self, route: RegionalRoute, body: &tournament_v5::TournamentCodeParametersV5, tournament_id: i64, count: Option<i32>)
         -> impl Future<Output = Result<Vec<String>>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::POST, route_str, "/lol/tournament/v4/codes");
+        let request = self.base.request(Method::POST, route_str, "/lol/tournament/v5/codes");
         let request = request.query(&[ ("tournamentId", tournament_id) ]);
-        let mut request = request; if let Some(count) = count { request = request.query(&[ ("count", count) ]); }
+        let request = if let Some(count) = count { request.query(&[ ("count", count) ]) } else { request };
         let request = request.body(serde_json::ser::to_vec(body).unwrap());
-        let future = self.base.execute_val::<Vec<String>>("tournament-v4.createTournamentCode", route_str, request);
+        let future = self.base.execute_val::<Vec<String>>("tournament-v5.createTournamentCode", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-v4.createTournamentCode"));
+        let future = future.instrument(tracing::info_span!("tournament-v5.createTournamentCode"));
         future
     }
 
@@ -1891,37 +1898,62 @@ impl<'a> TournamentV4<'a> {
     /// * `route` - Route to query.
     /// * `tournament_code` (required, in path) - The tournament code string.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v4/GET_getTournamentCode" target="_blank">`tournament-v4.getTournamentCode`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v5/GET_getTournamentCode" target="_blank">`tournament-v5.getTournamentCode`</a>
     ///
     /// Note: this method is automatically generated.
     pub fn get_tournament_code(&self, route: RegionalRoute, tournament_code: &str)
-        -> impl Future<Output = Result<tournament_v4::TournamentCode>> + 'a
+        -> impl Future<Output = Result<tournament_v5::TournamentCodeV5>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament/v4/codes/{}", tournament_code));
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament/v5/codes/{}", tournament_code));
-        let future = self.base.execute_val::<tournament_v4::TournamentCode>("tournament-v4.getTournamentCode", route_str, request);
+        let future = self.base.execute_val::<tournament_v5::TournamentCodeV5>("tournament-v5.getTournamentCode", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-v4.getTournamentCode"));
+        let future = future.instrument(tracing::info_span!("tournament-v5.getTournamentCode"));
         future
     }
 
-    /// Update the pick type, map, spectator type, or allowed summoners for a code.
+    /// Update the pick type, map, spectator type, or allowed puuids for a code.
     /// # Parameters
     /// * `route` - Route to query.
     /// * `tournament_code` (required, in path) - The tournament code to update
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v4/PUT_updateCode" target="_blank">`tournament-v4.updateCode`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v5/PUT_updateCode" target="_blank">`tournament-v5.updateCode`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn update_code(&self, route: RegionalRoute, body: &tournament_v4::TournamentCodeUpdateParameters, tournament_code: &str)
+    pub fn update_code(&self, route: RegionalRoute, body: &tournament_v5::TournamentCodeUpdateParametersV5, tournament_code: &str)
         -> impl Future<Output = Result<()>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::PUT, route_str, &format!("/lol/tournament/v4/codes/{}", tournament_code));
+        let request = self.base.request(Method::PUT, route_str, &format!("/lol/tournament/v5/codes/{}", tournament_code));
         let request = request.body(serde_json::ser::to_vec(body).unwrap());
-        let future = self.base.execute("tournament-v4.updateCode", route_str, request);
+        let future = self.base.execute("tournament-v5.updateCode", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-v4.updateCode"));
+        let future = future.instrument(tracing::info_span!("tournament-v5.updateCode"));
+        future
+    }
+
+    /// Get games details
+    /// ## Implementation Notes
+    /// Additional endpoint to get tournament games. From this endpoint, you are able to get participants PUUID (the callback doesn't contain this info).
+    ///
+    /// You can also use it to check if the game was recorded and validate callbacks. If the endpoint returns the game, it means a callback was attempted.
+    ///
+    /// This will only work for tournament codes created after November 10, 2023.
+    /// # Parameters
+    /// * `route` - Route to query.
+    /// * `tournament_code` (required, in path)
+    /// # Riot Developer API Reference
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v5/GET_getGames" target="_blank">`tournament-v5.getGames`</a>
+    ///
+    /// Note: this method is automatically generated.
+    pub fn get_games(&self, route: RegionalRoute, tournament_code: &str)
+        -> impl Future<Output = Result<Vec<tournament_v5::TournamentGamesV5>>> + 'a
+    {
+        let route_str = route.into();
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament/v5/games/by-code/{}", tournament_code));
+        let future = self.base.execute_val::<Vec<tournament_v5::TournamentGamesV5>>("tournament-v5.getGames", route_str, request);
+        #[cfg(feature = "tracing")]
+        let future = future.instrument(tracing::info_span!("tournament-v5.getGames"));
         future
     }
 
@@ -1930,17 +1962,17 @@ impl<'a> TournamentV4<'a> {
     /// * `route` - Route to query.
     /// * `tournament_code` (required, in path) - The short code to look up lobby events for
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v4/GET_getLobbyEventsByCode" target="_blank">`tournament-v4.getLobbyEventsByCode`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v5/GET_getLobbyEventsByCode" target="_blank">`tournament-v5.getLobbyEventsByCode`</a>
     ///
     /// Note: this method is automatically generated.
     pub fn get_lobby_events_by_code(&self, route: RegionalRoute, tournament_code: &str)
-        -> impl Future<Output = Result<tournament_v4::LobbyEventWrapper>> + 'a
+        -> impl Future<Output = Result<tournament_v5::LobbyEventV5Wrapper>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament/v4/lobby-events/by-code/{}", tournament_code));
+        let request = self.base.request(Method::GET, route_str, &format!("/lol/tournament/v5/lobby-events/by-code/{}", tournament_code));
-        let future = self.base.execute_val::<tournament_v4::LobbyEventWrapper>("tournament-v4.getLobbyEventsByCode", route_str, request);
+        let future = self.base.execute_val::<tournament_v5::LobbyEventV5Wrapper>("tournament-v5.getLobbyEventsByCode", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-v4.getLobbyEventsByCode"));
+        let future = future.instrument(tracing::info_span!("tournament-v5.getLobbyEventsByCode"));
         future
     }
 
@@ -1950,18 +1982,18 @@ impl<'a> TournamentV4<'a> {
     /// # Parameters
     /// * `route` - Route to query.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v4/POST_registerProviderData" target="_blank">`tournament-v4.registerProviderData`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v5/POST_registerProviderData" target="_blank">`tournament-v5.registerProviderData`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn register_provider_data(&self, route: RegionalRoute, body: &tournament_v4::ProviderRegistrationParameters)
+    pub fn register_provider_data(&self, route: RegionalRoute, body: &tournament_v5::ProviderRegistrationParametersV5)
         -> impl Future<Output = Result<i32>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::POST, route_str, "/lol/tournament/v4/providers");
+        let request = self.base.request(Method::POST, route_str, "/lol/tournament/v5/providers");
         let request = request.body(serde_json::ser::to_vec(body).unwrap());
-        let future = self.base.execute_val::<i32>("tournament-v4.registerProviderData", route_str, request);
+        let future = self.base.execute_val::<i32>("tournament-v5.registerProviderData", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-v4.registerProviderData"));
+        let future = future.instrument(tracing::info_span!("tournament-v5.registerProviderData"));
         future
     }
 
@@ -1969,18 +2001,18 @@ impl<'a> TournamentV4<'a> {
     /// # Parameters
     /// * `route` - Route to query.
     /// # Riot Developer API Reference
-    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v4/POST_registerTournament" target="_blank">`tournament-v4.registerTournament`</a>
+    /// <a href="https://developer.riotgames.com/api-methods/#tournament-v5/POST_registerTournament" target="_blank">`tournament-v5.registerTournament`</a>
     ///
     /// Note: this method is automatically generated.
-    pub fn register_tournament(&self, route: RegionalRoute, body: &tournament_v4::TournamentRegistrationParameters)
+    pub fn register_tournament(&self, route: RegionalRoute, body: &tournament_v5::TournamentRegistrationParametersV5)
         -> impl Future<Output = Result<i32>> + 'a
     {
         let route_str = route.into();
-        let request = self.base.request(Method::POST, route_str, "/lol/tournament/v4/tournaments");
+        let request = self.base.request(Method::POST, route_str, "/lol/tournament/v5/tournaments");
         let request = request.body(serde_json::ser::to_vec(body).unwrap());
-        let future = self.base.execute_val::<i32>("tournament-v4.registerTournament", route_str, request);
+        let future = self.base.execute_val::<i32>("tournament-v5.registerTournament", route_str, request);
         #[cfg(feature = "tracing")]
-        let future = future.instrument(tracing::info_span!("tournament-v4.registerTournament"));
+        let future = future.instrument(tracing::info_span!("tournament-v5.registerTournament"));
         future
     }
 
@@ -2009,7 +2041,7 @@ impl<'a> ValContentV1<'a> {
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, "/val/content/v1/contents");
-        let mut request = request; if let Some(locale) = locale { request = request.query(&[ ("locale", locale) ]); }
+        let request = if let Some(locale) = locale { request.query(&[ ("locale", locale) ]) } else { request };
         let future = self.base.execute_val::<val_content_v1::Content>("val-content-v1.getContent", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("val-content-v1.getContent"));
@@ -2114,8 +2146,8 @@ impl<'a> ValRankedV1<'a> {
     {
         let route_str = route.into();
         let request = self.base.request(Method::GET, route_str, &format!("/val/ranked/v1/leaderboards/by-act/{}", act_id));
-        let mut request = request; if let Some(size) = size { request = request.query(&[ ("size", size) ]); }
+        let request = if let Some(size) = size { request.query(&[ ("size", size) ]) } else { request };
-        let mut request = request; if let Some(start_index) = start_index { request = request.query(&[ ("startIndex", start_index) ]); }
+        let request = if let Some(start_index) = start_index { request.query(&[ ("startIndex", start_index) ]) } else { request };
         let future = self.base.execute_opt::<val_ranked_v1::Leaderboard>("val-ranked-v1.getLeaderboard", route_str, request);
         #[cfg(feature = "tracing")]
         let future = future.instrument(tracing::info_span!("val-ranked-v1.getLeaderboard"));

riven/src/error.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use reqwest::{ Error, Response, StatusCode };
+use reqwest::{Error, Response, StatusCode};
 
 /// Result containing RiotApiError on failure.
 pub type Result<T> = std::result::Result<T, RiotApiError>;
@@ -17,7 +17,12 @@ pub struct RiotApiError {
     status_code: Option<StatusCode>,
 }
 impl RiotApiError {
-    pub(crate) fn new(reqwest_error: Error, retries: u8, response: Option<Response>, status_code: Option<StatusCode>) -> Self {
+    pub(crate) fn new(
+        reqwest_error: Error,
+        retries: u8,
+        response: Option<Response>,
+        status_code: Option<StatusCode>,
+    ) -> Self {
         Self {
             reqwest_error,
             retries,

riven/src/lib.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -56,7 +57,7 @@
 //!
 //!     // Get champion mastery data.
 //!     let masteries = riot_api.champion_mastery_v4()
-//!         .get_all_champion_masteries(PlatformRoute::NA1, &summoner.id).await
+//!         .get_all_champion_masteries_by_puuid(PlatformRoute::NA1, &summoner.puuid).await
 //!         .expect("Get champion masteries failed.");
 //!
 //!     // Print champion masteries.
@@ -83,7 +84,7 @@
 //! ```
 //! The [`RiotApi` struct documentation](https://docs.rs/riven/latest/riven/struct.RiotApi.html)
 //! contains additional usage information. The [tests](https://github.com/MingweiSamuel/Riven/tree/v/2.x.x/riven/tests)
-//! and [example proxy](https://github.com/MingweiSamuel/Riven/tree/v/2.x.x/example/proxy)
+//! and [example proxy](https://github.com/MingweiSamuel/Riven/tree/v/2.x.x/riven/examples/proxy)
 //! provide more example usage.
 //!
 //! ## Feature Flags
@@ -177,12 +178,12 @@
 // Re-exported reqwest types.
 pub use reqwest;
 
-
 mod config;
 pub use config::RiotApiConfig;
 
 pub mod consts;
 
+#[rustfmt::skip]
 pub mod endpoints;
 
 mod error;
@@ -190,6 +191,7 @@ pub use error::*;
 
 pub mod meta;
 
+#[rustfmt::skip]
 pub mod models;
 mod models_impls;
 

riven/src/meta.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -7,7 +8,7 @@
 ///////////////////////////////////////////////
 
 // http://www.mingweisamuel.com/riotapi-schema/tool/
-// Version f6d4267816b00afc365920f4f5926fd725eb8674
+// Version d4f02b20da80dd2c869da349ba774ef6eddc22fa
 
 //! Metadata about the Riot API and Riven.
 //!
@@ -15,17 +16,16 @@
 
 /// Metadata for endpoints. Each tuple corresponds to one endpoint and contains
 /// the HTTP [`Method`](reqwest::Method), `str` path, and the method's `str` ID.
-pub static ALL_ENDPOINTS: [(reqwest::Method, &str, &str); 79] = [
+pub static ALL_ENDPOINTS: [(reqwest::Method, &str, &str); 80] = [
     (reqwest::Method::GET, "/riot/account/v1/accounts/by-puuid/{puuid}", "account-v1.getByPuuid"),
     (reqwest::Method::GET, "/riot/account/v1/accounts/by-riot-id/{gameName}/{tagLine}", "account-v1.getByRiotId"),
     (reqwest::Method::GET, "/riot/account/v1/accounts/me", "account-v1.getByAccessToken"),
     (reqwest::Method::GET, "/riot/account/v1/active-shards/by-game/{game}/by-puuid/{puuid}", "account-v1.getActiveShard"),
-    (reqwest::Method::GET, "/lol/champion-mastery/v4/champion-masteries/by-summoner/{encryptedSummonerId}", "champion-mastery-v4.getAllChampionMasteries"),
+    (reqwest::Method::GET, "/lol/champion-mastery/v4/champion-masteries/by-puuid/{encryptedPUUID}", "champion-mastery-v4.getAllChampionMasteriesByPUUID"),
-    (reqwest::Method::GET, "/lol/champion-mastery/v4/champion-masteries/by-summoner/{encryptedSummonerId}/by-champion/{championId}", "champion-mastery-v4.getChampionMastery"),
+    (reqwest::Method::GET, "/lol/champion-mastery/v4/champion-masteries/by-puuid/{encryptedPUUID}/by-champion/{championId}", "champion-mastery-v4.getChampionMasteryByPUUID"),
-    (reqwest::Method::GET, "/lol/champion-mastery/v4/champion-masteries/by-summoner/{encryptedSummonerId}/top", "champion-mastery-v4.getTopChampionMasteries"),
+    (reqwest::Method::GET, "/lol/champion-mastery/v4/champion-masteries/by-puuid/{encryptedPUUID}/top", "champion-mastery-v4.getTopChampionMasteriesByPUUID"),
-    (reqwest::Method::GET, "/lol/champion-mastery/v4/scores/by-summoner/{encryptedSummonerId}", "champion-mastery-v4.getChampionMasteryScore"),
+    (reqwest::Method::GET, "/lol/champion-mastery/v4/scores/by-puuid/{encryptedPUUID}", "champion-mastery-v4.getChampionMasteryScoreByPUUID"),
     (reqwest::Method::GET, "/lol/platform/v3/champion-rotations", "champion-v3.getChampionInfo"),
-    (reqwest::Method::GET, "/lol/clash/v1/players/by-puuid/{encryptedPUUID}", "clash-v1.getPlayersByPUUID"),
     (reqwest::Method::GET, "/lol/clash/v1/players/by-summoner/{summonerId}", "clash-v1.getPlayersBySummoner"),
     (reqwest::Method::GET, "/lol/clash/v1/teams/{teamId}", "clash-v1.getTeamById"),
     (reqwest::Method::GET, "/lol/clash/v1/tournaments", "clash-v1.getTournaments"),
@@ -79,16 +79,18 @@ pub static ALL_ENDPOINTS: [(reqwest::Method, &str, &str); 79] = [
     (reqwest::Method::GET, "/tft/summoner/v1/summoners/by-puuid/{encryptedPUUID}", "tft-summoner-v1.getByPUUID"),
     (reqwest::Method::GET, "/tft/summoner/v1/summoners/me", "tft-summoner-v1.getByAccessToken"),
     (reqwest::Method::GET, "/tft/summoner/v1/summoners/{encryptedSummonerId}", "tft-summoner-v1.getBySummonerId"),
-    (reqwest::Method::POST, "/lol/tournament-stub/v4/codes", "tournament-stub-v4.createTournamentCode"),
+    (reqwest::Method::POST, "/lol/tournament-stub/v5/codes", "tournament-stub-v5.createTournamentCode"),
-    (reqwest::Method::GET, "/lol/tournament-stub/v4/lobby-events/by-code/{tournamentCode}", "tournament-stub-v4.getLobbyEventsByCode"),
+    (reqwest::Method::GET, "/lol/tournament-stub/v5/codes/{tournamentCode}", "tournament-stub-v5.getTournamentCode"),
-    (reqwest::Method::POST, "/lol/tournament-stub/v4/providers", "tournament-stub-v4.registerProviderData"),
+    (reqwest::Method::GET, "/lol/tournament-stub/v5/lobby-events/by-code/{tournamentCode}", "tournament-stub-v5.getLobbyEventsByCode"),
-    (reqwest::Method::POST, "/lol/tournament-stub/v4/tournaments", "tournament-stub-v4.registerTournament"),
+    (reqwest::Method::POST, "/lol/tournament-stub/v5/providers", "tournament-stub-v5.registerProviderData"),
-    (reqwest::Method::POST, "/lol/tournament/v4/codes", "tournament-v4.createTournamentCode"),
+    (reqwest::Method::POST, "/lol/tournament-stub/v5/tournaments", "tournament-stub-v5.registerTournament"),
-    (reqwest::Method::GET, "/lol/tournament/v4/codes/{tournamentCode}", "tournament-v4.getTournamentCode"),
+    (reqwest::Method::POST, "/lol/tournament/v5/codes", "tournament-v5.createTournamentCode"),
-    (reqwest::Method::PUT, "/lol/tournament/v4/codes/{tournamentCode}", "tournament-v4.updateCode"),
+    (reqwest::Method::GET, "/lol/tournament/v5/codes/{tournamentCode}", "tournament-v5.getTournamentCode"),
-    (reqwest::Method::GET, "/lol/tournament/v4/lobby-events/by-code/{tournamentCode}", "tournament-v4.getLobbyEventsByCode"),
+    (reqwest::Method::PUT, "/lol/tournament/v5/codes/{tournamentCode}", "tournament-v5.updateCode"),
-    (reqwest::Method::POST, "/lol/tournament/v4/providers", "tournament-v4.registerProviderData"),
+    (reqwest::Method::GET, "/lol/tournament/v5/games/by-code/{tournamentCode}", "tournament-v5.getGames"),
-    (reqwest::Method::POST, "/lol/tournament/v4/tournaments", "tournament-v4.registerTournament"),
+    (reqwest::Method::GET, "/lol/tournament/v5/lobby-events/by-code/{tournamentCode}", "tournament-v5.getLobbyEventsByCode"),
+    (reqwest::Method::POST, "/lol/tournament/v5/providers", "tournament-v5.registerProviderData"),
+    (reqwest::Method::POST, "/lol/tournament/v5/tournaments", "tournament-v5.registerTournament"),
     (reqwest::Method::GET, "/val/content/v1/contents", "val-content-v1.getContent"),
     (reqwest::Method::GET, "/val/match/v1/matches/{matchId}", "val-match-v1.getMatch"),
     (reqwest::Method::GET, "/val/match/v1/matchlists/by-puuid/{puuid}", "val-match-v1.getMatchlist"),

riven/src/models.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -7,7 +8,7 @@
 ///////////////////////////////////////////////
 
 // http://www.mingweisamuel.com/riotapi-schema/tool/
-// Version f6d4267816b00afc365920f4f5926fd725eb8674
+// Version d4f02b20da80dd2c869da349ba774ef6eddc22fa
 
 #![allow(missing_docs)]
 
@@ -94,6 +95,9 @@ pub mod champion_mastery_v4 {
         /// The token earned for this champion at the current championLevel. When the championLevel is advanced the tokensEarned resets to 0.
         #[serde(rename = "tokensEarned")]
         pub tokens_earned: i32,
+        #[serde(rename = "puuid")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub puuid: Option<String>,
     }
 }
 
@@ -266,15 +270,18 @@ pub mod league_v4 {
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
     pub struct LeagueList {
         #[serde(rename = "leagueId")]
-        pub league_id: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub league_id: Option<String>,
         #[serde(rename = "entries")]
         pub entries: std::vec::Vec<LeagueItem>,
         #[serde(rename = "tier")]
         pub tier: crate::consts::Tier,
         #[serde(rename = "name")]
-        pub name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub name: Option<String>,
         #[serde(rename = "queue")]
-        pub queue: crate::consts::QueueType,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub queue: Option<crate::consts::QueueType>,
     }
     /// LeagueItem data object.
     #[derive(Clone, Debug)]
@@ -793,6 +800,9 @@ pub mod lor_match_v1 {
         pub game_start_time_utc: String,
         #[serde(rename = "game_version")]
         pub game_version: String,
+        /// (Legal values:  standard,  eternal)
+        #[serde(rename = "game_format")]
+        pub game_format: String,
         #[serde(rename = "players")]
         pub players: std::vec::Vec<Player>,
         /// Total turns taken by both players.
@@ -1154,7 +1164,11 @@ pub mod match_v5 {
         #[serde(rename = "quadraKills")]
         pub quadra_kills: i32,
         #[serde(rename = "riotIdName")]
-        pub riot_id_name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub riot_id_name: Option<String>,
+        #[serde(rename = "riotIdGameName")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub riot_id_game_name: Option<String>,
         #[serde(rename = "riotIdTagline")]
         pub riot_id_tagline: String,
         #[serde(rename = "role")]
@@ -1296,6 +1310,66 @@ pub mod match_v5 {
         #[serde(rename = "totalEnemyJungleMinionsKilled")]
         #[serde(skip_serializing_if = "Option::is_none")]
         pub total_enemy_jungle_minions_killed: Option<i32>,
+        #[serde(rename = "playerAugment1")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_augment1: Option<i32>,
+        #[serde(rename = "playerAugment2")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_augment2: Option<i32>,
+        #[serde(rename = "playerAugment3")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_augment3: Option<i32>,
+        #[serde(rename = "playerAugment4")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_augment4: Option<i32>,
+        #[serde(rename = "playerSubteamId")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_subteam_id: Option<i32>,
+        #[serde(rename = "subteamPlacement")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub subteam_placement: Option<i32>,
+        #[serde(rename = "placement")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub placement: Option<i32>,
+        #[serde(rename = "missions")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub missions: Option<ParticipantMissions>,
+        #[serde(rename = "playerScore0")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score0: Option<i32>,
+        #[serde(rename = "playerScore1")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score1: Option<i32>,
+        #[serde(rename = "playerScore10")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score10: Option<i32>,
+        #[serde(rename = "playerScore11")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score11: Option<i32>,
+        #[serde(rename = "playerScore2")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score2: Option<i32>,
+        #[serde(rename = "playerScore3")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score3: Option<i32>,
+        #[serde(rename = "playerScore4")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score4: Option<i32>,
+        #[serde(rename = "playerScore5")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score5: Option<i32>,
+        #[serde(rename = "playerScore6")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score6: Option<i32>,
+        #[serde(rename = "playerScore7")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score7: Option<i32>,
+        #[serde(rename = "playerScore8")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score8: Option<i32>,
+        #[serde(rename = "playerScore9")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub player_score9: Option<i32>,
     }
     /// Perks data object.
     #[derive(Clone, Debug)]
@@ -1386,6 +1460,9 @@ pub mod match_v5 {
         pub rift_herald: Objective,
         #[serde(rename = "tower")]
         pub tower: Objective,
+        #[serde(rename = "horde")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub horde: Option<Objective>,
     }
     /// Objective data object.
     #[derive(Clone, Debug)]
@@ -1787,6 +1864,9 @@ pub mod match_v5 {
         #[serde(rename = "twentyMinionsIn3SecondsCount")]
         #[serde(skip_serializing_if = "Option::is_none")]
         pub twenty_minions_in3_seconds_count: Option<f64>,
+        #[serde(rename = "twoWardsOneSweeperCount")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub two_wards_one_sweeper_count: Option<i32>,
         #[serde(rename = "unseenRecalls")]
         #[serde(skip_serializing_if = "Option::is_none")]
         pub unseen_recalls: Option<f64>,
@@ -1805,6 +1885,39 @@ pub mod match_v5 {
         #[serde(rename = "wardTakedownsBefore20M")]
         #[serde(skip_serializing_if = "Option::is_none")]
         pub ward_takedowns_before20_m: Option<f64>,
+        #[serde(rename = "legendaryItemUsed")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub legendary_item_used: Option<std::vec::Vec<i32>>,
+    }
+    /// ParticipantMissions data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct ParticipantMissions {
+        #[serde(rename = "playerScore0")]
+        pub player_score0: i32,
+        #[serde(rename = "playerScore1")]
+        pub player_score1: i32,
+        #[serde(rename = "playerScore10")]
+        pub player_score10: i32,
+        #[serde(rename = "playerScore11")]
+        pub player_score11: i32,
+        #[serde(rename = "playerScore2")]
+        pub player_score2: i32,
+        #[serde(rename = "playerScore3")]
+        pub player_score3: i32,
+        #[serde(rename = "playerScore4")]
+        pub player_score4: i32,
+        #[serde(rename = "playerScore5")]
+        pub player_score5: i32,
+        #[serde(rename = "playerScore6")]
+        pub player_score6: i32,
+        #[serde(rename = "playerScore7")]
+        pub player_score7: i32,
+        #[serde(rename = "playerScore8")]
+        pub player_score8: i32,
+        #[serde(rename = "playerScore9")]
+        pub player_score9: i32,
     }
     /// MatchTimelineInfoFrameEvent data object.
     #[derive(Clone, Debug)]
@@ -2070,10 +2183,14 @@ pub mod match_v5 {
         pub x7: MatchTimelineInfoFrameParticipantFrame,
         #[serde(rename = "8")]
         pub x8: MatchTimelineInfoFrameParticipantFrame,
+        /// Possibly null for the Arena 2v2v2v2 (`CHERRY`) game mode.
         #[serde(rename = "9")]
-        pub x9: MatchTimelineInfoFrameParticipantFrame,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub x9: Option<MatchTimelineInfoFrameParticipantFrame>,
+        /// Possibly null for the Arena 2v2v2v2 (`CHERRY`) game mode.
         #[serde(rename = "10")]
-        pub x10: MatchTimelineInfoFrameParticipantFrame,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub x10: Option<MatchTimelineInfoFrameParticipantFrame>,
     }
     /// MatchTimelineInfoFrame data object.
     #[derive(Clone, Debug)]
@@ -2235,6 +2352,10 @@ pub mod spectator_v4 {
         /// The encrypted summoner ID of this participant
         #[serde(rename = "summonerId")]
         pub summoner_id: String,
+        /// The encrypted puuid of this participant
+        #[serde(rename = "puuid")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub puuid: Option<String>,
         /// The ID of the first summoner spell used by this participant
         #[serde(rename = "spell1Id")]
         pub spell1_id: i64,
@@ -2282,7 +2403,8 @@ pub mod spectator_v4 {
         pub game_list: std::vec::Vec<FeaturedGameInfo>,
         /// The suggested interval to wait before requesting FeaturedGames again
         #[serde(rename = "clientRefreshInterval")]
-        pub client_refresh_interval: i64,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub client_refresh_interval: Option<i64>,
     }
     /// FeaturedGameInfo data object.
     #[derive(Clone, Debug)]
@@ -2315,9 +2437,6 @@ pub mod spectator_v4 {
         /// The queue type (queue types are documented on the Game Constants page)
         #[serde(rename = "gameQueueConfigId")]
         pub game_queue_config_id: crate::consts::Queue,
-        /// The game start time represented in epoch milliseconds
-        #[serde(rename = "gameStartTime")]
-        pub game_start_time: i64,
         /// The participant information
         #[serde(rename = "participants")]
         pub participants: std::vec::Vec<Participant>,
@@ -2342,6 +2461,14 @@ pub mod spectator_v4 {
         /// The summoner name of this participant
         #[serde(rename = "summonerName")]
         pub summoner_name: String,
+        /// Encrypted summoner ID of this participant
+        #[serde(rename = "summonerId")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub summoner_id: Option<String>,
+        /// Encrypted puuid of this participant
+        #[serde(rename = "puuid")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub puuid: Option<String>,
         /// The ID of the champion played by this participant
         #[serde(rename = "championId")]
         pub champion_id: crate::consts::Champion,
@@ -2467,6 +2594,10 @@ pub mod tft_league_v1 {
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
     pub struct LeagueEntry {
+        /// Player Universal Unique Identifier. Exact length of 78 characters. (Encrypted)
+        #[serde(rename = "puuid")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub puuid: Option<String>,
         /// Not included for the RANKED_TFT_TURBO queueType.
         #[serde(rename = "leagueId")]
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -2608,7 +2739,7 @@ pub mod tft_match_v1 {
         pub participants: std::vec::Vec<Participant>,
         /// Please refer to the League of Legends documentation.
         #[serde(rename = "queue_id")]
-        pub queue_id: i32,
+        pub queue_id: crate::consts::Queue,
         /// Teamfight Tactics set number.
         #[serde(rename = "tft_set_number")]
         pub tft_set_number: i32,
@@ -2845,20 +2976,20 @@ pub mod tft_summoner_v1 {
     }
 }
 
-/// Data structs used by [`TournamentStubV4`](crate::endpoints::TournamentStubV4).
+/// Data structs used by [`TournamentStubV5`](crate::endpoints::TournamentStubV5).
 /// 
 /// Note: this module is automatically generated.
 #[allow(dead_code)]
-pub mod tournament_stub_v4 {
+pub mod tournament_stub_v5 {
-    /// TournamentCodeParameters data object.
+    /// TournamentCodeParametersV5 data object.
     #[derive(Clone, Debug)]
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct TournamentCodeParameters {
+    pub struct TournamentCodeParametersV5 {
-        /// 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.
+        /// Optional list of encrypted puuids 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")]
+        #[serde(rename = "allowedParticipants")]
         #[serde(skip_serializing_if = "Option::is_none")]
-        pub allowed_summoner_ids: Option<std::vec::Vec<String>>,
+        pub allowed_participants: Option<std::vec::Vec<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")]
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -2871,104 +3002,22 @@ pub mod tournament_stub_v4 {
         #[serde(rename = "pickType")]
         pub pick_type: String,
         /// The map type of the game.<br>
-        /// (Legal values:  SUMMONERS_RIFT,  TWISTED_TREELINE,  HOWLING_ABYSS)
+        /// (Legal values:  SUMMONERS_RIFT,  HOWLING_ABYSS)
         #[serde(rename = "mapType")]
         pub map_type: String,
         /// The spectator type of the game.<br>
         /// (Legal values:  NONE,  LOBBYONLY,  ALL)
         #[serde(rename = "spectatorType")]
         pub spectator_type: String,
+        /// Checks if allowed participants are enough to make full teams.
+        #[serde(rename = "enoughPlayers")]
+        pub enough_players: bool,
     }
-    /// LobbyEventWrapper data object.
+    /// TournamentCodeV5 data object.
     #[derive(Clone, Debug)]
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct LobbyEventWrapper {
+    pub struct TournamentCodeV5 {
-        #[serde(rename = "eventList")]
-        pub event_list: std::vec::Vec<LobbyEvent>,
-    }
-    /// LobbyEvent data object.
-    #[derive(Clone, Debug)]
-    #[derive(serde::Serialize, serde::Deserialize)]
-    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct LobbyEvent {
-        /// The summonerId that triggered the event (Encrypted)
-        #[serde(rename = "summonerId")]
-        pub summoner_id: String,
-        /// The type of event that was triggered
-        #[serde(rename = "eventType")]
-        pub event_type: String,
-        /// Timestamp from the event
-        #[serde(rename = "timestamp")]
-        pub timestamp: String,
-    }
-    /// ProviderRegistrationParameters data object.
-    #[derive(Clone, Debug)]
-    #[derive(serde::Serialize, serde::Deserialize)]
-    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct ProviderRegistrationParameters {
-        /// The region in which the provider will be running tournaments.<br>
-        /// (Legal values:  BR,  EUNE,  EUW,  JP,  LAN,  LAS,  NA,  OCE,  PBE,  RU,  TR)
-        #[serde(rename = "region")]
-        pub region: crate::consts::TournamentRegion,
-        /// The provider's callback URL to which tournament game results in this region should be posted. The URL must be well-formed, use the http or https protocol, and use the default port for the protocol (http URLs must use port 80, https URLs must use port 443).
-        #[serde(rename = "url")]
-        pub url: String,
-    }
-    /// TournamentRegistrationParameters data object.
-    #[derive(Clone, Debug)]
-    #[derive(serde::Serialize, serde::Deserialize)]
-    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct TournamentRegistrationParameters {
-        /// The provider ID to specify the regional registered provider data to associate this tournament.
-        #[serde(rename = "providerId")]
-        pub provider_id: i32,
-        /// The optional name of the tournament.
-        #[serde(rename = "name")]
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub name: Option<String>,
-    }
-}
-
-/// Data structs used by [`TournamentV4`](crate::endpoints::TournamentV4).
-/// 
-/// Note: this module is automatically generated.
-#[allow(dead_code)]
-pub mod tournament_v4 {
-    /// TournamentCodeParameters data object.
-    #[derive(Clone, Debug)]
-    #[derive(serde::Serialize, serde::Deserialize)]
-    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct TournamentCodeParameters {
-        /// 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")]
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub allowed_summoner_ids: Option<std::vec::Vec<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")]
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub metadata: Option<String>,
-        /// The team size of the game. Valid values are 1-5.
-        #[serde(rename = "teamSize")]
-        pub team_size: i32,
-        /// The pick type of the game.<br>
-        /// (Legal values:  BLIND_PICK,  DRAFT_MODE,  ALL_RANDOM,  TOURNAMENT_DRAFT)
-        #[serde(rename = "pickType")]
-        pub pick_type: String,
-        /// The map type of the game.<br>
-        /// (Legal values:  SUMMONERS_RIFT,  TWISTED_TREELINE,  HOWLING_ABYSS)
-        #[serde(rename = "mapType")]
-        pub map_type: String,
-        /// The spectator type of the game.<br>
-        /// (Legal values:  NONE,  LOBBYONLY,  ALL)
-        #[serde(rename = "spectatorType")]
-        pub spectator_type: String,
-    }
-    /// TournamentCode data object.
-    #[derive(Clone, Debug)]
-    #[derive(serde::Serialize, serde::Deserialize)]
-    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct TournamentCode {
         /// The tournament code.
         #[serde(rename = "code")]
         pub code: String,
@@ -3000,31 +3049,165 @@ pub mod tournament_v4 {
         #[serde(rename = "id")]
         pub id: i32,
         /// The tournament code's region.<br>
-        /// (Legal values:  BR,  EUNE,  EUW,  JP,  LAN,  LAS,  NA,  OCE,  PBE,  RU,  TR)
+        /// (Legal values:  BR,  EUNE,  EUW,  JP,  LAN,  LAS,  NA,  OCE,  PBE,  RU,  TR,  KR)
         #[serde(rename = "region")]
         pub region: String,
         /// The game map for the tournament code game
         #[serde(rename = "map")]
         pub map: String,
-        /// The summonerIds of the participants (Encrypted)
+        /// The puuids of the participants (Encrypted)
         #[serde(rename = "participants")]
         pub participants: std::vec::Vec<String>,
     }
-    /// TournamentCodeUpdateParameters data object.
+    /// LobbyEventV5Wrapper data object.
     #[derive(Clone, Debug)]
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct TournamentCodeUpdateParameters {
+    pub struct LobbyEventV5Wrapper {
-        /// 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 = "eventList")]
-        #[serde(rename = "allowedSummonerIds")]
+        pub event_list: std::vec::Vec<LobbyEventV5>,
+    }
+    /// LobbyEventV5 data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct LobbyEventV5 {
+        /// Timestamp from the event
+        #[serde(rename = "timestamp")]
+        pub timestamp: String,
+        /// The type of event that was triggered
+        #[serde(rename = "eventType")]
+        pub event_type: String,
+        /// The puuid that triggered the event (Encrypted)
+        #[serde(rename = "puuid")]
+        pub puuid: String,
+    }
+    /// ProviderRegistrationParametersV5 data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct ProviderRegistrationParametersV5 {
+        /// The region in which the provider will be running tournaments.<br>
+        /// (Legal values:  BR,  EUNE,  EUW,  JP,  LAN,  LAS,  NA,  OCE,  PBE,  RU,  TR,  KR)
+        #[serde(rename = "region")]
+        pub region: String,
+        /// The provider's callback URL to which tournament game results in this region should be posted. The URL must be well-formed, use the http or https protocol, and use the default port for the protocol (http URLs must use port 80, https URLs must use port 443).
+        #[serde(rename = "url")]
+        pub url: String,
+    }
+    /// TournamentRegistrationParametersV5 data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct TournamentRegistrationParametersV5 {
+        /// The provider ID to specify the regional registered provider data to associate this tournament.
+        #[serde(rename = "providerId")]
+        pub provider_id: i32,
+        /// The optional name of the tournament.
+        #[serde(rename = "name")]
         #[serde(skip_serializing_if = "Option::is_none")]
-        pub allowed_summoner_ids: Option<std::vec::Vec<String>>,
+        pub name: Option<String>,
+    }
+}
+
+/// Data structs used by [`TournamentV5`](crate::endpoints::TournamentV5).
+/// 
+/// Note: this module is automatically generated.
+#[allow(dead_code)]
+pub mod tournament_v5 {
+    /// TournamentCodeParametersV5 data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct TournamentCodeParametersV5 {
+        /// Optional list of encrypted puuids 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 = "allowedParticipants")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub allowed_participants: Option<std::vec::Vec<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")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub metadata: Option<String>,
+        /// The team size of the game. Valid values are 1-5.
+        #[serde(rename = "teamSize")]
+        pub team_size: i32,
+        /// The pick type of the game.<br>
+        /// (Legal values:  BLIND_PICK,  DRAFT_MODE,  ALL_RANDOM,  TOURNAMENT_DRAFT)
+        #[serde(rename = "pickType")]
+        pub pick_type: String,
+        /// The map type of the game.<br>
+        /// (Legal values:  SUMMONERS_RIFT,  HOWLING_ABYSS)
+        #[serde(rename = "mapType")]
+        pub map_type: String,
+        /// The spectator type of the game.<br>
+        /// (Legal values:  NONE,  LOBBYONLY,  ALL)
+        #[serde(rename = "spectatorType")]
+        pub spectator_type: String,
+        /// Checks if allowed participants are enough to make full teams.
+        #[serde(rename = "enoughPlayers")]
+        pub enough_players: bool,
+    }
+    /// TournamentCodeV5 data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct TournamentCodeV5 {
+        /// The tournament code.
+        #[serde(rename = "code")]
+        pub code: String,
+        /// The spectator mode for the tournament code game.
+        #[serde(rename = "spectators")]
+        pub spectators: String,
+        /// The lobby name for the tournament code game.
+        #[serde(rename = "lobbyName")]
+        pub lobby_name: String,
+        /// The metadata for tournament code.
+        #[serde(rename = "metaData")]
+        pub meta_data: String,
+        /// The password for the tournament code game.
+        #[serde(rename = "password")]
+        pub password: String,
+        /// The team size for the tournament code game.
+        #[serde(rename = "teamSize")]
+        pub team_size: i32,
+        /// The provider's ID.
+        #[serde(rename = "providerId")]
+        pub provider_id: i32,
+        /// The pick mode for tournament code game.
+        #[serde(rename = "pickType")]
+        pub pick_type: String,
+        /// The tournament's ID.
+        #[serde(rename = "tournamentId")]
+        pub tournament_id: i32,
+        /// The tournament code's ID.
+        #[serde(rename = "id")]
+        pub id: i32,
+        /// The tournament code's region.<br>
+        /// (Legal values:  BR,  EUNE,  EUW,  JP,  LAN,  LAS,  NA,  OCE,  PBE,  RU,  TR,  KR)
+        #[serde(rename = "region")]
+        pub region: String,
+        /// The game map for the tournament code game
+        #[serde(rename = "map")]
+        pub map: String,
+        /// The puuids of the participants (Encrypted)
+        #[serde(rename = "participants")]
+        pub participants: std::vec::Vec<String>,
+    }
+    /// TournamentCodeUpdateParametersV5 data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct TournamentCodeUpdateParametersV5 {
+        /// Optional list of encrypted puuids 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 = "allowedParticipants")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub allowed_participants: Option<std::vec::Vec<String>>,
         /// The pick type<br>
         /// (Legal values:  BLIND_PICK,  DRAFT_MODE,  ALL_RANDOM,  TOURNAMENT_DRAFT)
         #[serde(rename = "pickType")]
         pub pick_type: String,
         /// The map type<br>
-        /// (Legal values:  SUMMONERS_RIFT,  TWISTED_TREELINE,  HOWLING_ABYSS)
+        /// (Legal values:  SUMMONERS_RIFT,  HOWLING_ABYSS)
         #[serde(rename = "mapType")]
         pub map_type: String,
         /// The spectator type<br>
@@ -3032,47 +3215,87 @@ pub mod tournament_v4 {
         #[serde(rename = "spectatorType")]
         pub spectator_type: String,
     }
-    /// LobbyEventWrapper data object.
+    /// TournamentGamesV5 data object.
     #[derive(Clone, Debug)]
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct LobbyEventWrapper {
+    pub struct TournamentGamesV5 {
-        #[serde(rename = "eventList")]
+        #[serde(rename = "winningTeam")]
-        pub event_list: std::vec::Vec<LobbyEvent>,
+        pub winning_team: std::vec::Vec<TournamentTeamV5>,
+        #[serde(rename = "losingTeam")]
+        pub losing_team: std::vec::Vec<TournamentTeamV5>,
+        /// Tournament Code
+        #[serde(rename = "shortCode")]
+        pub short_code: String,
+        /// Metadata for the TournamentCode
+        #[serde(rename = "metaData")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub meta_data: Option<String>,
+        #[serde(rename = "gameId")]
+        pub game_id: i64,
+        #[serde(rename = "gameName")]
+        pub game_name: String,
+        #[serde(rename = "gameType")]
+        pub game_type: String,
+        /// Game Map ID
+        #[serde(rename = "gameMap")]
+        pub game_map: i32,
+        #[serde(rename = "gameMode")]
+        pub game_mode: String,
+        /// Region of the game
+        #[serde(rename = "region")]
+        pub region: String,
     }
-    /// LobbyEvent data object.
+    /// TournamentTeamV5 data object.
     #[derive(Clone, Debug)]
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct LobbyEvent {
+    pub struct TournamentTeamV5 {
+        /// Player Unique UUID (Encrypted)
+        #[serde(rename = "puuid")]
+        pub puuid: String,
+    }
+    /// LobbyEventV5Wrapper data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct LobbyEventV5Wrapper {
+        #[serde(rename = "eventList")]
+        pub event_list: std::vec::Vec<LobbyEventV5>,
+    }
+    /// LobbyEventV5 data object.
+    #[derive(Clone, Debug)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
+    pub struct LobbyEventV5 {
         /// Timestamp from the event
         #[serde(rename = "timestamp")]
         pub timestamp: String,
         /// The type of event that was triggered
         #[serde(rename = "eventType")]
         pub event_type: String,
-        /// The summonerId that triggered the event (Encrypted)
+        /// The puuid that triggered the event (Encrypted)
-        #[serde(rename = "summonerId")]
+        #[serde(rename = "puuid")]
-        pub summoner_id: String,
+        pub puuid: String,
     }
-    /// ProviderRegistrationParameters data object.
+    /// ProviderRegistrationParametersV5 data object.
     #[derive(Clone, Debug)]
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct ProviderRegistrationParameters {
+    pub struct ProviderRegistrationParametersV5 {
         /// The region in which the provider will be running tournaments.<br>
-        /// (Legal values:  BR,  EUNE,  EUW,  JP,  LAN,  LAS,  NA,  OCE,  PBE,  RU,  TR)
+        /// (Legal values:  BR,  EUNE,  EUW,  JP,  LAN,  LAS,  NA,  OCE,  PBE,  RU,  TR,  KR)
         #[serde(rename = "region")]
-        pub region: crate::consts::TournamentRegion,
+        pub region: String,
         /// The provider's callback URL to which tournament game results in this region should be posted. The URL must be well-formed, use the http or https protocol, and use the default port for the protocol (http URLs must use port 80, https URLs must use port 443).
         #[serde(rename = "url")]
         pub url: String,
     }
-    /// TournamentRegistrationParameters data object.
+    /// TournamentRegistrationParametersV5 data object.
     #[derive(Clone, Debug)]
     #[derive(serde::Serialize, serde::Deserialize)]
     #[cfg_attr(feature = "deny-unknown-fields", serde(deny_unknown_fields))]
-    pub struct TournamentRegistrationParameters {
+    pub struct TournamentRegistrationParametersV5 {
         /// The provider ID to specify the regional registered provider data to associate this tournament.
         #[serde(rename = "providerId")]
         pub provider_id: i32,
@@ -3126,6 +3349,10 @@ pub mod val_content_v1 {
         #[serde(rename = "ceremonies")]
         #[serde(skip_serializing_if = "Option::is_none")]
         pub ceremonies: Option<std::vec::Vec<ContentItem>>,
+        /// Unknown type, this is a placeholder subject to change.
+        #[serde(rename = "totems")]
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub totems: Option<std::vec::Vec<String>>,
     }
     /// ContentItem data object.
     #[derive(Clone, Debug)]

riven/src/models_impls.rs

@@ -1,5 +1,5 @@
-use crate::models::match_v5::Participant;
 use crate::consts::Champion;
+use crate::models::match_v5::Participant;
 
 impl Participant {
     /// This method takes the [`Self::champion_id`] field if it is valid

riven/src/req/mod.rs

@@ -4,9 +4,9 @@ mod rate_limit;
 pub use rate_limit::*;
 
 mod rate_limit_type;
-pub use rate_limit_type::*;
+use std::time::Instant;
 
-use std::time::Instant; // Hack for token_bucket_test.rs.
+pub use rate_limit_type::*; // Hack for token_bucket_test.rs.
 mod token_bucket;
 pub use token_bucket::*;
 

riven/src/req/rate_limit.rs

@@ -1,19 +1,15 @@
 use std::cmp;
-use std::time::{ Duration, Instant };
+use std::time::{Duration, Instant};
 
-#[cfg(not(feature="tracing"))]
+use parking_lot::{RwLock, RwLockUpgradableReadGuard};
-use log as log;
+use reqwest::{Response, StatusCode};
-#[cfg(feature="tracing")]
-use tracing as log;
-
-use parking_lot::{ RwLock, RwLockUpgradableReadGuard };
-use reqwest::{ StatusCode, Response };
 use scan_fmt::scan_fmt;
 use tokio::sync::Notify;
+#[cfg(feature = "tracing")]
+use tracing as log;
 
+use super::{RateLimitType, TokenBucket, VectorTokenBucket};
 use crate::RiotApiConfig;
-use super::{ TokenBucket, VectorTokenBucket };
-use super::RateLimitType;
 
 pub struct RateLimit {
     rate_limit_type: RateLimitType,
@@ -42,8 +38,8 @@ impl RateLimit {
     const HEADER_XRATELIMITTYPE_SERVICE: &'static str = "service";
 
     pub fn new(rate_limit_type: RateLimitType) -> Self {
-        let initial_bucket = VectorTokenBucket::new(
+        let initial_bucket =
-            Duration::from_secs(1), 1, Duration::new(0, 0), 1.0, 1.0);
+            VectorTokenBucket::new(Duration::from_secs(1), 1, Duration::new(0, 0), 1.0, 1.0);
         RateLimit {
             rate_limit_type,
             // Rate limit before getting from response: 1/s.
@@ -65,13 +61,19 @@ impl RateLimit {
         }
     }
 
-    fn acquire_both_or_duration(app_rate_limit: &Self, method_rate_limit: &Self) -> Option<Duration> {
+    fn acquire_both_or_duration(
+        app_rate_limit: &Self,
+        method_rate_limit: &Self,
+    ) -> Option<Duration> {
         // Check retry after.
         {
-            let retry_after_delay = app_rate_limit.get_retry_after_delay()
+            let retry_after_delay = app_rate_limit.get_retry_after_delay().and_then(|a| {
-                .and_then(|a| method_rate_limit.get_retry_after_delay().map(|m| cmp::max(a, m)));
+                method_rate_limit
+                    .get_retry_after_delay()
+                    .map(|m| cmp::max(a, m))
+            });
             if retry_after_delay.is_some() {
-                return retry_after_delay
+                return retry_after_delay;
             }
         }
         // Check buckets.
@@ -88,12 +90,18 @@ impl RateLimit {
             bucket.get_tokens(1);
         }
 
-        log::trace!("Tokens obtained, buckets: APP {:?} METHOD {:?}", app_buckets, method_buckets);
+        log::trace!(
+            "Tokens obtained, buckets: APP {:?} METHOD {:?}",
+            app_buckets,
+            method_buckets
+        );
         None
     }
 
     pub fn get_retry_after_delay(&self) -> Option<Duration> {
-        self.retry_after.read().and_then(|i| Instant::now().checked_duration_since(i))
+        self.retry_after
+            .read()
+            .and_then(|i| Instant::now().checked_duration_since(i))
     }
 
     /// Update retry-after and rate limits based on an API response.
@@ -153,13 +161,25 @@ impl RateLimit {
         }
 
         // Get retry after header. Only care if it exists.
-        let retry_after_header = response.headers()
+        let retry_after_header = response
+            .headers()
             .get(reqwest::header::RETRY_AFTER)
-            .and_then(|h| h
+            .and_then(|h| {
-                .to_str()
+                h.to_str()
-                .map_err(|e| log::error!("Failed to read retry-after header as visible ASCII string: {:?}.", e)).ok())?;
+                    .map_err(|e| {
+                        log::error!(
+                            "Failed to read retry-after header as visible ASCII string: {:?}.",
+                            e
+                        )
+                    })
+                    .ok()
+            })?;
 
-        log::info!("429 response, rate limit {:?}, retry-after {} secs.", self.rate_limit_type, retry_after_header);
+        log::info!(
+            "429 response, rate limit {:?}, retry-after {} secs.",
+            self.rate_limit_type,
+            retry_after_header
+        );
 
         // Header currently only returns ints, but float is more general. Can be zero.
         let retry_after_secs = retry_after_header
@@ -179,21 +199,42 @@ impl RateLimit {
     fn on_response_rate_limits(&self, config: &RiotApiConfig, response: &Response) {
         // Check if rate limits changed.
         let headers = response.headers();
-        let limit_header_opt = headers.get(self.rate_limit_type.limit_header())
+        let limit_header_opt = headers
-            .and_then(|h| h.to_str().map_err(|e| log::error!("Failed to read limit header as visible ASCII string: {:?}.", e)).ok());
+            .get(self.rate_limit_type.limit_header())
-        let count_header_opt = headers.get(self.rate_limit_type.count_header())
+            .and_then(|h| {
-            .and_then(|h| h.to_str().map_err(|e| log::error!("Failed to read count header as visible ASCII string: {:?}.", e)).ok());
+                h.to_str()
+                    .map_err(|e| {
+                        log::error!(
+                            "Failed to read limit header as visible ASCII string: {:?}.",
+                            e
+                        )
+                    })
+                    .ok()
+            });
+        let count_header_opt = headers
+            .get(self.rate_limit_type.count_header())
+            .and_then(|h| {
+                h.to_str()
+                    .map_err(|e| {
+                        log::error!(
+                            "Failed to read count header as visible ASCII string: {:?}.",
+                            e
+                        )
+                    })
+                    .ok()
+            });
 
         if let (Some(limit_header), Some(count_header)) = (limit_header_opt, count_header_opt) {
             {
                 let buckets = self.buckets.upgradable_read();
-                if !buckets_require_updating(limit_header, &*buckets) {
+                if !buckets_require_updating(limit_header, &buckets) {
                     return;
                 }
 
                 // Buckets require updating. Upgrade to write lock.
                 let mut buckets = RwLockUpgradableReadGuard::upgrade(buckets);
-                *buckets = buckets_from_header(config, limit_header, count_header, self.rate_limit_type);
+                *buckets =
+                    buckets_from_header(config, limit_header, count_header, self.rate_limit_type);
             }
             // Notify waiters that buckets have updated (after unlocking).
             self.update_notify.notify_waiters();
@@ -207,7 +248,11 @@ fn buckets_require_updating(limit_header: &str, buckets: &[VectorTokenBucket]) -
     }
     for (limit_header_entry, bucket) in limit_header.split(',').zip(buckets) {
         // limit_header_entry "100:60" means 100 req per 60 sec.
-        let bucket_entry = format!("{}:{}", bucket.get_total_limit(), bucket.get_bucket_duration().as_secs());
+        let bucket_entry = format!(
+            "{}:{}",
+            bucket.get_total_limit(),
+            bucket.get_bucket_duration().as_secs()
+        );
         if limit_header_entry != bucket_entry {
             return true;
         }
@@ -215,7 +260,12 @@ fn buckets_require_updating(limit_header: &str, buckets: &[VectorTokenBucket]) -
     false
 }
 
-fn buckets_from_header(config: &RiotApiConfig, limit_header: &str, count_header: &str, rate_limit_type: RateLimitType) -> Vec<VectorTokenBucket> {
+fn buckets_from_header(
+    config: &RiotApiConfig,
+    limit_header: &str,
+    count_header: &str,
+    rate_limit_type: RateLimitType,
+) -> Vec<VectorTokenBucket> {
     // Limits: "20000:10,1200000:600"
     // Counts: "7:10,58:600"
     let size = limit_header.split(',').count();
@@ -238,11 +288,20 @@ fn buckets_from_header(config: &RiotApiConfig, limit_header: &str, count_header:
         let limit_f32 = limit as f32;
         let scaled_burst_factor = config.burst_factor * limit_f32 / (limit_f32 + 1.0);
 
-        let bucket = VectorTokenBucket::new(Duration::from_secs(limit_secs), limit,
+        let bucket = VectorTokenBucket::new(
-            config.duration_overhead, scaled_burst_factor, rate_usage_factor);
+            Duration::from_secs(limit_secs),
+            limit,
+            config.duration_overhead,
+            scaled_burst_factor,
+            rate_usage_factor,
+        );
         bucket.get_tokens(count);
         out.push(bucket);
     }
-    log::debug!("Set buckets to {} limit, {} count.", limit_header, count_header);
+    log::debug!(
+        "Set buckets to {} limit, {} count.",
+        limit_header,
+        count_header
+    );
     out
 }

riven/src/req/regional_requester.rs

@@ -1,23 +1,15 @@
 use std::future::Future;
 use std::sync::Arc;
 
-#[cfg(not(feature="tracing"))]
+use reqwest::{RequestBuilder, StatusCode};
-use log as log;
+#[cfg(feature = "tracing")]
-#[cfg(feature="tracing")]
 use tracing as log;
 #[cfg(feature = "tracing")]
 use tracing::Instrument;
 
-use reqwest::{ StatusCode, RequestBuilder };
+use super::{RateLimit, RateLimitType};
-
 use crate::util::InsertOnlyCHashMap;
-use crate::ResponseInfo;
+use crate::{ResponseInfo, Result, RiotApiConfig, RiotApiError};
-use crate::Result;
-use crate::RiotApiConfig;
-use crate::RiotApiError;
-
-use super::RateLimit;
-use super::RateLimitType;
 
 pub struct RegionalRequester {
     /// The app rate limit.
@@ -40,19 +32,21 @@ impl RegionalRequester {
         }
     }
 
-    pub fn execute<'a>(self: Arc<Self>,
+    pub fn execute<'a>(
+        self: Arc<Self>,
         config: &'a RiotApiConfig,
-        method_id: &'static str, request: RequestBuilder)
+        method_id: &'static str,
-        -> impl Future<Output = Result<ResponseInfo>> + 'a
+        request: RequestBuilder,
-    {
+    ) -> impl Future<Output = Result<ResponseInfo>> + 'a {
         async move {
             let mut retries: u8 = 0;
             loop {
-                let method_rate_limit: Arc<RateLimit> = self.method_rate_limits
+                let method_rate_limit: Arc<RateLimit> = self
+                    .method_rate_limits
                     .get_or_insert_with(method_id, || RateLimit::new(RateLimitType::Method));
 
                 // Rate limit.
-                let rate_limit = RateLimit::acquire_both(&self.app_rate_limit, &*method_rate_limit);
+                let rate_limit = RateLimit::acquire_both(&self.app_rate_limit, &method_rate_limit);
                 #[cfg(feature = "tracing")]
                 let rate_limit = rate_limit.instrument(tracing::info_span!("rate_limit"));
                 rate_limit.await;
@@ -79,24 +73,40 @@ impl RegionalRequester {
                 let status_none = Self::NONE_STATUS_CODES.contains(&status);
                 // Success case.
                 if status.is_success() || status_none {
-                    log::trace!("Response {} (retried {} times), success, returning result.", status, retries);
+                    log::trace!(
+                        "Response {} (retried {} times), success, returning result.",
+                        status,
+                        retries
+                    );
                     break Ok(ResponseInfo {
                         response,
                         retries,
                         status_none,
                     });
                 }
-                let err = response.error_for_status_ref().err().unwrap_or_else(
+                let err = response.error_for_status_ref().err().unwrap_or_else(|| {
-                    || panic!("Unhandlable response status code, neither success nor failure: {}.", status));
+                    panic!(
+                        "Unhandlable response status code, neither success nor failure: {}.",
+                        status
+                    )
+                });
                 // Failure, may or may not be retryable.
                 // Not-retryable: no more retries or 4xx or ? (3xx, redirects exceeded).
                 // Retryable: retries remaining, and 429 or 5xx.
-                if retries >= config.retries ||
+                if retries >= config.retries
-                    (StatusCode::TOO_MANY_REQUESTS != status
+                    || (StatusCode::TOO_MANY_REQUESTS != status && !status.is_server_error())
-                    && !status.is_server_error())
                 {
-                    log::debug!("Response {} (retried {} times), failure, returning error.", status, retries);
+                    log::debug!(
-                    break Err(RiotApiError::new(err, retries, Some(response), Some(status)));
+                        "Response {} (retried {} times), failure, returning error.",
+                        status,
+                        retries
+                    );
+                    break Err(RiotApiError::new(
+                        err,
+                        retries,
+                        Some(response),
+                        Some(status),
+                    ));
                 }
 
                 // Is retryable, do exponential backoff if retry-after wasn't specified.

riven/src/req/token_bucket.rs

@@ -1,5 +1,5 @@
-use std::fmt;
 use std::collections::VecDeque;
+use std::fmt;
 use std::time::Duration;
 
 use parking_lot::{Mutex, MutexGuard};
@@ -58,32 +58,41 @@ pub struct VectorTokenBucket {
     /// Limit allowed per burst_duration, for burst factor.
     burst_limit: usize,
 
-
     /// Record of timestamps (synchronized).
     timestamps: Mutex<VecDeque<Instant>>,
 }
 
 impl VectorTokenBucket {
-    pub fn new(duration: Duration, given_total_limit: usize,
+    pub fn new(
-        duration_overhead: Duration, burst_factor: f32,
+        duration: Duration,
-        rate_usage_factor: f32) -> Self
+        given_total_limit: usize,
-    {
+        duration_overhead: Duration,
-        debug_assert!(0.0 < rate_usage_factor && rate_usage_factor <= 1.0,
+        burst_factor: f32,
-            "BAD rate_usage_factor {}.", rate_usage_factor);
+        rate_usage_factor: f32,
-        debug_assert!(0.0 < burst_factor && burst_factor <= 1.0,
+    ) -> Self {
-            "BAD burst_factor {}.", burst_factor);
+        debug_assert!(
+            0.0 < rate_usage_factor && rate_usage_factor <= 1.0,
+            "BAD rate_usage_factor {}.",
+            rate_usage_factor
+        );
+        debug_assert!(
+            0.0 < burst_factor && burst_factor <= 1.0,
+            "BAD burst_factor {}.",
+            burst_factor
+        );
         // Float ops may lose precision, but nothing should be that precise.
         // API always uses round numbers, burst_factor is frac of 256.
 
         // Adjust everything by rate_usage_factor.
-        let total_limit = std::cmp::max(1,
+        let total_limit = std::cmp::max(
-            (given_total_limit as f32 * rate_usage_factor).floor() as usize);
+            1,
+            (given_total_limit as f32 * rate_usage_factor).floor() as usize,
+        );
 
         // Effective duration.
         let d_eff = duration + duration_overhead;
         let burst_duration = d_eff.mul_f32(burst_factor);
-        let burst_limit = std::cmp::max(1,
+        let burst_limit = std::cmp::max(1, (total_limit as f32 * burst_factor).floor() as usize);
-            (total_limit as f32 * burst_factor).floor() as usize);
         debug_assert!(burst_limit <= total_limit);
 
         VectorTokenBucket {
@@ -113,21 +122,23 @@ impl VectorTokenBucket {
 }
 
 impl TokenBucket for VectorTokenBucket {
-
     fn get_delay(&self) -> Option<Duration> {
         let timestamps = self.update_get_timestamps();
 
         // Full rate limit.
         if let Some(ts) = timestamps.get(self.total_limit - 1) {
             // Return amount of time needed for timestamp `ts` to go away.
-            Instant::now().checked_duration_since(*ts)
+            Instant::now()
-                .and_then(|passed_dur| (self.duration + self.duration_overhead)
+                .checked_duration_since(*ts)
-                    .checked_sub(passed_dur))
+                .and_then(|passed_dur| {
+                    (self.duration + self.duration_overhead).checked_sub(passed_dur)
+                })
         }
         // Otherwise burst rate limit.
         else if let Some(ts) = timestamps.get(self.burst_limit - 1) {
             // Return amount of time needed for timestamp `ts` to go away.
-            Instant::now().checked_duration_since(*ts)
+            Instant::now()
+                .checked_duration_since(*ts)
                 .and_then(|passed_dur| self.burst_duration.checked_sub(passed_dur))
         }
         // No delay needed.
@@ -173,6 +184,12 @@ impl TokenBucket for VectorTokenBucket {
 
 impl fmt::Debug for VectorTokenBucket {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "({}/{}:{})", self.timestamps.lock().len(), self.total_limit, self.duration.as_secs())
+        write!(
+            f,
+            "({}/{}:{})",
+            self.timestamps.lock().len(),
+            self.total_limit,
+            self.duration.as_secs()
+        )
     }
 }

riven/src/req/token_bucket.test.rs

@@ -7,9 +7,10 @@ mod token_bucket {
     include!("token_bucket.rs");
 
     mod tests {
-        use super::*;
         use lazy_static::lazy_static;
 
+        use super::*;
+
         lazy_static! {
             pub static ref ZERO: Duration = Duration::new(0, 0);
         }

riven/src/riot_api.rs

@@ -1,19 +1,13 @@
 use std::future::Future;
 use std::sync::Arc;
 
-#[cfg(not(feature="tracing"))]
+use reqwest::{Client, Method, RequestBuilder};
-use log as log;
+#[cfg(feature = "tracing")]
-#[cfg(feature="tracing")]
 use tracing as log;
 
-use reqwest::{ Client, RequestBuilder, Method };
-
-use crate::Result;
-use crate::ResponseInfo;
-use crate::RiotApiConfig;
-use crate::RiotApiError;
 use crate::req::RegionalRequester;
 use crate::util::InsertOnlyCHashMap;
+use crate::{ResponseInfo, Result, RiotApiConfig, RiotApiError};
 
 /// For retrieving data from the Riot Games API.
 ///
@@ -59,11 +53,15 @@ impl RiotApi {
     /// Constructs a new instance from an API key (e.g. `"RGAPI-01234567-89ab-cdef-0123-456789abcdef"`) or a [RiotApiConfig].
     pub fn new(config: impl Into<RiotApiConfig>) -> Self {
         let mut config = config.into();
-        let client_builder = config.client_builder.take()
+        let client_builder = config
+            .client_builder
+            .take()
             .expect("CLIENT_BUILDER IN CONFIG SHOULD NOT BE NONE.");
         Self {
             config,
-            client: client_builder.build().expect("Failed to create client from builder."),
+            client: client_builder
+                .build()
+                .expect("Failed to create client from builder."),
             regional_requesters: InsertOnlyCHashMap::new(),
         }
     }
@@ -78,7 +76,8 @@ impl RiotApi {
     /// * `path` - The URL path, appended to the base URL.
     pub fn request(&self, method: Method, region_platform: &str, path: &str) -> RequestBuilder {
         let base_url_platform = self.config.base_url.replace("{}", region_platform);
-        self.client.request(method, format!("{}{}", base_url_platform, path))
+        self.client
+            .request(method, format!("{}{}", base_url_platform, path))
     }
 
     /// This method should generally not be used directly. Consider using endpoint wrappers instead.
@@ -92,11 +91,15 @@ impl RiotApi {
     ///
     /// # Returns
     /// A future resolving to a `Result` containg either a `T` (success) or a `RiotApiError` (failure).
-    pub async fn execute_val<'a, T: serde::de::DeserializeOwned + 'a>(&'a self,
+    pub async fn execute_val<'a, T: serde::de::DeserializeOwned + 'a>(
-        method_id: &'static str, region_platform: &'static str, request: RequestBuilder)
+        &'a self,
-        -> Result<T>
+        method_id: &'static str,
-    {
+        region_platform: &'static str,
-        let rinfo = self.execute_raw(method_id, region_platform, request).await?;
+        request: RequestBuilder,
+    ) -> Result<T> {
+        let rinfo = self
+            .execute_raw(method_id, region_platform, request)
+            .await?;
         let retries = rinfo.retries;
         let status = rinfo.response.status();
         let value = rinfo.response.json::<T>().await;
@@ -114,11 +117,15 @@ impl RiotApi {
     ///
     /// # Returns
     /// A future resolving to a `Result` containg either an `Option<T>` (success) or a `RiotApiError` (failure).
-    pub async fn execute_opt<'a, T: serde::de::DeserializeOwned + 'a>(&'a self,
+    pub async fn execute_opt<'a, T: serde::de::DeserializeOwned + 'a>(
-        method_id: &'static str, region_platform: &'static str, request: RequestBuilder)
+        &'a self,
-        -> Result<Option<T>>
+        method_id: &'static str,
-    {
+        region_platform: &'static str,
-        let rinfo = self.execute_raw(method_id, region_platform, request).await?;
+        request: RequestBuilder,
+    ) -> Result<Option<T>> {
+        let rinfo = self
+            .execute_raw(method_id, region_platform, request)
+            .await?;
         if rinfo.status_none {
             return Ok(None);
         }
@@ -139,14 +146,20 @@ impl RiotApi {
     ///
     /// # Returns
     /// A future resolving to a `Result` containg either `()` (success) or a `RiotApiError` (failure).
-    pub async fn execute(&self,
+    pub async fn execute(
-        method_id: &'static str, region_platform: &'static str, request: RequestBuilder)
+        &self,
-        -> Result<()>
+        method_id: &'static str,
-    {
+        region_platform: &'static str,
-        let rinfo = self.execute_raw(method_id, region_platform, request).await?;
+        request: RequestBuilder,
+    ) -> Result<()> {
+        let rinfo = self
+            .execute_raw(method_id, region_platform, request)
+            .await?;
         let retries = rinfo.retries;
         let status = rinfo.response.status();
-        rinfo.response.error_for_status()
+        rinfo
+            .response
+            .error_for_status()
             .map(|_| ())
             .map_err(|e| RiotApiError::new(e, retries, None, Some(status)))
     }
@@ -164,18 +177,25 @@ impl RiotApi {
     ///
     /// # Returns
     /// A future resolving to a `Result` containg either a `ResponseInfo` (success) or a `RiotApiError` (failure).
-    pub fn execute_raw(&self, method_id: &'static str, region_platform: &'static str, request: RequestBuilder)
+    pub fn execute_raw(
-        -> impl Future<Output = Result<ResponseInfo>> + '_
+        &self,
-    {
+        method_id: &'static str,
+        region_platform: &'static str,
+        request: RequestBuilder,
+    ) -> impl Future<Output = Result<ResponseInfo>> + '_ {
         self.regional_requester(region_platform)
             .execute(&self.config, method_id, request)
     }
 
     /// Get or create the RegionalRequester for the given region.
     fn regional_requester(&self, region_platform: &'static str) -> Arc<RegionalRequester> {
-        self.regional_requesters.get_or_insert_with(region_platform, || {
+        self.regional_requesters
-            log::debug!("Creating requester for region platform {}.", region_platform);
+            .get_or_insert_with(region_platform, || {
-            RegionalRequester::new()
+                log::debug!(
-        })
+                    "Creating requester for region platform {}.",
+                    region_platform
+                );
+                RegionalRequester::new()
+            })
     }
 }

riven/src/util/insert_only_chashmap.rs

@@ -13,7 +13,7 @@ impl<K: Hash + Eq, V> InsertOnlyCHashMap<K, V> {
     #[inline]
     pub fn new() -> Self {
         Self {
-            base: Mutex::new(HashMap::new())
+            base: Mutex::new(HashMap::new()),
         }
     }
 
@@ -27,10 +27,12 @@ impl<K: Hash + Eq, V> InsertOnlyCHashMap<K, V> {
     // }
 
     #[inline]
-    pub fn get_or_insert_with<F: FnOnce() -> V>(&self, key: K, default: F) -> Arc<V>
+    pub fn get_or_insert_with<F: FnOnce() -> V>(&self, key: K, default: F) -> Arc<V> {
-    {
+        Arc::clone(
-        Arc::clone(self.base.lock()
+            self.base
-            .entry(key)
+                .lock()
-            .or_insert_with(|| Arc::new(default())))
+                .entry(key)
+                .or_insert_with(|| Arc::new(default())),
+        )
     }
 }

riven/srcgen/consts/game_type.rs.dt

@@ -16,12 +16,18 @@ pub enum GameType {
 {{
     for (const e of gameTypes) {
         const desc = e['x-desc'] ? e['x-desc'].split('\n') : [];
+        const nameNoGame = e['x-name'].replace(/_GAME$/, "");
 }}
 {{~ desc :line }}
     /// {{= line }}
 {{~}}
+    #[strum(to_string = "{{= e['x-name'] }}", serialize = "{{= nameNoGame }}")]
+    #[serde(alias = "{{= nameNoGame }}")]
     {{= e['x-name'] }},
 {{
     }
 }}
 }
+
+#[cfg(test)]
+mod test;

riven/srcgen/consts/queue.rs.dt

@@ -14,8 +14,11 @@ newtype_enum! {
 {{~ desc :line }}
         /// {{= line }}
 {{~}}
-{{? e['x-deprecated'] }}
+{{? e.notes }}
+        ///
         /// {{= e.notes }}
+{{?}}
+{{? e['x-deprecated'] }}
         #[deprecated(note="{{= e.notes }}")]
 {{?}}
         {{= e['x-name'] }} = {{= e['x-value'] }},

riven/srcgen/dotUtils.js

@@ -28,6 +28,7 @@ Array.prototype.sortBy = function(lambda) {
 
 function preamble() {
   return `\
+#![cfg_attr(rustfmt, rustfmt_skip)]
 ///////////////////////////////////////////////
 //                                           //
 //                     !                     //
@@ -103,16 +104,16 @@ function formatJsonProperty(name) {
 function formatAddQueryParam(param) {
   const k = `"${param.name}"`;
   const name = normalizePropName(param.name);
-  const condStart = param.required ? '' : `mut request = request; if let Some(${name}) = ${name} { `;
+  const condStart = param.required ? '' : `if let Some(${name}) = ${name} { `;
-  const condEnd = param.required ? '' : ' }'
+  const condEnd = param.required ? '' : ' } else { request }'
   const prop = param.schema;
   switch (prop.type) {
-    case 'array': return `let ${condStart}request = request.query(&*${name}.iter()`
+    case 'array': return `let request = ${condStart}request.query(&*${name}.iter()`
-      + `.map(|w| ( ${k}, w )).collect::<Vec<_>>());${condEnd}`;
+      + `.map(|w| ( ${k}, w )).collect::<Vec<_>>())${condEnd};`;
     case 'object':
       throw 'unsupported';
     default:
-      return `let ${condStart}request = request.query(&[ (${k}, ${name}) ]);${condEnd}`;
+      return `let request = ${condStart}request.query(&[ (${k}, ${name}) ])${condEnd};`;
   }
 }
 

riven/srcgen/lib.rs.dt

@@ -7,18 +7,18 @@
 #![deny(missing_docs)]
 
 {{~ readme :line }}
-//! {{= line }}
+//!{{= line ? (' ' + line) : '' }}
 {{~}}
 
 // Re-exported reqwest types.
 pub use reqwest;
 
-
 mod config;
 pub use config::RiotApiConfig;
 
 pub mod consts;
 
+#[rustfmt::skip]
 pub mod endpoints;
 
 mod error;
@@ -26,6 +26,7 @@ pub use error::*;
 
 pub mod meta;
 
+#[rustfmt::skip]
 pub mod models;
 mod models_impls;
 

riven/tests/test_ru.rs

@@ -0,0 +1,26 @@
+#![cfg_attr(feature = "nightly", feature(custom_test_frameworks))]
+#![cfg_attr(feature = "nightly", test_runner(my_runner))]
+
+mod async_tests;
+mod testutils;
+use colored::*;
+use riven::consts::*;
+use testutils::*;
+
+const ROUTE: PlatformRoute = PlatformRoute::RU;
+
+async_tests! {
+    my_runner {
+        summoner_leagues: async {
+            let sum = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, "d3atomiz3d");
+            let sum = sum.await
+                .map_err(|e| format!("Error getting summoner: {}", e))?
+                .ok_or_else(|| "Failed to find summoner".to_owned())?;
+
+            let p = RIOT_API.league_v4().get_league_entries_for_summoner(ROUTE, &sum.id);
+            let s = p.await.map_err(|e| format!("Error getting league entries: {}", e))?;
+            let _ = s;
+            Ok(())
+        },
+    }
+}

riven/tests/tests_americas.rs

@@ -3,76 +3,86 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
-// use riven::models::tournament_stub_v4::*;
+use riven::models::tournament_stub_v5::*;
+use testutils::*;
 
 const ROUTE: RegionalRoute = RegionalRoute::AMERICAS;
 
 static MATCHES: &[&str] = &[
-    "NA1_3923487226",
-    "NA1_4049206905",
-    "NA1_4052515784",
-    "NA1_4062578191",
-    "NA1_4097036960",
-
     // New games with `match-v5.ParticipantDto.challenges` field.
     "NA1_4209556127",
     "NA1_4212715433",
     "NA1_4265913704", // `match-v5.ParticipantDto.challenges.mejaisFullStackInTime`
 ];
 
-async_tests!{
+async_tests! {
     my_runner {
-        // TODO FAILING since 2022/11/28 https://github.com/MingweiSamuel/Riven/actions/runs/3571320200/jobs/6003088646
+        // Account-v1
-        // // Champion Mastery tests.
+        account_v1_getbyriotid_getbypuuid: async {
-        // tournamentstub: async {
+            // Game name is case and whitespace insensitive.
-        //     let tsv4 = RIOT_API.tournament_stub_v4();
+            // But tag cannot have spaces. (Is it case sensitive?).
-        //     let provider_id = tsv4.register_provider_data(ROUTE, &ProviderRegistrationParameters {
+            let account_tag = RIOT_API.account_v1().get_by_riot_id(ROUTE, "Lug nuts K", "000")
-        //         region: PlatformRoute::NA1.as_region_str().to_owned(),
+                .await
-        //         url: "https://github.com/MingweiSamuel/Riven".to_owned(),
+                .map_err(|e| format!("Failed to get account by riot ID: {}", e))?
-        //     })
+                .ok_or("Riot account not found!".to_owned())?;
-        //         .await
-        //         .map_err(|e| e.to_string())?;
 
-        //     println!("provider_id: {}", provider_id);
+            let account_puuid = RIOT_API.account_v1().get_by_puuid(ROUTE, &account_tag.puuid)
+                .await
+                .map_err(|e| format!("Failed to get account by PUUID: {}", e))?;
 
-        //     let tournament_id = tsv4.register_tournament(ROUTE, &TournamentRegistrationParameters {
+            let _ = account_puuid;
-        //         name: Some("Riven Tourney :)".to_owned()),
-        //         provider_id,
-        //     })
-        //         .await
-        //         .map_err(|e| e.to_string())?;
 
-        //     println!("tournament_id: {}", tournament_id);
+            Ok(())
+        },
 
-        //     let codes_result = tsv4.create_tournament_code(ROUTE, &TournamentCodeParameters {
+        // Tournament stub test.
-        //         map_type: "SUMMONERS_RIFT".to_owned(),
+        tournamentstub: async {
-        //         metadata: Some("eW91IGZvdW5kIHRoZSBzZWNyZXQgbWVzc2FnZQ==".to_owned()),
+            let ts = RIOT_API.tournament_stub_v5();
-        //         pick_type: "TOURNAMENT_DRAFT".to_owned(),
+            let provider_id = ts.register_provider_data(ROUTE, &ProviderRegistrationParametersV5 {
-        //         spectator_type: "ALL".to_owned(),
+                region: PlatformRoute::NA1.as_region_str().to_owned(),
-        //         team_size: 5,
+                url: "https://github.com/MingweiSamuel/Riven".to_owned(),
-        //         allowed_summoner_ids: None,
+            })
-        //     }, tournament_id as i64, Some(300))
+                .await
-        //         .await;
+                .map_err(|e| e.to_string())?;
 
-        //     match codes_result {
+            println!("provider_id: {}", provider_id);
-        //         Ok(codes) => {
+
-        //             rassert_eq!(300, codes.len());
+            let tournament_id = ts.register_tournament(ROUTE, &TournamentRegistrationParametersV5 {
-        //             println!("codes: {}", codes.join(", "));
+                name: Some("Riven Tourney :)".to_owned()),
-        //             Ok(())
+                provider_id,
-        //         }
+            })
-        //         Err(mut e) => {
+                .await
-        //             if let Some(response) = e.take_response() {
+                .map_err(|e| e.to_string())?;
-        //                 eprintln!("{:?}", response.text().await);
+
-        //             }
+            println!("tournament_id: {}", tournament_id);
-        //             Err(e.to_string())
+
-        //         }
+            let codes_result = ts.create_tournament_code(ROUTE, &TournamentCodeParametersV5 {
-        //     }
+                map_type: "SUMMONERS_RIFT".to_owned(),
-        // },
+                metadata: Some("eW91IGZvdW5kIHRoZSBzZWNyZXQgbWVzc2FnZQ==".to_owned()),
+                pick_type: "TOURNAMENT_DRAFT".to_owned(),
+                spectator_type: "ALL".to_owned(),
+                team_size: 5,
+                allowed_participants: None,
+                enough_players: false,
+            }, tournament_id as i64, Some(300))
+                .await;
+
+            match codes_result {
+                Ok(codes) => {
+                    rassert_eq!(300, codes.len());
+                    println!("codes: {}", codes.join(", "));
+                    Ok(())
+                }
+                Err(mut e) => {
+                    if let Some(response) = e.take_response() {
+                        eprintln!("{:?}", response.text().await);
+                    }
+                    Err(e.to_string())
+                }
+            }
+        },
 
         match_v5_get: async {
             match_v5_get(ROUTE, MATCHES).await

riven/tests/tests_asia_jp.rs

@@ -3,35 +3,28 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: PlatformRoute = PlatformRoute::JP1;
 
 static MATCHES: &[&str] = &[
-    // Regular game:
-    "KR_5495121707",
-    // `teamPosition` empty:
-    // AFK:
-    "JP1_312062554",
-    "JP1_326464722",
-    "JP1_289504387",
-    "JP1_285434511",
-    "JP1_307559381",
-    "JP1_292569767",
-    "JP1_310138781",
-    "JP1_300507433",
-    "JP1_283568774",
-    // `individualPosition` is set but `teamPosition` is empty due to AFK slightly after beginning:
-    "JP1_285797147",
-    // Illegal big `championId`s. https://github.com/RiotGames/developer-relations/issues/553
-    "JP1_267647303",
-    "JP1_273343663",
     // Only has participant IDs for blue team.
     "JP1_391732436",
+    // New field `ParticipantChallenges` `twoWardsOneSweeperCount`
+    "JP1_397348569",
+    // New fields:
+    // `match-v5.ParticipantDto.playerAugment[1234],playerSubteamId,subteamPlacement`
+    "JP1_400700181",
+    // New field: `match-v5.ParticipantDto.placement`
+    "JP1_405073638",
+    // New ARENA 2v2v2v2 game mode, broken `subteamPlacement`
+    "KR_6604607115",
+    // New field: `match-v5.ParticipantDto.missions`
+    "JP1_417935351",
+    // New field: `match-v5.ParticipantDto.riotIdGameName`
+    "JP1_419115017",
 ];
 
 async_tests! {
@@ -65,7 +58,7 @@ async_tests! {
         },
         // Make sure 403 is handled as expected.
         tournament_forbidden: async {
-            let p = RIOT_API.tournament_v4().get_tournament_code(ROUTE.to_regional(), "INVALID_CODE");
+            let p = RIOT_API.tournament_v5().get_tournament_code(ROUTE.to_regional(), "INVALID_CODE");
             let r = p.await;
             rassert!(r.is_err());
             rassert_eq!(Some(reqwest::StatusCode::FORBIDDEN), r.unwrap_err().status_code());

riven/tests/tests_europe.rs

@@ -3,20 +3,28 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: RegionalRoute = RegionalRoute::EUROPE;
 
+// Archived 2023-08-17
+// // Illegal big `championId`s. https://github.com/RiotGames/developer-relations/issues/553
+// "EUW1_5097684633",
+// "EUW1_5097963383",
+// "EUW1_5102203800", // https://github.com/MingweiSamuel/Riven/issues/36
+// "EUW1_5765650307", // https://gist.github.com/MingweiSamuel/d5f9dc40cc5a80a9255e488f27705c56?permalink_comment_id=4088256#gistcomment-4088256
+
 static MATCHES: &[&str] = &[
-    // Illegal big `championId`s. https://github.com/RiotGames/developer-relations/issues/553
+    // New ARENA 2v2v2v2 game mode
-    "EUW1_5097684633",
+    "EUW1_6511808246", // https://github.com/MingweiSamuel/Camille/issues/99
-    "EUW1_5097963383",
+    // Added 2023-08-27
-    "EUW1_5102203800", // https://github.com/MingweiSamuel/Riven/issues/36
+    "EUW1_6569580003",
-    "EUW1_5765650307", // https://gist.github.com/MingweiSamuel/d5f9dc40cc5a80a9255e488f27705c56?permalink_comment_id=4088256#gistcomment-4088256
+    "EUW1_6569417645",
+    "EUW1_6568707352",
+    "EUW1_6568635198",
+    "EUW1_6568537080",
 ];
 
 async_tests! {

riven/tests/tests_euw.rs

@@ -3,54 +3,73 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: PlatformRoute = PlatformRoute::EUW1;
 
-async_tests!{
+async_tests! {
     my_runner {
         // Champion Mastery tests.
+        // SUMMONER ID ENDPOINT BROKEN: https://github.com/RiotGames/developer-relations/issues/830
+        // championmastery_getscore_ma5tery: async {
+        //     let sum = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, "ma5tery");
+        //     let sum = sum.await
+        //         .map_err(|e| format!("Error getting summoner: {}", e))?
+        //         .ok_or_else(|| "Failed to find summoner".to_owned())?;
+
+        //     let p = RIOT_API.champion_mastery_v4().get_champion_mastery_score(ROUTE, &sum.id);
+        //     let s = p.await.map_err(|e| format!("Error getting champion mastery score: {}", e))?;
+        //     rassert!((969..=1000).contains(&s), "Unexpected ma5tery score: {}.", s);
+        //     Ok(())
+        // },
         championmastery_getscore_ma5tery: async {
             let sum = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, "ma5tery");
-            let sum = sum.await.map_err(|e| e.to_string())?.ok_or_else(|| "Failed to get summoner".to_owned())?;
+            let sum = sum.await
+                .map_err(|e| format!("Error getting summoner: {}", e))?
+                .ok_or_else(|| "Failed to find summoner".to_owned())?;
 
-            let p = RIOT_API.champion_mastery_v4().get_champion_mastery_score(ROUTE, &*sum.id);
+            let p = RIOT_API.champion_mastery_v4().get_champion_mastery_score_by_puuid(ROUTE, &sum.puuid);
-            let s = p.await.map_err(|e| e.to_string())?;
+            let s = p.await.map_err(|e| format!("Error getting champion mastery score: {}", e))?;
             rassert!((969..=1000).contains(&s), "Unexpected ma5tery score: {}.", s);
             Ok(())
         },
         championmastery_getall_ma5tery: async {
             let sum = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, "ma5tery");
-            let sum = sum.await.map_err(|e| e.to_string())?.ok_or_else(|| "Failed to get summoner".to_owned())?;
+            let sum = sum.await
+                .map_err(|e| format!("Error getting summoner: {}", e))?
+                .ok_or_else(|| "Failed to find summoner".to_owned())?;
 
-            let p = RIOT_API.champion_mastery_v4().get_all_champion_masteries(ROUTE, &*sum.id);
+            let p = RIOT_API.champion_mastery_v4().get_all_champion_masteries_by_puuid(ROUTE, &sum.puuid);
-            let s = p.await.map_err(|e| e.to_string())?;
+            let s = p.await.map_err(|e| format!("Error getting all champion masteries: {}", e))?;
             rassert!(s.len() >= 142, "Expected masteries: {}.", s.len());
             Ok(())
         },
 
-        // TODO: https://github.com/RiotGames/developer-relations/issues/602
+        // https://github.com/RiotGames/developer-relations/issues/602
-        // spectator_combo: async {
+        spectator_combo: async {
-        //     let featured_p = RIOT_API.spectator_v4().get_featured_games(ROUTE);
+            let featured_p = RIOT_API.spectator_v4().get_featured_games(ROUTE);
-        //     let featured = featured_p.await.map_err(|e| e.to_string())?;
+            let featured = featured_p.await.map_err(|e| e.to_string())?;
 
-        //     rassert!(!featured.game_list.is_empty());
+            rassert!(!featured.game_list.is_empty());
 
-        //     let summoner_name = &featured.game_list[0].participants[0].summoner_name;
+            // let summoner_name = &featured.game_list[0].participants[0].summoner_name;
-        //     let summoner_p = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, summoner_name);
+            // let summoner_p = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, summoner_name);
-        //     let summoner = summoner_p.await.map_err(|e| e.to_string())?.ok_or_else(|| "Failed to get summoner".to_owned())?;
+            // let summoner = summoner_p.await.map_err(|e| e.to_string())?.ok_or_else(|| "Failed to find summoner".to_owned())?;
 
-        //     let livegame_p = RIOT_API.spectator_v4().get_current_game_info_by_summoner(ROUTE, &summoner.id);
+            let featured_game = &featured.game_list[0];
-        //     let livegame_o = livegame_p.await.map_err(|e| e.to_string())?;
+            let participant = &featured_game.participants[0];
-        //     if let Some(livegame) = livegame_o {
+            let summoner_id = participant.summoner_id.as_ref()
-        //         let participant_match = livegame.participants.iter().find(|p| p.summoner_name == *summoner_name);
+                .ok_or_else(|| format!("Summoner in spectator featured game missing summoner ID: {}", &participant.summoner_name))?;
-        //         rassert!(participant_match.is_some(), "Failed to find summoner in match: {}.", summoner_name);
+
-        //     }
+            let livegame_p = RIOT_API.spectator_v4().get_current_game_info_by_summoner(ROUTE, &summoner_id);
-        //     Ok(())
+            let livegame_o = livegame_p.await.map_err(|e| e.to_string())?;
-        // },
+            if let Some(livegame) = livegame_o {
+                let participant_match = livegame.participants.iter().find(|p| p.summoner_name == participant.summoner_name);
+                rassert!(participant_match.is_some(), "Failed to find summoner in match: {}.", &participant.summoner_name);
+            }
+            Ok(())
+        },
     }
 }

riven/tests/tests_euw_tft.rs

@@ -3,17 +3,18 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: PlatformRoute = PlatformRoute::EUW1;
 
 static TFT_MATCHES: &[&str] = &[
     "EUW1_6307427444", // https://github.com/MingweiSamuel/Riven/issues/50
     "EUW1_6307262798",
+    // https://github.com/MingweiSamuel/Riven/pull/62
+    // https://github.com/MingweiSamuel/riotapi-schema/pull/43
+    "EUW1_6786745342",
 ];
 
 async_tests! {
@@ -28,14 +29,14 @@ async_tests! {
         //     let _s = p.await.map_err(|e| e.to_string())?;
         //     Ok(())
         // },
-        tftleaguev1_getchallengerleague: async {
+        tftleaguev1_gettopratedladder: async {
-            let p = RIOT_API.tft_league_v1().get_challenger_league(ROUTE);
+            let p = RIOT_API.tft_league_v1().get_top_rated_ladder(ROUTE, QueueType::RANKED_TFT_TURBO);
             let l = p.await.map_err(|e| e.to_string())?;
-            rassert!(l.entries.len() > 10, "Expected a few challenger players, got: {}.", l.entries.len());
+            rassert!(l.len() > 10, "Expected a few ranked players, got: {}.", l.len());
             Ok(())
         },
         tftmatchv1_getmatch: async {
-            let p = RIOT_API.tft_match_v1().get_match(ROUTE.to_regional(), "EUW1_4568680990");
+            let p = RIOT_API.tft_match_v1().get_match(ROUTE.to_regional(), "EUW1_6455483163");
             let _m = p.await.map_err(|e| e.to_string())?.ok_or("Failed to get TFT match.".to_owned())?;
             Ok(())
         },
@@ -53,13 +54,13 @@ async_tests! {
         tft_combo: async {
             let top_players = RIOT_API.tft_league_v1().get_top_rated_ladder(ROUTE, QueueType::RANKED_TFT_TURBO);
             let top_players = top_players.await.map_err(|e| e.to_string())?;
-            rassert!(0 < top_players.len());
+            rassert!(!top_players.is_empty());
             let top_player_entry = &top_players[0];
-            let top_player = RIOT_API.tft_summoner_v1().get_by_summoner_id(ROUTE, &*top_player_entry.summoner_id);
+            let top_player = RIOT_API.tft_summoner_v1().get_by_summoner_id(ROUTE, &top_player_entry.summoner_id);
             let top_player = top_player.await.map_err(|e| e.to_string())?;
             println!("Top player is {} with `puuid` {}.", top_player.name, top_player.puuid);
             let match_ids = RIOT_API.tft_match_v1().get_match_ids_by_puuid(
-                ROUTE.to_regional(), &*top_player.puuid, Some(10), None, None, None);
+                ROUTE.to_regional(), &top_player.puuid, Some(10), None, None, None);
             let match_ids = match_ids.await.map_err(|e| e.to_string())?;
             tft_match_v1_get(ROUTE.to_regional(), &*match_ids).await?;
             Ok(())

riven/tests/tests_kr.rs.ignored

@@ -36,7 +36,7 @@ async_tests!{
                                 REGION, &leagueentry.summoner_id);
                             summonerfuture.await
                                 .map_err(|e| e.to_string())?
-                                .ok_or(format!("Failed to get summoner_id {}.",
+                                .ok_or(format!("Failed to find summoner_id {}.",
                                     leagueentry.summoner_id))
                         });
                     future::join_all(summoners).await

riven/tests/tests_la1.rs

@@ -3,11 +3,9 @@
 
 mod async_tests;
 mod testutils;
-use testutils::RIOT_API;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::RIOT_API;
 
 const ROUTE: PlatformRoute = PlatformRoute::LA1;
 
@@ -40,7 +38,7 @@ async_tests! {
             // Spot check 10% for `player-data`.
             for entry in leaderboard.iter().step_by(10)
             {
-                let _player_data = RIOT_API.lol_challenges_v1().get_player_data(ROUTE, &*entry.puuid)
+                let _player_data = RIOT_API.lol_challenges_v1().get_player_data(ROUTE, &entry.puuid)
                     .await.map_err(|e| format!("Failed to get player data PUUID {}: {}", entry.puuid, e))?;
             }
 

riven/tests/tests_na.rs

@@ -3,30 +3,33 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
 use riven::models::summoner_v4::*;
+use testutils::*;
 
 fn validate_summoners(s1: Summoner, s2: Summoner) -> Result<(), String> {
     rassert_eq!(s1.name, s2.name, "Names didn't match {}.", "");
     rassert_eq!(s1.id, s2.id, "SummonerId didn't match {}.", "");
-    rassert_eq!(s1.account_id, s2.account_id, "AccountId didn't match {}.", "");
+    rassert_eq!(
+        s1.account_id,
+        s2.account_id,
+        "AccountId didn't match {}.",
+        ""
+    );
     Ok(())
 }
 
 const ROUTE: PlatformRoute = PlatformRoute::NA1;
 
-async_tests!{
+async_tests! {
     my_runner {
         // Summoner tests.
         summoner_double: async {
             let l1p = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, "lug nuts k");
             let l2p = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, "lugnuts k");
-            let l1 = l1p.await.map_err(|e| e.to_string())?.ok_or_else(|| "Failed to get l1".to_owned())?;
+            let l1 = l1p.await.map_err(|e| e.to_string())?.ok_or_else(|| "'lug nuts k' not found!".to_owned())?;
-            let l2 = l2p.await.map_err(|e| e.to_string())?.ok_or_else(|| "Failed to get l2".to_owned())?;
+            let l2 = l2p.await.map_err(|e| e.to_string())?.ok_or_else(|| "'lugnuts k' not found!".to_owned())?;
             validate_summoners(l1, l2)?;
             Ok(())
         },
@@ -44,22 +47,17 @@ async_tests!{
         leagueexp_get: async {
             let p = RIOT_API.league_exp_v4().get_league_entries(ROUTE, QueueType::RANKED_SOLO_5x5, Tier::CHALLENGER, Division::I, None);
             let d = p.await.map_err(|e| e.to_string())?;
-            rassert!(!d.is_empty(), "Challenger shouldn't be empty.");
+            if d.is_empty() {
+                eprintln!("Off-season, challenger league is empty.");
+            }
             Ok(())
         },
-
+        champion_mastery_v4: async {
-        // TO TEST THIS BUG: https://github.com/RiotGames/developer-relations/issues/572.
+            let summoner = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, "LugnutsK");
-        // https://lolchess.gg/leaderboards?mode=doubleup&region=na
+            let summoner = summoner.await.map_err(|e| e.to_string())?.ok_or_else(|| "'LugnutsK' not found!".to_owned())?;
-        // summoner must have double-up rank.
+            let masteries = RIOT_API.champion_mastery_v4().get_all_champion_masteries_by_puuid(ROUTE, &summoner.puuid);
-        league_getforsummoner_tftbug: async {
+            let masteries = masteries.await.map_err(|e| e.to_string())?;
-            // TODO(mingwei): get summoner from leaderboard to avoid updating this all the time.
+            rassert!(74 <= masteries.len());
-            const SUMMONER_NAME: &'static str = "Vincentscc";
-            let summoner_fut = RIOT_API.summoner_v4().get_by_summoner_name(ROUTE, SUMMONER_NAME);
-            let summoner = summoner_fut.await.map_err(|e| e.to_string())?.ok_or_else(|| format!("Failed to get \"{}\"", SUMMONER_NAME))?;
-            let league_fut = RIOT_API.league_v4().get_league_entries_for_summoner(ROUTE, &*summoner.id);
-            let leagues = league_fut.await.map_err(|e| e.to_string())?;
-            let tft_league = leagues.iter().find(|league| QueueType::RANKED_TFT_DOUBLE_UP == league.queue_type);
-            rassert!(tft_league.is_some());
             Ok(())
         },
 

riven/tests/tests_ph2.rs

@@ -3,15 +3,13 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: PlatformRoute = PlatformRoute::PH2;
 
-async_tests!{
+async_tests! {
     my_runner {
         status: async {
             let p = RIOT_API.lol_status_v4().get_platform_data(ROUTE);

riven/tests/tests_sg2.rs

@@ -3,15 +3,13 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: PlatformRoute = PlatformRoute::SG2;
 
-async_tests!{
+async_tests! {
     my_runner {
         status: async {
             let p = RIOT_API.lol_status_v4().get_platform_data(ROUTE);

riven/tests/tests_th2.rs

@@ -3,15 +3,13 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: PlatformRoute = PlatformRoute::TH2;
 
-async_tests!{
+async_tests! {
     my_runner {
         status: async {
             let p = RIOT_API.lol_status_v4().get_platform_data(ROUTE);

riven/tests/tests_tr.rs

@@ -3,17 +3,14 @@
 
 mod async_tests;
 mod testutils;
-use testutils::RIOT_API;
-
 use colored::*;
-
 use riven::consts::*;
 use riven::models::summoner_v4::Summoner;
+use testutils::RIOT_API;
 
 const ROUTE: PlatformRoute = PlatformRoute::TR1;
 
-
+async_tests! {
-async_tests!{
     my_runner {
         league_summoner_bulk_test: async {
             let p = RIOT_API.league_v4().get_challenger_league(ROUTE, QueueType::RANKED_SOLO_5x5);

riven/tests/tests_val_latam.rs

@@ -3,11 +3,9 @@
 
 mod async_tests;
 mod testutils;
-use testutils::RIOT_API;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::RIOT_API;
 
 const ROUTE: ValPlatformRoute = ValPlatformRoute::LATAM;
 
@@ -15,7 +13,7 @@ async_tests! {
     my_runner {
         val_content_ranked_test: async {
             let p = RIOT_API.val_content_v1().get_content(ROUTE, Some("zh-CN"));
-            let contents = p.await.map_err(|e| e.to_string())?;
+            let contents = p.await.map_err(|e| format!("Failed to get content: {}", e))?;
 
             // Find the LAST active act, via `.rev().find(...)`.
             // Added filter when parent id is 0000... as there are multiple that are active, the last active seems to be episode 5

riven/tests/tests_vn2.rs

@@ -3,15 +3,13 @@
 
 mod async_tests;
 mod testutils;
-use testutils::*;
-
 use colored::*;
-
 use riven::consts::*;
+use testutils::*;
 
 const ROUTE: PlatformRoute = PlatformRoute::VN2;
 
-async_tests!{
+async_tests! {
     my_runner {
         status: async {
             let p = RIOT_API.lol_status_v4().get_platform_data(ROUTE);

riven/tests/testutils.rs

@@ -1,7 +1,8 @@
 #![allow(dead_code)]
 
-use lazy_static::lazy_static;
+use std::future::Future;
 
+use lazy_static::lazy_static;
 use riven::consts::{PlatformRoute, QueueType, RegionalRoute};
 use riven::{RiotApi, RiotApiConfig};
 
@@ -21,10 +22,18 @@ pub async fn league_v4_match_v5_latest_combo(route: PlatformRoute) -> Result<(),
     let challenger_future = RIOT_API
         .league_v4()
         .get_challenger_league(route, QueueType::RANKED_SOLO_5x5);
-    let challenger_league = challenger_future.await.map_err(|e| e.to_string())?;
+    let challenger_league = challenger_future
+        .await
+        .map_err(|e| format!("Failed to get challenger league: {}", e))?;
 
-    if &QueueType::RANKED_SOLO_5x5 != &challenger_league.queue {
+    let Some(queue) = challenger_league.queue else {
-        return Err(format!("Unexpected `queue`: {}", challenger_league.queue));
+        assert!(challenger_league.entries.is_empty());
+        eprintln!("Off-season, challenger league is empty.");
+        return Ok(());
+    };
+
+    if QueueType::RANKED_SOLO_5x5 != queue {
+        return Err(format!("Unexpected `queue`: {:?}", queue));
     }
     if challenger_league.entries.is_empty() {
         return Err("Challenger league is unexpectedly empty!".to_owned());
@@ -38,11 +47,13 @@ pub async fn league_v4_match_v5_latest_combo(route: PlatformRoute) -> Result<(),
             let summoner_future = RIOT_API
                 .summoner_v4()
                 .get_by_summoner_id(route, &entry.summoner_id);
-            let summoner_info = summoner_future.await.map_err(|e| e.to_string())?;
+            let summoner_info = summoner_future
+                .await
+                .map_err(|e| format!("Failed to find summoner info: {}", e))?;
 
             let match_ids_future = RIOT_API.match_v5().get_match_ids_by_puuid(
                 route.to_regional(),
-                &*summoner_info.puuid,
+                &summoner_info.puuid,
                 Some(5),
                 None,
                 None,
@@ -50,7 +61,9 @@ pub async fn league_v4_match_v5_latest_combo(route: PlatformRoute) -> Result<(),
                 None,
                 None,
             );
-            let match_ids = match_ids_future.await.map_err(|e| e.to_string())?;
+            let match_ids = match_ids_future
+                .await
+                .map_err(|e| format!("Failed to find summoner match IDs: {}", e))?;
             Ok(match_ids) as Result<_, String>
         });
 
@@ -145,8 +158,7 @@ pub async fn match_v5_get(
         }
         Ok(())
     });
-    futures::future::try_join_all(futures).await?;
+    join_all_future_errs(futures).await
-    Ok(())
 }
 
 pub async fn match_v5_get_timeline(
@@ -179,6 +191,18 @@ pub async fn match_v5_get_timeline(
         }
         Ok(())
     });
-    futures::future::try_join_all(futures).await?;
+    join_all_future_errs(futures).await
-    Ok(())
+}
+
+/// Joins all futures and keeps ALL error messages, separated by newlines.
+async fn join_all_future_errs<T>(
+    result_tasks: impl Iterator<Item = impl Future<Output = Result<T, String>>>,
+) -> Result<(), String> {
+    futures::future::join_all(result_tasks)
+        .await
+        .into_iter()
+        .filter_map(Result::err)
+        .reduce(|a, b| a + "\n" + &b)
+        .map(Err)
+        .unwrap_or(Ok(()))
 }

rustfmt.toml

@@ -0,0 +1,10 @@
+format_code_in_doc_comments = true
+format_macro_matchers = true
+group_imports = "StdExternalCrate"
+hex_literal_case = "Lower"
+imports_granularity = "Module"
+newline_style = "Unix"
+normalize_comments = true
+normalize_doc_attributes = true
+use_field_init_shorthand = true
+use_try_shorthand = true

test.bash

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -euxo pipefail
 
-RGAPI_KEY="$(cat apikey.txt)" RUST_BACKTRACE=1 RUST_LOG=riven=debug cargo test --features nightly,deny-unknown -- --nocapture
+RGAPI_KEY="$(cat apikey.txt)" RUST_BACKTRACE=full RUST_LOG=riven=debug cargo test --no-fail-fast --features nightly,deny-unknown -- --nocapture