From 1a66cab4357516b21af3cc95cbf3f427ab88c52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Mon, 27 Nov 2023 11:59:02 -0600 Subject: [PATCH 1/5] feat: change name to have "Ratings" in the front --- .github/workflows/cd-ratings-asia.yml | 2 +- .github/workflows/cd-ratings-eu.yml | 2 +- .github/workflows/cd-ratings-na.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-ratings-asia.yml b/.github/workflows/cd-ratings-asia.yml index 6135fc719..1c237bcb2 100644 --- a/.github/workflows/cd-ratings-asia.yml +++ b/.github/workflows/cd-ratings-asia.yml @@ -1,4 +1,4 @@ -name: CD Asia Ratings +name: CD Ratings Asia # latest: '0 0 * * *' # asia midnight: '0 17 * * *' diff --git a/.github/workflows/cd-ratings-eu.yml b/.github/workflows/cd-ratings-eu.yml index b0f0d0a78..1f699cfa4 100644 --- a/.github/workflows/cd-ratings-eu.yml +++ b/.github/workflows/cd-ratings-eu.yml @@ -1,4 +1,4 @@ -name: CD Europe Ratings +name: CD Ratings Europe # latest: '0 0 * * *' # eu midnight: '0 23 * * *' diff --git a/.github/workflows/cd-ratings-na.yml b/.github/workflows/cd-ratings-na.yml index 8c91f1600..89b801ce0 100644 --- a/.github/workflows/cd-ratings-na.yml +++ b/.github/workflows/cd-ratings-na.yml @@ -1,4 +1,4 @@ -name: CD North America Ratings +name: CD Ratings North America # latest: '0 0 * * *' # na midnight: '0 5 * * *' From 338a2a14bf1a56eb823ff3754cef98c280dfd522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:00:19 -0600 Subject: [PATCH 2/5] fix: continue after no player found --- scripts/buildRatingsLeaderboard.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/buildRatingsLeaderboard.ts b/scripts/buildRatingsLeaderboard.ts index a84929c02..d6ec1ba1f 100644 --- a/scripts/buildRatingsLeaderboard.ts +++ b/scripts/buildRatingsLeaderboard.ts @@ -101,7 +101,10 @@ await Promise.all([ console.log('Converting to an array...'); for (let index = 0; index < PLAYERS; index++) { const listing = players[index + 1]; - if (!listing) console.warn(`Position ${index + 1} had no player`); + if (!listing) { + console.warn(`Position ${index + 1} had no player`); + continue; + } leaderboard[index] = { id: listing.spa_id, From aae26523ffb7afe41ef08fe4f65a3dccbb8a4fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:01:32 -0600 Subject: [PATCH 3/5] feat: renamed blitzkrieg-db to blitzkrieg-assets --- scripts/buildRatingsLeaderboard.ts | 2 +- src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts | 2 +- src/core/blitzkrieg/getArchivedRatingsInfo.ts | 2 +- src/core/blitzkrieg/getArchivedRatingsLeaderboard.ts | 2 +- src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/buildRatingsLeaderboard.ts b/scripts/buildRatingsLeaderboard.ts index d6ec1ba1f..fe27a6ac2 100644 --- a/scripts/buildRatingsLeaderboard.ts +++ b/scripts/buildRatingsLeaderboard.ts @@ -130,7 +130,7 @@ if (publish) { commitMultipleFiles( octokit, 'tresabhi', - 'blitzkrieg-db', + 'blitzkrieg-assets', 'main', new Date().toString(), [ diff --git a/src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts b/src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts index 8d508e0e1..d5688089f 100644 --- a/src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts +++ b/src/core/blitzkrieg/getArchivedLatestSeasonNumber.ts @@ -8,7 +8,7 @@ export async function getArchivedLatestSeasonNumber() { if (ratingsInfo.detail) { const comURL = ( (await fetch( - 'https://api.github.com/repos/tresabhi/blitzkrieg-db/git/trees/main', + 'https://api.github.com/repos/tresabhi/blitzkrieg-assets/git/trees/main', ).then((response) => response.json())) as { tree: { path: string; url: string }[]; } diff --git a/src/core/blitzkrieg/getArchivedRatingsInfo.ts b/src/core/blitzkrieg/getArchivedRatingsInfo.ts index e08b9793a..a69af3b7d 100644 --- a/src/core/blitzkrieg/getArchivedRatingsInfo.ts +++ b/src/core/blitzkrieg/getArchivedRatingsInfo.ts @@ -24,7 +24,7 @@ export default async function getArchivedRatingsInfo( } const response = await fetch( - `https://raw.githubusercontent.com/tresabhi/blitzkrieg-db/main/${region}/ratings/${season}/info.json`, + `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/${region}/ratings/${season}/info.json`, ); const jsonContent = (await response.json()) as RatingsInfo & { detail: undefined; diff --git a/src/core/blitzkrieg/getArchivedRatingsLeaderboard.ts b/src/core/blitzkrieg/getArchivedRatingsLeaderboard.ts index 29e59e56e..f116ea00f 100644 --- a/src/core/blitzkrieg/getArchivedRatingsLeaderboard.ts +++ b/src/core/blitzkrieg/getArchivedRatingsLeaderboard.ts @@ -19,7 +19,7 @@ export async function getArchivedRatingsLeaderboard( } const response = await fetch( - `https://raw.githubusercontent.com/tresabhi/blitzkrieg-db/main/${region}/ratings/${season}/latest.json`, + `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/${region}/ratings/${season}/latest.json`, ); const json = (await response.json()) as BlitzkriegRatingsLeaderboard; LEADERBOARD_CACHE[region][season] = json; diff --git a/src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts b/src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts index 85c7029b0..f656d23c0 100644 --- a/src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts +++ b/src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts @@ -1,7 +1,7 @@ import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard'; import { Region } from '../../constants/regions'; -export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-db' }; +export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-assets' }; const MIDNIGHT_LEADERBOARD_CACHE: Record< Region, @@ -22,7 +22,7 @@ export default async function getArchivedRatingsMidnightLeaderboard( try { const response = await fetch( - `https://raw.githubusercontent.com/tresabhi/blitzkrieg-db/main/${region}/ratings/${season}/midnight.json`, + `https://raw.githubusercontent.com/tresabhi/blitzkrieg-assets/main/${region}/ratings/${season}/midnight.json`, ); const json = (await response.json()) as BlitzkriegRatingsLeaderboard; MIDNIGHT_LEADERBOARD_CACHE[region][season] = json; From 9d3d74c7c5e9992808242f5a11e7d83624c26885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:03:17 -0600 Subject: [PATCH 4/5] feat: change ratings root dir to "ratings" --- scripts/buildRatingsLeaderboard.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/buildRatingsLeaderboard.ts b/scripts/buildRatingsLeaderboard.ts index fe27a6ac2..cedf7e465 100644 --- a/scripts/buildRatingsLeaderboard.ts +++ b/scripts/buildRatingsLeaderboard.ts @@ -116,14 +116,12 @@ const leaderboardJSON = JSON.stringify(leaderboard); if (publish) { const octokit = new Octokit({ auth: env.GH_TOKEN }); - const info = await patientFetchJSON( `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`, ); const normalizedServer = server === 'na' ? 'com' : server; - - const infoPath = `${normalizedServer}/ratings/${info.current_season}/info.json`; - const leaderboardPath = `${normalizedServer}/ratings/${info.current_season}/${target}.json`; + const infoPath = `regions/${normalizedServer}/ratings/${info.current_season}/info.json`; + const leaderboardPath = `regions/${normalizedServer}/ratings/${info.current_season}/${target}.json`; const infoJSON = JSON.stringify(info); console.log(`Publishing to season ${info.current_season}...`); From ba9f593716b242bb6569b2ba8cb17f17f5d1f3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:06:00 -0600 Subject: [PATCH 5/5] feat: changelogs --- docs/changelogs/1.15.4.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 docs/changelogs/1.15.4.md diff --git a/docs/changelogs/1.15.4.md b/docs/changelogs/1.15.4.md new file mode 100644 index 000000000..b1bfa06dd --- /dev/null +++ b/docs/changelogs/1.15.4.md @@ -0,0 +1,13 @@ +# Blitzkrieg 1.15.4 + +Unlocking future potential + +## Technical Changes + +- Moved the word "Ratings" to the front of the workflow name +- Renamed `blitzkrieg-db` to `blitzkrieg-assets` +- Moved the region folders from the root to `regions` + +## Technical Fixes + +- The ratings leaderboard archiver now correctly skips undefined players