Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/routes/v1/players/mmr/batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ use utoipa::IntoParams;
use crate::context::AppState;
use crate::error::{APIError, APIResult};
use crate::routes::v1::players::mmr::mmr_history::{MMRHistory, SMOOTHING_FACTOR, WINDOW_SIZE};
use crate::services::rate_limiter::Quota;
use crate::services::rate_limiter::extractor::RateLimitKey;
use crate::utils::parse::comma_separated_deserialize;

#[derive(Deserialize, IntoParams, Clone)]
Expand Down Expand Up @@ -177,8 +179,21 @@ pub(super) async fn mmr(
account_ids,
max_match_id,
}): Query<MMRBatchQuery>,
rate_limit_key: RateLimitKey,
State(state): State<AppState>,
) -> APIResult<impl IntoResponse> {
state
.rate_limit_client
.apply_limits(
&rate_limit_key,
"mmr",
&[
Quota::ip_limit(10, core::time::Duration::from_secs(10)),
Quota::key_limit(10, core::time::Duration::from_secs(10)),
Quota::global_limit(20, core::time::Duration::from_secs(10)),
],
)
.await?;
let protected_users = state
.steam_client
.get_protected_users(&state.pg_client)
Expand Down Expand Up @@ -219,8 +234,21 @@ pub(super) async fn hero_mmr(
account_ids,
max_match_id,
}): Query<MMRBatchQuery>,
rate_limit_key: RateLimitKey,
State(state): State<AppState>,
) -> APIResult<impl IntoResponse> {
state
.rate_limit_client
.apply_limits(
&rate_limit_key,
"mmr",
&[
Quota::ip_limit(10, core::time::Duration::from_secs(10)),
Quota::key_limit(10, core::time::Duration::from_secs(10)),
Quota::global_limit(20, core::time::Duration::from_secs(10)),
],
)
.await?;
let protected_users = state
.steam_client
.get_protected_users(&state.pg_client)
Expand Down
28 changes: 28 additions & 0 deletions src/routes/v1/players/mmr/distribution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ use crate::context::AppState;
use crate::error::APIResult;
use crate::routes::v1::players::mmr::batch::HeroMMRPath;
use crate::routes::v1::players::mmr::mmr_history::{SMOOTHING_FACTOR, WINDOW_SIZE};
use crate::services::rate_limiter::Quota;
use crate::services::rate_limiter::extractor::RateLimitKey;
use crate::utils::parse::default_last_month_timestamp;

#[derive(Copy, Debug, Clone, Deserialize, IntoParams, Eq, PartialEq, Hash)]
Expand Down Expand Up @@ -178,9 +180,22 @@ Player MMR Distribution
",
)]
pub(super) async fn mmr_distribution(
rate_limit_key: RateLimitKey,
State(state): State<AppState>,
Query(query): Query<MMRDistributionQuery>,
) -> APIResult<impl IntoResponse> {
state
.rate_limit_client
.apply_limits(
&rate_limit_key,
"mmr",
&[
Quota::ip_limit(10, core::time::Duration::from_secs(10)),
Quota::key_limit(10, core::time::Duration::from_secs(10)),
Quota::global_limit(20, core::time::Duration::from_secs(10)),
],
)
.await?;
let query = build_mmr_query(&query);
debug!(?query);
Ok(state
Expand Down Expand Up @@ -209,8 +224,21 @@ Player Hero MMR Distribution
pub(super) async fn hero_mmr_distribution(
Path(HeroMMRPath { hero_id }): Path<HeroMMRPath>,
Query(query): Query<MMRDistributionQuery>,
rate_limit_key: RateLimitKey,
State(state): State<AppState>,
) -> APIResult<impl IntoResponse> {
state
.rate_limit_client
.apply_limits(
&rate_limit_key,
"mmr",
&[
Quota::ip_limit(10, core::time::Duration::from_secs(10)),
Quota::key_limit(10, core::time::Duration::from_secs(10)),
Quota::global_limit(20, core::time::Duration::from_secs(10)),
],
)
.await?;
let query = build_hero_mmr_distribution_query(hero_id, &query);
debug!(?query);
Ok(state
Expand Down
28 changes: 28 additions & 0 deletions src/routes/v1/players/mmr/mmr_history.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ use utoipa::{IntoParams, ToSchema};

use crate::context::AppState;
use crate::error::{APIError, APIResult};
use crate::services::rate_limiter::Quota;
use crate::services::rate_limiter::extractor::RateLimitKey;
use crate::utils::parse::parse_steam_id;
use crate::utils::types::AccountIdQuery;

Expand Down Expand Up @@ -165,8 +167,21 @@ async fn get_hero_mmr_history(
)]
pub(super) async fn mmr_history(
Path(AccountIdQuery { account_id }): Path<AccountIdQuery>,
rate_limit_key: RateLimitKey,
State(state): State<AppState>,
) -> APIResult<impl IntoResponse> {
state
.rate_limit_client
.apply_limits(
&rate_limit_key,
"mmr",
&[
Quota::ip_limit(10, core::time::Duration::from_secs(10)),
Quota::key_limit(10, core::time::Duration::from_secs(10)),
Quota::global_limit(20, core::time::Duration::from_secs(10)),
],
)
.await?;
if state
.steam_client
.is_user_protected(&state.pg_client, account_id)
Expand Down Expand Up @@ -197,8 +212,21 @@ pub(super) async fn hero_mmr_history(
account_id,
hero_id,
}): Path<HeroMMRHistoryPath>,
rate_limit_key: RateLimitKey,
State(state): State<AppState>,
) -> APIResult<impl IntoResponse> {
state
.rate_limit_client
.apply_limits(
&rate_limit_key,
"mmr",
&[
Quota::ip_limit(10, core::time::Duration::from_secs(10)),
Quota::key_limit(10, core::time::Duration::from_secs(10)),
Quota::global_limit(20, core::time::Duration::from_secs(10)),
],
)
.await?;
if state
.steam_client
.is_user_protected(&state.pg_client, account_id)
Expand Down
6 changes: 3 additions & 3 deletions src/routes/v1/players/mmr/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ This is how we calculate a player MMR.
### Rate Limits:
| Type | Limit |
| ---- | ----- |
| IP | 100req/s |
| Key | - |
| Global | - |
| IP | 10req/10s |
| Key | 10req/10s |
| Global | 20req/10s |
"
)))]
struct ApiDoc;
Expand Down
Loading