Compare commits

..
55 Commits
Author SHA1 Message Date
TrèsAbhi 8478930f2e Merge branch 'main' into ue4 2025-08-15 12:40:17 -05:00
TrèsAbhi 6a74451740 feat: some udpates 2025-08-15 12:38:00 -05:00
TrèsAbhi 09f5d4e3f7 feat: copy base64 2025-06-12 20:52:06 -05:00
TrèsAbhi 0365656a0e fix: old proxy 2025-06-12 20:44:39 -05:00
TrèsAbhi 90a46eeffa feat: update protos 2025-06-12 20:43:26 -05:00
TrèsAbhi 1249877a8c feat: log bytes 2025-06-12 20:41:56 -05:00
TrèsAbhi 02df1e59d8 feat: code diff 2025-06-12 20:29:55 -05:00
TrèsAbhi edce64c1bd feat: dev tools 2025-06-12 17:48:43 -05:00
TrèsAbhi 74b821ac13 feat: ini accessor (needs work) 2025-06-10 13:53:30 -05:00
TrèsAbhi a5a72f9536 feat: some more ffi communication 2025-06-10 13:16:14 -05:00
TrèsAbhi fe3d029e74 feat: ffi 2025-06-09 20:19:13 -05:00
TrèsAbhi a69ea38947 feat: internals 2025-06-09 18:17:08 -05:00
TrèsAbhi bc9f7054e1 Merge branch 'main' into ue4 2025-06-08 19:38:46 -05:00
TrèsAbhi 53c2f9605f Merge branch 'main' into ue4 2025-06-08 12:19:04 -05:00
TrèsAbhi 95f67a04d7 Merge branch 'main' into ue4 2025-06-05 14:25:23 -05:00
TrèsAbhi 1e6ee2b80d feat: complete proxy client 2025-06-05 14:20:20 -05:00
TrèsAbhi 6a21c9aaac feat: docs 2025-06-05 12:42:40 -05:00
TrèsAbhi 7e11c1e5ce feat: api 2025-06-03 20:31:53 -05:00
TrèsAbhi 2dc4f12246 feat: download 2025-06-03 14:00:53 -05:00
TrèsAbhi 354aca5057 feat: skeletons 2025-06-02 13:21:49 -05:00
TrèsAbhi c5f156eecc feat: simplify tool card 2025-06-02 12:54:57 -05:00
TrèsAbhi 37b89d1f2d feat: remove debug 2025-06-01 20:53:37 -05:00
TrèsAbhi 74c358dde5 feat: node v22 2025-06-01 20:51:48 -05:00
TrèsAbhi 4362746de3 feat: node 2025-06-01 20:50:28 -05:00
TrèsAbhi d5d97e772a feat: versions 2025-06-01 20:48:59 -05:00
TrèsAbhi 654c87dae7 feat: versions 2025-06-01 20:47:35 -05:00
TrèsAbhi e94f8a7cd2 feat: use bun setup v2 2025-06-01 20:44:19 -05:00
TrèsAbhi d39ffecb3b feat: log env 2025-06-01 20:37:33 -05:00
TrèsAbhi 6f8e12657c fix: quotation escape 2025-05-31 18:41:15 -05:00
TrèsAbhi 4a79f98f3f feat: popup 2025-05-31 18:21:57 -05:00
TrèsAbhi 06de86c5a6 feat: homepage announcement 2025-05-31 18:21:49 -05:00
TrèsAbhi 37ba6d37d4 feat: back to ubuntu 2025-05-31 12:16:33 -05:00
TrèsAbhi 636add3a18 feat: use windows? 2025-05-31 12:13:28 -05:00
TrèsAbhi 2e13bcfee2 feat: remote strings 2025-05-31 12:07:52 -05:00
TrèsAbhi af53713c60 feat: remove prisma usage 2025-05-31 11:56:35 -05:00
TrèsAbhi c37820d2cd fix: github token 2025-05-31 11:54:48 -05:00
TrèsAbhi d51b6bdd18 fix: github token 2025-05-31 11:49:22 -05:00
TrèsAbhi 67ce4815df feat: workflow 2025-05-31 11:47:30 -05:00
TrèsAbhi 8c14c3d093 feat: prep builder 2025-05-31 11:45:00 -05:00
TrèsAbhi 8373fb1b7a feat: dialog 2025-05-30 20:30:16 -05:00
TrèsAbhi 3aafe4d9f1 feat: code split 2025-05-30 15:06:44 -05:00
TrèsAbhi 2c2c3687c7 feat: rename to avatars 2025-05-30 14:50:11 -05:00
TrèsAbhi 9375f134db feat: stacking 2025-05-30 14:09:30 -05:00
TrèsAbhi 1eca71d28c feat: game strings context 2025-05-29 20:22:13 -05:00
TrèsAbhi 9bf1554c30 fix: code split correctly 2025-05-29 19:28:58 -05:00
TrèsAbhi f48c5d246d feat: remote and socket metadata and gallery 2025-05-29 19:20:28 -05:00
TrèsAbhi 5e9aa99755 feat: remote catalog 2025-05-28 18:32:04 -05:00
TrèsAbhi e7386ff766 feat: remove ds 2025-05-28 11:48:40 -05:00
TrèsAbhi 4129a1964f feat: home page 2025-05-28 11:28:22 -05:00
TrèsAbhi 64d12bba8b feat: simplify tools 2025-05-28 10:42:09 -05:00
TrèsAbhi 69b13fd33a feat: custom components 2025-05-27 12:39:04 -05:00
TrèsAbhi bc6bb4f10e feat: 404 page 2025-05-26 20:07:33 -05:00
TrèsAbhi 5adf90bab2 feat: cleanup 2025-05-26 19:04:58 -05:00
TrèsAbhi bc8cfc9897 feat: start new website 2025-05-26 18:39:01 -05:00
TrèsAbhi 9037e2caff feat: update to latest 2025-05-26 18:30:45 -05:00
657 changed files with 17234 additions and 23110 deletions

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
{
"indentSize": 2
}
-81
View File
@@ -1,81 +0,0 @@
name: Assets
on:
push:
branches: main
workflow_dispatch:
inputs:
asset_repo:
type: choice
required: false
description: What asset repo to write to
options:
- blitzkit/assets
- blitzkit/assets-preview
- blitzkit/assets-dev
default: blitzkit/assets
archive_url:
type: string
required: false
description: Archive URL to download instead of Steam client
schedule:
- cron: "0 2 * * *"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.asset_repo }}
cancel-in-progress: true
env:
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
WOTB_DLC_CDN: ${{ secrets.WOTB_DLC_CDN }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_REPO: ${{ github.event.inputs.asset_repo != '' && github.event.inputs.asset_repo || secrets.PUBLIC_ASSET_REPO }}
PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: true
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
PUBLIC_PATREON_CLIENT_ID: ${{ secrets.PUBLIC_PATREON_CLIENT_ID }}
PUBLIC_PATREON_REDIRECT_URI: ${{ secrets.PUBLIC_PATREON_REDIRECT_URI }}
PATREON_CLIENT_SECRET: ${{ secrets.PATREON_CLIENT_SECRET }}
PUBLIC_NITROPAY_ID: ${{ secrets.PUBLIC_NITROPAY_ID }}
PUBLIC_DEBUG_MISSING_I18N: false
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_FAST_USER: blitzkit
PUBLIC_ASSET_FAST_REPO: assets
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
jobs:
build_assets:
name: Build assets
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1
- run: bun run setup
- name: AppArmor hack
run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
- name: Build assets
run: bun run build:assets --all-targets --manual
-54
View File
@@ -1,54 +0,0 @@
name: Averages
on:
workflow_dispatch:
schedule:
- cron: "0 8 * * *"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Build averages
env:
PUBLIC_ASSET_BRANCH: main
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
run: bun run build:averages --production
+7 -8
View File
@@ -1,4 +1,4 @@
name: Bot name: Build Bot
on: on:
push: push:
@@ -15,14 +15,13 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1 - uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3
with: - name: Install dependencies
repo-token: ${{ secrets.GH_TOKEN }} run: bun install
- run: bun run setup
- name: Build Prisma
run: bun run build:prisma
- name: Build bot - name: Build bot
run: bun run build:bot run: bun run build:bot
-36
View File
@@ -1,36 +0,0 @@
name: IDs
on:
workflow_dispatch:
schedule:
- cron: "0 0 * * 1"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Discover IDs
run: bun build:ids --production
+4 -19
View File
@@ -1,10 +1,10 @@
name: Host name: Host Bot
on: on:
push: push:
branches: main branches: main
schedule: schedule:
- cron: "0 */5 * * *" - cron: '0 */5 * * *'
workflow_dispatch: workflow_dispatch:
release: release:
types: [created, published, released, edited] types: [created, published, released, edited]
@@ -22,20 +22,6 @@ env:
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }} PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }} PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }} PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
SERVICING: ${{ secrets.SERVICING }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs: jobs:
host: host:
@@ -43,9 +29,8 @@ jobs:
steps: steps:
- uses: oven-sh/setup-bun@v1 - uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3 # with:
with: # bun-version: 1.1.33
repo-token: ${{ secrets.GH_TOKEN }}
- name: Download release assets - name: Download release assets
run: | run: |
-46
View File
@@ -1,46 +0,0 @@
name: Rating Asia
on:
workflow_dispatch:
schedule:
- cron: "0 17 * * *"
env:
PUBLIC_ASSET_BRANCH: main
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Generate leaderboard
run: bun build:ratingleaderboard --region=asia
-46
View File
@@ -1,46 +0,0 @@
name: Rating Europe
on:
workflow_dispatch:
schedule:
- cron: "0 23 * * *"
env:
PUBLIC_ASSET_BRANCH: main
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Generate leaderboard
run: bun build:ratingleaderboard --region=eu
-46
View File
@@ -1,46 +0,0 @@
name: Rating North America
on:
workflow_dispatch:
schedule:
- cron: "0 5 * * *"
env:
PUBLIC_ASSET_BRANCH: main
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Generate leaderboard
run: bun build:ratingleaderboard --region=com
+6 -7
View File
@@ -11,13 +11,12 @@ concurrency:
env: env:
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }} DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }} PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }} PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }} PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
jobs: jobs:
build: build:
@@ -28,11 +27,11 @@ jobs:
with: with:
submodules: recursive submodules: recursive
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1 - uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3
with: - name: Install dependencies
repo-token: ${{ secrets.GH_TOKEN }} run: bun install
- run: bun run setup
- name: Find reviews - name: Find reviews
run: bun run build:reviews run: bun packages/scripts/src/reviews.ts
+24 -25
View File
@@ -5,7 +5,7 @@ on:
workflow_dispatch: workflow_dispatch:
schedule: schedule:
- cron: "0 4 * * *" - cron: '0 4 * * *'
permissions: permissions:
contents: read contents: read
@@ -17,37 +17,37 @@ concurrency:
cancel-in-progress: ${{ github.ref == 'refs/heads/main' }} cancel-in-progress: ${{ github.ref == 'refs/heads/main' }}
env: env:
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }} AUTO_PROXY_ORIGIN: ${{ secrets.AUTO_PROXY_ORIGIN }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
SERVICING: ${{ secrets.SERVICING }}
GH_TOKEN: ${{ secrets.GH_TOKEN }} GH_TOKEN: ${{ secrets.GH_TOKEN }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
jobs: jobs:
build: build:
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - name: Checkout
uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v1
- uses: arduino/setup-protoc@v3 - name: Setup Bun
uses: oven-sh/setup-bun@v2
with: with:
repo-token: ${{ secrets.GH_TOKEN }} bun-version: latest
- uses: actions/configure-pages@v5
- run: bun run setup - name: Setup Node
uses: actions/setup-node@v4
with:
node-version: latest
- name: Configure pages
uses: actions/configure-pages@v5
- name: Install dependencies
run: bun install
- name: Build website - name: Build website
run: bun run build:website run: bun run build:website
@@ -58,13 +58,12 @@ jobs:
path: dist/website path: dist/website
deploy-github-pages: deploy-github-pages:
if: ${{ github.ref == 'refs/heads/main' }}
name: Deploy to GitHub Pages name: Deploy to GitHub Pages
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: build needs: build
environment: if: >
name: Production (github.repository == 'tresabhi/blitzkit' && github.ref == 'refs/heads/main') ||
url: ${{ steps.deployment.outputs.page_url }} (github.repository == 'blitzkit/host-redux' && github.ref == 'refs/heads/ue4')
steps: steps:
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
+224 -26
View File
@@ -22,34 +22,232 @@ depots
public/sitemap* public/sitemap*
/firebase.json /firebase.json
target target
# packages/core/src/protos/*.ts
/.vercel /.vercel
.astro /.astro
.vercel .vercel
/src
/packages/bot/src/prisma /packages/bot/src/prisma
dev-dist
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules *.rsuser
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo *.suo
*.ntvs* *.user
*.njsproj *.userosscache
*.sln *.sln.docstates
*.sw? *.userprefs
mono_crash.*
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
[Aa][Rr][Mm]64[Ee][Cc]/
bld/
[Bb]in/
[Oo]bj/
[Oo]ut/
[Ll]og/
[Ll]ogs/
.vs/
Generated\ Files/
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
*.VisualState.xml
TestResult.xml
nunit-*.xml
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
BenchmarkDotNet.Artifacts/
project.lock.json
project.fragment.lock.json
artifacts/
ScaffoldingReadMe.txt
StyleCopReport.xml
*_i.c
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.idb
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
!Directory.Build.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
_Chutzpah*
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
*.psess
*.vsp
*.vspx
*.sap
*.e2e
$tf/
*.gpState
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
_TeamCity*
*.dotCover
.axoCover/*
!.axoCover/settings.json
coverage*.json
coverage*.xml
coverage*.info
*.coverage
*.coveragexml
_NCrunch_*
.NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
*.mm.*
AutoTest.Net/
.sass-cache/
[Ee]xpress/
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
publish/
*.[Pp]ublish.xml
*.azurePubxml
*.pubxml
*.publishproj
PublishScripts/
*.nupkg
*.snupkg
*.nuget.props
*.nuget.targets
csx/
*.build.csdef
ecf/
rcf/
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
*.[Cc]ache
!?*.[Cc]ache/
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
Generated_Code/
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
*.mdf
*.ldf
*.ndf
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
FakesAssemblies/
*.GhostDoc.xml
.ntvs_analysis.dat
node_modules/
*.plg
*.opt
*.vbw
*.vbp
*.dsw
*.dsp
*.ncb
*.aps
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
.paket/paket.exe
paket-files/
.fake/
.cr/personal
__pycache__/
*.pyc
*.tss
*.jmconfig
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
OpenCover/
ASALocalRun/
*.binlog
.aws-sam
*.nvuser
.mfractor/
.localhistory/
.vshistory/
healthchecksdb
MigrationBackup/
.ionide/
FodyWeavers.xsd
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
.history/
*.cab
*.msi
*.msix
*.msm
*.msp
*.sln.iml
+9 -3
View File
@@ -1,3 +1,9 @@
[submodule "packages/closed"] [submodule "submodules/blitzkit-closed"]
path = packages/closed path = submodules/blitzkit-closed
url = https://github.com/blitzkit/closed.git url = https://github.com/tresabhi/blitzkit-closed
[submodule "submodules/CUE4Parse"]
path = submodules/CUE4Parse
url = https://github.com/FabianFG/CUE4Parse
[submodule "submodules/blitzkit-internal"]
path = submodules/blitzkit-internal
url = https://github.com/blitzkit/internal
+7
View File
@@ -0,0 +1,7 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 80
}
+12 -26
View File
@@ -11,7 +11,6 @@
"analyticsreporting", "analyticsreporting",
"APAC", "APAC",
"apcr", "apcr",
"appinfo",
"applypatches", "applypatches",
"artefacts", "artefacts",
"astrojs", "astrojs",
@@ -22,7 +21,6 @@
"AYUV", "AYUV",
"battleresults", "battleresults",
"bbox", "bbox",
"beforeinstallprompt",
"bepaint", "bepaint",
"betakrieg", "betakrieg",
"BINORMAL", "BINORMAL",
@@ -35,14 +33,12 @@
"blitzkit", "blitzkit",
"blitzrinth", "blitzrinth",
"blitzstars", "blitzstars",
"bufbuild",
"cacheable", "cacheable",
"Callouts", "Callouts",
"Camo", "Camo",
"Carro", "Carro",
"CCPAOPTOUT", "CCPAOPTOUT",
"CDON", "CDON",
"clanid",
"classname", "classname",
"cleandist", "cleandist",
"closedkrieg", "closedkrieg",
@@ -55,6 +51,7 @@
"CUBEMAP", "CUBEMAP",
"CUBETEXCOORD", "CUBETEXCOORD",
"customperiod", "customperiod",
"Datacard",
"datasource", "datasource",
"Dava", "Dava",
"dbid", "dbid",
@@ -65,40 +62,34 @@
"deburr", "deburr",
"decalmask", "decalmask",
"decompressor", "decompressor",
"dedup",
"defence", "defence",
"degressive", "degressive",
"depotdownloader",
"devkrieg", "devkrieg",
"diacriticless", "diacriticless",
"DIDS", "DIDS",
"donotremove", "donotremove",
"drei", "drei",
"dsapp",
"dvpd", "dvpd",
"dvpl", "dvpl",
"DVPLCRC", "DVPLCRC",
"dvpm", "dvpm",
"dxgi", "dxgi",
"easimon",
"echarts", "echarts",
"Everytime", "Everytime",
"FASTNAME", "FASTNAME",
"favicons",
"flexdirection", "flexdirection",
"fontsource",
"FOURCC", "FOURCC",
"frameloop", "frameloop",
"fsformat", "fsformat",
"Fullscreen", "Fullscreen",
"fullstats", "fullstats",
"fuzzysort", "fuzzysort",
"gamemode",
"gameplay", "gameplay",
"glsl", "glsl",
"GLTF", "GLTF",
"gtag", "gtag",
"haha", "haha",
"Herdbreaker",
"highp", "highp",
"iife", "iife",
"imgur", "imgur",
@@ -112,7 +103,6 @@
"leaderboards", "leaderboards",
"lerp", "lerp",
"LINEARSIZE", "LINEARSIZE",
"linktarget",
"lmao", "lmao",
"loadouts", "loadouts",
"loddist", "loddist",
@@ -135,24 +125,22 @@
"NEGATIVEX", "NEGATIVEX",
"NEGATIVEY", "NEGATIVEY",
"NEGATIVEZ", "NEGATIVEZ",
"networkidle",
"NITROPAY", "NITROPAY",
"nivo", "nivo",
"nmatname", "nmatname",
"noout", "noout",
"normalmap", "normalmap",
"oneof", "oneof",
"oodle",
"oopsies", "oopsies",
"Oopsy", "Oopsy",
"opentest", "opentest",
"OPTML", "OPTML",
"otemp",
"outdir", "outdir",
"outfile", "outfile",
"ownedtanks", "ownedtanks",
"padder", "padder",
"partytown", "partytown",
"patchnotes",
"PIXELFORMAT", "PIXELFORMAT",
"playerachievements", "playerachievements",
"playerinfo", "playerinfo",
@@ -165,15 +153,10 @@
"Promisable", "Promisable",
"proto", "proto",
"protobuf", "protobuf",
"protoc",
"protos", "protos",
"proxyclient",
"prunestrings",
"Pyogenics", "Pyogenics",
"ratingleaderboard", "ratingleaderboard",
"raycaster", "raycaster",
"Redirector",
"Relogin",
"researchable", "researchable",
"Resvg", "Resvg",
"rizz", "rizz",
@@ -187,7 +170,6 @@
"searchtanks", "searchtanks",
"SHAREDEXP", "SHAREDEXP",
"SKLLD", "SKLLD",
"smoothstep",
"Smri", "Smri",
"Specularity", "Specularity",
"SSAO", "SSAO",
@@ -207,7 +189,6 @@
"tankopedia", "tankopedia",
"tankopedias", "tankopedias",
"tankstats", "tankstats",
"tauri",
"texconv", "texconv",
"TEXCOORD", "TEXCOORD",
"tresabhi", "tresabhi",
@@ -215,6 +196,8 @@
"Turretless", "Turretless",
"TYPELESS", "TYPELESS",
"ubjson", "ubjson",
"Uncompiled",
"undiscriminated",
"Unicum", "Unicum",
"UNLOCALIZED", "UNLOCALIZED",
"UNORM", "UNORM",
@@ -222,14 +205,12 @@
"Unregistering", "Unregistering",
"unrotate", "unrotate",
"unwrapper", "unwrapper",
"userns",
"vercel", "vercel",
"vickers", "vickers",
"vitepress", "vitepress",
"Vovko", "Vovko",
"wargaming", "wargaming",
"webp", "webp",
"wgpkg",
"whitespaces", "whitespaces",
"WHSS", "WHSS",
"winrate", "winrate",
@@ -246,7 +227,12 @@
"yolo", "yolo",
"youtuber", "youtuber",
"youtubers", "youtubers",
"zoomable" "zustand"
], ],
"typescript.tsdk": "node_modules\\typescript\\lib" "deno.enable": false,
"deno.unstable": false,
"cSpell.enableFiletypes": ["glsl", "proto3"],
"typescript.tsdk": "node_modules\\typescript\\lib",
"liveServer.settings.multiRootWorkspaceName": "blitzkit",
"git.ignoreLimitWarning": true
} }
+41
View File
@@ -0,0 +1,41 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/BlitzKit.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/BlitzKit.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/BlitzKit.sln"
],
"problemMatcher": "$msCompile"
}
]
}
+27
View File
@@ -0,0 +1,27 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F23F76D4-C350-4BBA-9DF1-E67C5CD391B1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlitzKit.FFI", "src\BlitzKit.FFI\BlitzKit.FFI.csproj", "{8E798C66-C863-4A67-87EA-853109EEE037}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8E798C66-C863-4A67-87EA-853109EEE037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E798C66-C863-4A67-87EA-853109EEE037}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E798C66-C863-4A67-87EA-853109EEE037}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E798C66-C863-4A67-87EA-853109EEE037}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8E798C66-C863-4A67-87EA-853109EEE037} = {F23F76D4-C350-4BBA-9DF1-E67C5CD391B1}
EndGlobalSection
EndGlobal
+14 -39
View File
@@ -1,47 +1,22 @@
# BlitzKit ## BlitzKit
Tools for everything and anything, World of Tanks Blitz. Your premier source for all things Blitz.
This GitHub repository contains the code for BlitzKit and all its services. If you are here, looking to use BlitzKit, go to https://blitzkit.app/. ### https://blitzkit.app/
If you intend to contribute to the code, note that you may need to check out sensitive, closed-source submodules to locally develop certain aspects of BlitzKit. Communicate with `@tresabhi` on Discord to get started or discuss sensitive content, such as environment variables or submodules. ![BlitzKit website](https://i.imgur.com/KaxUxmt.png)
## Packages ## Invite the bot
| Package | Title | Source | Memo | Go to [application directory for BlitzKit](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
| ------------------------------------ | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------ |
| [packages/app](packages/app) | BlitzKit | [Play Store](https://play.google.com/store/apps/details?id=com.tresabhi.blitzkit), [App Store](https://apps.apple.com/app/4321), [Microsoft Store](https://apps.microsoft.com/detail/zyxw) | The native app of BlitzKit for all platforms. Unavailable from stores at this time. |
| [packages/bot](packages/bot) | BlitzKit Discord Bot | [Discord Application Directory](https://discord.com/discovery/applications/1097673957865443370) | The one-in-all Discord bot for statistics. |
| [packages/core](packages/core) | | | Mutual internal code shared between all other packages. |
| [packages/i18n](packages/i18n) | | [Crowdin](https://crowdin.com/project/blitzkrieg) | Translations served as JSON shared across all other packages, including some utility code. |
| [packages/scripts](packages/scripts) | | | CLI utilities for the development and deployment of BlitzKit services. |
| [packages/varuna](packages/varuna) | Varuna | [NPM](https://www.npmjs.com/package/varuna) | React and Astro-oriented state management library, awaiting separation from BlitzKit. Unavailable from NPM at this time. |
| [packages/website](packages/website) | BlitzKit | https://blitzkit.app | The BlitzKit website provides a wide range of tools, APIs, and interconnects all other services. |
## Submodules ![BlitzKit application directory](https://i.imgur.com/YWCtOuJ.png)
| Submodule | Title | Source | Memo | ## Naming Guide
| ------------------------------------------------------ | --------- | ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [submodules/blitzkit-closed](packages/blitzkit-closed) | ClosedKit | [blitzkit/closed](https://github.com/blitzkit/closed) | Closed source, sensitive code hidden from the public to prevent bad actors from abusing the game. Discuss with `@tresabhi` on Discord for **special permission** to access. |
## Environment Variables | Type | Style | Example |
| --------- | -------------- | ---------------------------------------------------------------- |
| Name | Source | BlitzKit Default | Memo | | In-text | CamelCase | BlitzKit |
| ------------------------------------------------------------- | -------------------------------------------------------------------------------- | ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | | Code | lowerCamelCase | `let blitzkit = { ... }`, `function fetchBlitzkitData() { ... }` |
| `PUBLIC_WARGAMING_APPLICATION_ID` | [Wargaming Developer's Room](https://developers.wargaming.net/) | | Application ID needed to communicate with Wargaming APIs. | | URLs | kebab-case | `https://example.com/blitzkit/` |
| `PUBLIC_PROMOTE_OPENTEST` | | `false` | Optional boolean dictating whether the website advertises [the opentest subdomain of BlitzKit](https://opentest.blitzkit.app/). | | Constants | SNAKE_CASE | `const BLITZKIT_VERSION = "1.0.0"` |
| `ALLOW_ROBOTS` | | `true` | Toggles between `Allow: /` and `Disallow: /` in the website's `/robots.txt`. This is usually `false` for all BlitzKit's subdomains. |
| `WOTB_GLOSSARY`, `WOTB_GLOSSARY_DOMAIN`, `WOTB_GLOSSARY_PATH` | | | |
| `PUBLIC_GOOGLE_TAG_MANAGER_ID` | [Google Tag Manager](https://tagmanager.google.com/) | `G-GL2JVHCGPQ` | Google Tag Manager's unique identifier for analytical purposes. |
| `PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID` | [Google Analytics](https://analytics.google.com/) | `430711767` | Google Analytics' unique property ID for [BlitzKit's apex domain](https://blitzkit.app/) and subdomains. |
| `GOOGLE_APPLICATION_CREDENTIALS` | [Google Cloud](https://cloud.google.com/) | | Google Cloud's API key, primarily used for ranking popular tanks and finding relevant tank review videos in Tankopedia. |
| `PUBLIC_DISCORD_SERVER_ID` | [BlitzKit Discord Server](https://discord.gg/nDt7AjGJQH) | `734786591205359697` | BlitzKit Discord Server's id. |
| `PUBLIC_ASSET_BASE` | [blitzkit/assets](https://github.com/blitzkit/assets) | `https://blitzkit.github.io/assets` | The root domain and path that serves the external assets like tank models and icons. |
| `PUBLIC_BRANCH` | | `main` | The branch that the website is operating on. This is completely nominal. |
| `PUBLIC_GUIDE_WEBSITE` | [GuidesBlitz](https://guidesblitz.com/) | `https://guidesblitz.com` | The website that serves the encyclopedia-like content in BlitzKit. |
| `SERVICING` | | `false` | Wether the website is down for servicing. |
| `DISCORD_CLIENT_ID` | [Discord Developer Portal](https://discord.com/developers/applications) | `1097673957865443370` | The BlitzKit Discord Bot's user ID. |
| `GH_TOKEN` | [GitHub Fine-Grained Tokens](https://github.com/settings/personal-access-tokens) | | The GitHub API key used for checking out private submodules and pushing content to the asset repository. |
| `DISCORD_TOKEN` | [Discord Developer Portal](https://discord.com/developers/applications) | | The Discord API Key for the BlitzKit Discord Bot. |
| `DATABASE_URL` | [CockroachDB](https://www.cockroachlabs.com/) | | The CockroachDB-SQL database URL used to link Wargaming and Discord users. |
| `WOTB_DLC_CDN` | | | |
+96
View File
@@ -0,0 +1,96 @@
{
"name": "blitzkit",
"private": true,
"version": "1.27.11",
"description": "🎉 Tools for everything World of Tanks Blitz",
"type": "module",
"types": "./types.d.ts",
"workspaces": ["packages/*", "submodules/*"],
"scripts": {
"build:assets": "cd packages/scripts && bun run build:assets",
"build:averages": "bun --filter=@blitzkit/scripts run build:averages",
"build:bot": "cd packages/scripts && bun run build:bot",
"build:website": "bun build:prisma --no-hints && cd packages/website && bun run build",
"build:prisma": "prisma generate",
"build:sitemap": "bun scripts/sitemap.ts",
"build:docs": "vitepress build docs",
"build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
"dev:bot": "bun run build:bot --dev && bun start:bot",
"start:bot": "bun dist/bot/main.js",
"dev:docs": "vitepress dev docs",
"dev:website": "cd packages/website-ue && bun run dev",
"dev:api": "bun --filter=@blitzkit/api run dev",
"setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
"setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
"start:website": "bun --filter=@blitzkit/website run start",
"host:docs": "vitepress preview docs",
"lint": "tsc",
"lint:website": "cd packages/website && bun run lint",
"format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
"update": "yarn upgrade --latest",
"tunnel": "cloudflared tunnel --url http://localhost:3000",
"discoverids": "scripts/discoverIds.ts",
"build:protos": "bun packages/scripts/src/protos.ts",
"preview:website": "cd packages/website && bun run preview",
"build:reviews": "cd packages/scripts && bun build:reviews",
"build:ids": "cd packages/scripts && bun build:ids",
"prunestrings": "cd packages/scripts && bun prunestrings"
},
"license": "MIT",
"dependencies": {
"satori": "^0.10.14",
"@resvg/resvg-js": "^2.6.2",
"discord.js": "^14.16.3",
"bepaint": "^0.1.0-beta.3",
"markdown-escape": "^2.0.0",
"@types/markdown-escape": "^1.1.3",
"@types/adm-zip": "^0.5.5",
"@types/lz4js": "^0.2.1",
"@octokit/plugin-throttling": "^8.2.0",
"@octokit/rest": "^20.1.1",
"@prisma/client": "^6.6.0",
"adm-zip": "^0.5.16",
"crc": "^4.3.2",
"dotenv": "^16.4.5",
"lz4js": "^0.2.0",
"yaml": "^2.5.0",
"ts-deepmerge": "^7.0.2",
"@types/decompress": "^4.2.7",
"@types/progress": "^2.0.7",
"@gltf-transform/core": "^4.0.10",
"@gltf-transform/extensions": "^4.0.10",
"@gltf-transform/functions": "^4.0.10",
"csv-parse": "^5.5.6",
"decompress": "^4.2.1",
"esbuild": "^0.19.12",
"fast-xml-parser": "^4.4.1",
"progress": "^2.0.3",
"puppeteer": "^23.10.4",
"@astrojs/check": "^0.9.4",
"@playform/compress": "^0.1.9",
"@playform/inline": "^0.1.2",
"@types/js-cookie": "^3.0.6",
"astro-compressor": "^1.0.0",
"@fontsource/inter": "^5.2.5",
"@nanostores/persistent": "^0.10.2",
"@nanostores/react": "^0.7.3",
"@nivo/bar": "^0.87.0",
"@nivo/line": "^0.88.0",
"compare-versions": "^6.1.1",
"echarts": "^5.5.1",
"js-cookie": "^3.0.5",
"markdown-to-jsx": "^7.5.0",
"nanostores": "^0.11.3",
"react-device-detect": "^2.2.3",
"react-promise-suspense": "^0.3.4",
"urlon": "^3.1.0",
"@types/bun": "latest",
"@types/node": "^22.14.1",
"prisma": "^6.6.0",
"typescript": "^5.8.3",
"googleapis": "^144.0.0",
"protobufjs": "^7.5.2",
"quicklime": "^1.2.0",
"sharp": "^0.33.5"
}
}
+124
View File
@@ -0,0 +1,124 @@
{
"name": "blitzkit",
"private": true,
"version": "1.27.11",
"description": "🎉 Tools for everything World of Tanks Blitz",
"type": "module",
"types": "./types.d.ts",
"workspaces": [
"packages/*",
"submodules/*"
],
"scripts": {
"build:assets": "cd packages/scripts && bun run build:assets",
"build:averages": "bun --filter=@blitzkit/scripts run build:averages",
"build:bot": "cd packages/scripts && bun run build:bot",
"build:website": "bun build:prisma --no-hints && cd packages/website && bun run build",
"build:prisma": "prisma generate",
"build:sitemap": "bun scripts/sitemap.ts",
"build:docs": "vitepress build docs",
"build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
"dev:bot": "bun run build:bot --dev && bun start:bot",
"start:bot": "bun dist/bot/main.js",
"dev:docs": "vitepress dev docs",
"dev:website": "cd packages/website-ue && bun run dev",
"dev:api": "bun --filter=@blitzkit/api run dev",
"setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
"setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
"start:website": "bun --filter=@blitzkit/website run start",
"host:docs": "vitepress preview docs",
"lint": "tsc",
"lint:website": "cd packages/website && bun run lint",
"format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
"update": "yarn upgrade --latest",
"tunnel": "cloudflared tunnel --url http://localhost:3000",
"discoverids": "scripts/discoverIds.ts",
"build:protos": "bun packages/scripts/src/protos.ts",
"preview:website": "cd packages/website && bun run preview",
"build:reviews": "cd packages/scripts && bun build:reviews",
"build:ids": "cd packages/scripts && bun build:ids",
"prunestrings": "cd packages/scripts && bun prunestrings"
},
"license": "MIT",
"dependencies": {
"satori": "^0.10.14",
"@resvg/resvg-js": "^2.6.2",
"discord.js": "^14.16.3",
"fuzzysort": "^2.0.4",
"bepaint": "^0.1.0-beta.3",
"markdown-escape": "^2.0.0",
"@types/markdown-escape": "^1.1.3",
"@types/adm-zip": "^0.5.5",
"@types/lz4js": "^0.2.1",
"@octokit/plugin-throttling": "^8.2.0",
"@octokit/rest": "^20.1.1",
"@prisma/client": "^6.6.0",
"adm-zip": "^0.5.16",
"crc": "^4.3.2",
"dotenv": "^16.4.5",
"lz4js": "^0.2.0",
"ts-proto": "^2.2.2",
"yaml": "^2.5.0",
"ts-deepmerge": "^7.0.2",
"@types/decompress": "^4.2.7",
"@types/progress": "^2.0.7",
"@gltf-transform/core": "^4.0.10",
"@gltf-transform/extensions": "^4.0.10",
"@gltf-transform/functions": "^4.0.10",
"csv-parse": "^5.5.6",
"decompress": "^4.2.1",
"esbuild": "^0.19.12",
"fast-xml-parser": "^4.4.1",
"progress": "^2.0.3",
"puppeteer": "^23.10.4",
"@astrojs/check": "^0.9.4",
"@astrojs/sitemap": "^3.2.1",
"@playform/compress": "^0.1.9",
"@playform/inline": "^0.1.2",
"@types/js-cookie": "^3.0.6",
"@types/three": "^0.160.0",
"astro-compressor": "^1.0.0",
"@astrojs/partytown": "^2.1.4",
"@astrolib/seo": "^1.0.0-beta.8",
"@fontsource/inter": "^5.2.5",
"@nanostores/persistent": "^0.10.2",
"@nanostores/react": "^0.7.3",
"@nivo/bar": "^0.87.0",
"@nivo/line": "^0.88.0",
"@radix-ui/colors": "^3.0.0",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/themes": "^3.1.4",
"@react-three/drei": "^9.115.0",
"@react-three/fiber": "^8.17.10",
"compare-versions": "^6.1.1",
"echarts": "^5.5.1",
"immer": "^10.1.1",
"js-cookie": "^3.0.5",
"markdown-to-jsx": "^7.5.0",
"nanostores": "^0.11.3",
"react-device-detect": "^2.2.3",
"react-promise-suspense": "^0.3.4",
"three": "^0.169.0",
"urlon": "^3.1.0",
"zustand": "^4.5.5",
"@types/bun": "latest",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.14.1",
"prettier": "^3.5.3",
"prisma": "^6.6.0",
"typescript": "^5.8.3",
"googleapis": "^144.0.0",
"lodash-es": "^4.17.21",
"protobufjs": "^7.5.2",
"quicklime": "^1.2.0",
"sharp": "^0.33.5",
"@blitzkit/core": "workspace:*",
"@blitzkit/i18n": "workspace:*",
"@astrojs/react": "^4.3.0",
"@types/react": "^19.1.5",
"@types/react-dom": "^19.1.5",
"astro": "^5.8.0",
"react": "^19.1.0",
"react-dom": "^19.1.0"
}
}
-2884
View File
File diff suppressed because it is too large. Load diff
BIN
View File
Binary file not shown.
-25
View File
@@ -1,25 +0,0 @@
# BlitzKit 1.27.16
## Features
- Added links to GuidesBlitz to Tankopedia to aid users understand tanks beyond just numbers and stats
- Added a gun depression and yaw visualizer
## Changes
- Made the colors of the advanced highlighting mode more subtle
- Made the Tankopedia stat lines more condensed
- You can now scroll the page even with your cursor on the Tankopedia sandbox
## Fixes
- Fixed a bug where the range of increased gun depression was incorrectly doubled
- Removed an unintended space before the "x" in the "Gun damaged" stat
- Fixed an issue causing the 3D renderer to render frames even when off screen
- Fixed a differential issue causing excessive rerendering of the stat lines
- Images no longer exceed the width of the device in the docs
- Assault shells no longer scale the module damage with distance
## Technical Changes
- Removed all code relating to the canceled "Shooting Range" mode
-18
View File
@@ -1,18 +0,0 @@
# BlitzKit 1.27.17
This update was released early for the website. Today, it'll be officially announced and released for the bot
## Features
- Added the shell reload visualizer to aid people in getting a feel for how long shell reloads really are
- Added lines of stats for the burst shells
## Changes
- Removed the redundant word "Shell" from "Shell reload" and "Shell reloads"
- Removed the penetration over distance slider
## Fixes
- Fixed the DPM of tanks with burst shells like the ATAC
- The DPM will still be different from the game due to a bug in World of Tanks Blitz; I am trying to get Wargaming to fix it; trust BlitzKit!
-11
View File
@@ -1,11 +0,0 @@
# BlitzKit 1.27.18
## Features
- Added a mini-game to BlitzKit similar to "Guess Who's That Pokemon" but with tanks: http://blitzkit.vercel.app/guess
- Switched to a new renderer for better lighting for the Tankopedia
## Fixes
- The loading bar for the Tankopedia sandbox now shows up again
- Removed a lot of dead code, improving performance
-18
View File
@@ -1,18 +0,0 @@
# BlitzKit 1.27.19
Two updates in a day? I just got a little excited by the new Tankopedia lighting.
## Features
- The camera is now lower down in the Tankopedia, giving the tank a more heroic feel
- Tanks are better framed across all devices, minimizing whitespace
- Added a skip button for the reload visualizer to skip to the next event
## Fixes
- Removed the useless "show grid" setting
- Taking screenshots now no longer includes the scene props like the floor
- The subtler color contrast for the advanced highlighting has now been reverted back to the higher contrast
- The shot display card is now properly aligned as a proper table again
- Tank modules are once again considered in the penetration tester
- Tank filters in the antagonist selector in the Tankopedia sandbox are now properly aligned
-13
View File
@@ -1,13 +0,0 @@
# BlitzKit 1.27.20
It's all technical updates! The HD tanks will be rolled out over the span of few days.
## Technical Changes
- Shadows are disabled if your framerate drops below 30fps
- Pages that redirect to other pages (like the old /tools/tankopedia) now load a few hundred times faster
- Replaced Zustand with a custom state manager called Varuna with the goal to rewrite a significant portion of the website to not require any React for rendering increasing performance
- The transition wireframe in the Tankopedia sandbox now uses a lower quality model for performance reasons
- Tanks with PBR now use the correct maximum resolution textures
- This is a significant update as you can now literally see individual splats of dust on tanks and scratches haha
- Baked the ambient occlusion maps into the textures, hence reducing the overall model load times even with higher resolution textures
-16
View File
@@ -1,16 +0,0 @@
# BlitzKit 1.28.0
BlitzKit, as an app and the new Mixer tool!
## Features
- Created the BlitzKit app that can be downloaded on most devices
- Re-did the BlitzKit logo to be a bit warmer
- Added the Mixer tool which lets you combine tank models into Frankensteins
- Updated all dependencies to the latest version for a decent performance boost
## Fixes
- BlitzKit no longer forgets persistent data if the app crashes without properly closing
- The tools list in the navbar no longer overflows into the neighboring elements on certain devices
- Added keying to a few places, speeding up re-rendering
-5
View File
@@ -1,5 +0,0 @@
# BlitzKit 1.28.1
## Fixes
- The lights no longer crash the Mixer tool
-5
View File
@@ -1,5 +0,0 @@
# BlitzKit 1.28.2
## Fixes
- BlitzKit no longer tries to redirect translated pages to the same page, over and over again
-18
View File
@@ -1,18 +0,0 @@
# BlitzKit 1.28.3
## Features
- Turrets and guns can now be rotated in Mixer without any pitch or yaw limits
- Added nation icons to the search results for Guesser
- The table now occupies the whole screen in Compare
- Added the ability to log in with a Wargaming account in the navbar
- Added owned/unowned filters in the Tankopedia filters
- Revamped Tankopedia quick controls to be more accessible and obvious
## Fixes
- Missing tank icons across the website have been fixed
- Events of starting and stopping of the transform tanks now use an asynchronous event instead of a reactive state, making them faster
- Removed a hook call on root context, speeding up load times
- Tankopedia's pitch input now follows the same sign convention as the pitch and yaw visualizer
- Shadows are no longer disabled when the scene is unloaded when the user scrolls away from the canvas
-10
View File
@@ -1,10 +0,0 @@
# BlitzKit 1.28.4
## Fixes
- The tank names in the Tankopedia sandbox now have less margin from the navbar
- Controls in the Tankopedia sandbox are now shown in all modes, except for the advanced highlighting button which only appears in the dynamic armor mode
- The settings page now reacts to input again
- The settings page now has a tab title and description for search engines
- Added support for transparent textures, fixing tanks like the Herdbreaker and the WZ-132-1
- The tank filters in the Performance and Tier-List tools work once again
-12
View File
@@ -1,12 +0,0 @@
# BlitzKit 1.29.0
## Features
- Added the Playlist tool
- Don't know what to play today? Let BlitzKit do the thinking!
- Navigate to [the tool on BlitzKit](https://blitzkit.app/playlist)
- Make sure you login with your Wargaming account to unlock all features like live tracking and filtering by owned tanks
- Use filters to pick tiers, nations, etc. then hit Generate playlist
- BlitzKit will generate a checklist for you to go through as you play
- Don't like the order of tanks? Hit Shuffle, Sort by Last played and Least played, or straight up remove tanks from the list by using the (-) button
- If you're logged in, BlitzKit will automatically check off tanks as you play them
-5
View File
@@ -1,5 +0,0 @@
# BlitzKit 1.29.1
## Technical Changes
- Recreated the full dependency tree for BlitzKit
-5
View File
@@ -1,5 +0,0 @@
# BlitzKit 1.29.2
## Technical Changes
- Implemented new workflow capabilities to deploy BlitzKit OpenTest and Preview remotely, from any device
-5
View File
@@ -1,5 +0,0 @@
# BlitzKit 1.29.3
## Technical Changes
- Added a significantly more memory and network efficient AssetUploader abstraction
-5
View File
@@ -1,5 +0,0 @@
# BlitzKit 1.29.4
## Technical Changes
- BlitzKit now partially downloads game files instead of the entire game, allowing for faster updates
-11
View File
@@ -1,11 +0,0 @@
# BlitzKit 1.29.5
## Features
- Added new lighting to be a bit softer on tanks
- Added a button with the sun icon to toggle high graphics
- Added a new reveal and transition animation between tabs
## Fixes
- Track wheels on some tanks no longer look translucent
-18
View File
@@ -1,18 +0,0 @@
# BlitzKit 1.29.6
## Features
- Simplified the ownership and test tank filters in the tank search
- Renamed "Guess the tank" to simply "Guess"
- The player count value in the Performance tool is now set to Total by default
- Added Compare-like red/green highlighting to the Performance tool
## Changes
- Removed the last updated info bar in Performance for some more screen real estate
## Fixes
- The remove played tanks in the Playlist tool now shows even when logged out
- The Guess game now has a page title
- The compare table now occupies the minimum width possible instead of expanding all columns excessively
+19 -18
View File
@@ -1,23 +1,27 @@
{ {
"name": "blitzkit", "name": "blitzkit",
"version": "1.29.6",
"license": "BlitzKit License",
"private": true, "private": true,
"version": "1.27.15",
"description": "🎉 Tools for everything World of Tanks Blitz",
"type": "module",
"types": "./types.d.ts",
"workspaces": [
"packages/*",
"submodules/*"
],
"scripts": { "scripts": {
"build:assets": "cd packages/scripts && bun run build:assets", "build:assets": "cd packages/scripts && bun run build:assets",
"build:averages": "bun --filter=@blitzkit/scripts run build:averages", "build:averages": "bun --filter=@blitzkit/scripts run build:averages",
"build:bot": "cd packages/scripts && bun run build:bot", "build:bot": "cd packages/scripts && bun run build:bot",
"build:website": "cd packages/website && bun run build", "build:website": "cd packages/website-ue && bun run build",
"build:prisma": "prisma generate", "build:prisma": "prisma generate",
"build:proxyclient": "cd packages/scripts && bun run build:proxyclient", "build:sitemap": "bun scripts/sitemap.ts",
"build:catalogitemaccesssor": "cd packages/scripts && bun run build:catalogitemaccesssor", "build:docs": "vitepress build docs",
"build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard", "build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
"build:app": "cd packages/app && bun run build",
"dev:bot": "bun run build:bot --dev && bun start:bot", "dev:bot": "bun run build:bot --dev && bun start:bot",
"start:bot": "bun dist/bot/main.js", "start:bot": "bun dist/bot/main.js",
"dev:docs": "vitepress dev docs", "dev:docs": "vitepress dev docs",
"dev:website": "cd packages/website && bun run dev", "dev:website": "cd packages/website && bun run dev",
"dev:app": "cd packages/app && bun run dev",
"dev": "bun run dev:website", "dev": "bun run dev:website",
"dev:api": "bun --filter=@blitzkit/api run dev", "dev:api": "bun --filter=@blitzkit/api run dev",
"setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader", "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
@@ -27,24 +31,21 @@
"lint": "tsc", "lint": "tsc",
"lint:website": "cd packages/website && bun run lint", "lint:website": "cd packages/website && bun run lint",
"format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"", "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
"update": "yarn upgrade --latest", "update": "yarn upgace --latest",
"tunnel": "cloudflared tunnel --url http://localhost:3000", "tunnel": "cloudflared tunnel --url http://localhost:3000",
"discoverids": "scripts/discoverIds.ts", "discoverids": "scripts/discoverIds.ts",
"build:protos": "cd packages/scripts && bun run build:protos", "build:protos": "bun packages/scripts/src/protos.ts",
"preview:website": "cd packages/website && bun run preview", "preview:website": "cd packages/website && bun run preview",
"build:reviews": "cd packages/scripts && bun build:reviews", "build:reviews": "cd packages/scripts && bun build:reviews",
"build:ids": "cd packages/scripts && bun build:ids", "build:ids": "cd packages/scripts && bun build:ids",
"prunestrings": "cd packages/scripts && bun prunestrings", "prunestrings": "cd packages/scripts && bun prunestrings",
"setup": "bun install && bun run build:prisma && bun run build:protos && bun run build:proxyclient", "build:ffi": "bun build:windows:ffi",
"patchnotes": "cd packages/scripts && bun run patchnotes" "build:windows:ffi": "dotnet publish src/BlitzKit.FFI -r win-x64 /p:PublishAot=true",
"build:linux:ffi": "dotnet publish src/BlitzKit.FFI -r linux-x64 /p:PublishAot=true"
}, },
"type": "module", "license": "MIT",
"workspaces": [
"packages/*"
],
"dependencies": { "dependencies": {
"@prisma/client": "^6.18.0", "@types/bun": "^1.2.15",
"prisma": "^6.18.0", "prettier": "^3.5.3"
"typescript": "^5.9.3"
} }
} }
-18
View File
@@ -1,18 +0,0 @@
{
"name": "@blitzkit/app",
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-opener": "^2",
"@tauri-apps/cli": "^2",
"vite": "^6.0.3",
"typescript": "~5.6.2"
}
}
-7
View File
@@ -1,7 +0,0 @@
# Generated by Cargo
# will have compiled files and executables
/target/
# Generated by Tauri
# will have schema files for capabilities auto-completion
/gen/schemas
-5286
View File
File diff suppressed because it is too large. Load diff
-25
View File
@@ -1,25 +0,0 @@
[package]
name = "blitzkit"
version = "0.1.0"
description = "A Tauri App"
authors = ["you"]
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
# The `_lib` suffix may seem redundant but it is necessary
# to make the lib name unique and wouldn't conflict with the bin name.
# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
name = "blitzkit_lib"
crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies]
tauri-build = { version = "2", features = [] }
[dependencies]
tauri = { version = "2", features = [] }
tauri-plugin-opener = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
-3
View File
@@ -1,3 +0,0 @@
fn main() {
tauri_build::build()
}
@@ -1,10 +0,0 @@
{
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "Capability for the main window",
"windows": ["main"],
"permissions": [
"core:default",
"opener:default"
]
}
-14
View File
@@ -1,14 +0,0 @@
// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
#[tauri::command]
fn greet(name: &str) -> String {
format!("Hello, {}! You've been greeted from Rust!", name)
}
#[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() {
tauri::Builder::default()
.plugin(tauri_plugin_opener::init())
.invoke_handler(tauri::generate_handler![greet])
.run(tauri::generate_context!())
.expect("error while running tauri application");
}
-27
View File
@@ -1,27 +0,0 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
use std::process::{Command, Stdio};
use tauri::Manager;
fn main() {
tauri::Builder::default()
.setup(|app| {
let app_handle = app.handle();
let entry = app_handle
.path_resolver()
.resolve_resource("../../dist/website/server/entry.mjs")
.expect("failed to resolve server.ts");
Command::new("bun")
.arg("run")
.arg(entry)
.stderr(Stdio::null())
.spawn()
.expect("failed to start Bun server");
Ok(())
})
.run(tauri::generate_context!())
.expect("error while running Tauri app");
}
-38
View File
@@ -1,38 +0,0 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "blitzkit",
"version": "0.1.0",
"identifier": "com.tresabhi.blitzkit",
"build": {
"beforeDevCommand": "cd ../website && bun run dev",
"_beforeBuildCommand": "cd ../website && bun run build",
"frontendDist": "../../../dist/website/client",
"devUrl": "http://localhost:4321"
},
"app": {
"withGlobalTauri": true,
"windows": [
{
"url": "http://localhost:4321",
"title": "BlitzKit",
"fullscreen": false,
"resizable": true,
"maximized": true
}
],
"security": {
"csp": null
}
},
"bundle": {
"active": true,
"targets": "all",
"icon": [
"icons/32x32.png",
"icons/128x128.png",
"icons/[email protected]",
"icons/icon.icns",
"icons/icon.ico"
]
}
}
-19
View File
@@ -1,19 +0,0 @@
{
"extends": ["../../tsconfig.json"],
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"module": "ESNext",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"skipLibCheck": true,
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
}
}
+3 -27
View File
@@ -1,34 +1,10 @@
{ {
"name": "@blitzkit/bot", "name": "@blitzkit/bot",
"dependencies": {
"@blitzkit/core": "workspace:*",
"@blitzkit/i18n": "workspace:*",
"@radix-ui/colors": "^3.0.0",
"@radix-ui/themes": "^3.2.1",
"@resvg/resvg-js": "^2.6.2",
"@types/adm-zip": "^0.5.7",
"@types/lodash-es": "^4.17.12",
"@types/markdown-escape": "^1.1.3",
"@types/react": "^19.2.2",
"adm-zip": "^0.5.16",
"bepaint": "^0.1.0-beta.3",
"discord.js": "^14.22.1",
"dotenv": "^17.2.2",
"fuzzysort": "^3.1.0",
"lodash-es": "^4.17.21",
"markdown-escape": "^2.0.0",
"pickleparser": "^0.2.1",
"prisma": "^6.17.1",
"protobufjs": "^7.5.4",
"react": "^19.2.0",
"satori": "^0.18.3",
"sharp": "^0.34.4"
},
"private": true, "private": true,
"type": "module",
"types": "src/types.d.ts",
"scripts": { "scripts": {
"dev": "bun --watch src/main.ts", "dev": "bun --watch src/main.ts",
"start": "bun src/main.ts" "start": "bun src/main.ts"
}, }
"type": "module",
"types": "src/types.d.ts"
} }
+19 -22
View File
@@ -1,31 +1,28 @@
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import { import { COMMANDS_RAW, CommandRegistry } from '../events/interactionCreate';
COMMANDS_RAW,
type CommandRegistry,
} from "../events/interactionCreate";
const subcommands = [ const subcommands = [
"embeds", 'embeds',
"introduction", 'introduction',
"invite", 'invite',
"timezones", 'timezones',
"credits", 'credits',
] as const; ] as const;
type Subcommand = (typeof subcommands)[number]; type Subcommand = (typeof subcommands)[number];
const DOCS: Record<Subcommand, string> = { const DOCS: Record<Subcommand, string> = {
embeds: "guide/embeds", embeds: 'guide/embeds',
introduction: "guide/introduction", introduction: 'guide/introduction',
invite: "guide/invite", invite: 'guide/invite',
timezones: "guide/timezones", timezones: 'guide/timezones',
credits: "about/credits", credits: 'about/credits',
}; };
export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => { export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
resolve({ resolve({
command: createLocalizedCommand("about", [ command: createLocalizedCommand('about', [
{ subcommand: "commands" }, { subcommand: 'commands' },
...subcommands.map((subcommand) => ({ subcommand })), ...subcommands.map((subcommand) => ({ subcommand })),
]), ]),
@@ -33,7 +30,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
const subcommand = interaction.options.getSubcommand(); const subcommand = interaction.options.getSubcommand();
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
if (subcommand === "commands") { if (subcommand === 'commands') {
return `${strings.bot.commands.about.subcommands.commands.body}${( return `${strings.bot.commands.about.subcommands.commands.body}${(
await Promise.all(COMMANDS_RAW) await Promise.all(COMMANDS_RAW)
) )
@@ -43,7 +40,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
(b.command.name_localizations?.[interaction.locale] ?? (b.command.name_localizations?.[interaction.locale] ??
b.command.name) b.command.name)
? -1 ? -1
: 1 : 1,
) )
.map( .map(
(registry) => (registry) =>
@@ -54,9 +51,9 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
registry.command.description_localizations?.[ registry.command.description_localizations?.[
interaction.locale interaction.locale
] ?? registry.command.description ] ?? registry.command.description
}` }`,
) )
.join("\n")}`; .join('\n')}`;
} }
const url = `https://raw.githubusercontent.com/tresabhi/blitzkit/main/docs/${DOCS[subcommand as Subcommand]}.md`; const url = `https://raw.githubusercontent.com/tresabhi/blitzkit/main/docs/${DOCS[subcommand as Subcommand]}.md`;
+144
View File
@@ -0,0 +1,144 @@
import {
BlitzTankClass,
Region,
regionToRegionSubdomain,
} from '@blitzkit/core';
import { literals } from '@blitzkit/i18n';
import { tankDefinitions } from '../core/blitzkit/nonBlockingPromises';
import { chunkLines } from '../core/discord/chunkLines';
import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { translator } from '../core/localization/translator';
import { CommandRegistry } from '../events/interactionCreate';
type Auction = null | {
count: number;
has_next: boolean;
results: Result[];
};
type Result =
| {
id?: number;
type: 'vehicle';
countable?: boolean;
entity?: Entity;
initial_count: number;
current_count: number;
saleable?: boolean;
available_from?: Date;
available_before?: Date;
price?: Price;
next_price: Price | null;
available: true;
display?: boolean;
next_price_datetime: Date;
next_price_timestamp: number;
}
| {
available: false;
type: 'vehicle';
};
interface Entity {
id: number;
name: string;
nation: string;
subnation: string;
use_subnation_flag: boolean;
type_slug: BlitzTankClass;
level: number;
roman_level: string;
user_string: string;
image_url: string;
preview_image_url: string;
is_premium: boolean;
is_collectible: boolean;
}
interface Price {
currency: Currency;
value: number;
}
interface Currency {
name: 'gold';
count: number;
title: 'Gold';
image_url: string;
sizes: unknown;
type: 'currency';
}
const WARNING_COUNT = 500;
export const auctionCommand = new Promise<CommandRegistry>((resolve) => {
resolve({
command: createLocalizedCommand('auction'),
async handler(interaction) {
const { strings } = translator(interaction.locale);
const awaitedTankDefinitions = await tankDefinitions;
const region: Region = 'com';
const pageSize = 80;
const saleable = true;
const data = await fetch(
`https://${regionToRegionSubdomain(
region,
)}.wotblitz.com/en/api/events/items/auction/?page_size=${
pageSize
}&type[]=vehicle&saleable=${saleable}`,
).then((response) => response.json() as Promise<Auction>);
if (data === null) {
return strings.bot.commands.auction.errors.no_auction;
}
const saleableTanks = data.results.filter((result) => result.available);
const nextPricesTimestamp = saleableTanks[0].next_price_timestamp;
const title = `# ${strings.bot.commands.auction.body.title}`;
const subtitle = `${literals(strings.bot.commands.auction.body.subtitle, [
`${saleableTanks.length} / ${data.results.length}`,
`<t:${nextPricesTimestamp}:R>`,
'<https://wotblitz.com/auction/>',
])}`;
const body = saleableTanks.map((data, index) => {
const tank = awaitedTankDefinitions.tanks[data.entity!.id];
if (!tank) return '';
const name = `[${tank.name}](<https://blitzkit.app/tanks/${
tank.slug
}>)`;
const next =
data.next_price === null
? ''
: `\n-# ${literals(strings.bot.commands.auction.body.next, [
`<:gold:1317173197082333244> ${data.next_price.value.toLocaleString(
interaction.locale,
)}`,
])}`;
const available = literals(
strings.bot.commands.auction.body.available,
[
data.current_count.toLocaleString(interaction.locale),
data.initial_count.toLocaleString(interaction.locale),
],
);
const isOut = data.current_count === 0;
const outString = isOut ? '~~' : '';
const isLow = data.current_count <= WARNING_COUNT;
return `${index + 1}. ${
outString
}${name} <:gold:1317173197082333244> ${data.price!.value.toLocaleString(
interaction.locale,
)}${outString}\n-#${isLow ? ' ‼️ ' : ' '}${available}${isOut ? '' : next}`;
});
const header = `${title}\n${subtitle}`;
const lines = [header, ...body];
return chunkLines(lines, '\n\n');
},
});
});
@@ -13,7 +13,7 @@ import { resolvePeriodFromButton } from '../../core/discord/resolvePeriodFromBut
import { resolvePeriodFromCommand } from '../../core/discord/resolvePeriodFromCommand'; import { resolvePeriodFromCommand } from '../../core/discord/resolvePeriodFromCommand';
import { resolvePlayerFromButton } from '../../core/discord/resolvePlayerFromButton'; import { resolvePlayerFromButton } from '../../core/discord/resolvePlayerFromButton';
import { resolvePlayerFromCommand } from '../../core/discord/resolvePlayerFromCommand'; import { resolvePlayerFromCommand } from '../../core/discord/resolvePlayerFromCommand';
import type { CommandRegistry } from '../../events/interactionCreate'; import { CommandRegistry } from '../../events/interactionCreate';
import { renderBreakdown } from './render'; import { renderBreakdown } from './render';
export const breakdownCommand = new Promise<CommandRegistry>( export const breakdownCommand = new Promise<CommandRegistry>(
+41 -41
View File
@@ -1,28 +1,28 @@
import { import {
type BlitzStats, BlitzStats,
calculateWN8, calculateWN8,
getAccountInfo, getAccountInfo,
getClanAccountInfo, getClanAccountInfo,
getTankStats, getTankStats,
getWN8Percentile, getWN8Percentile,
TankDefinition, TankDefinition,
} from "@blitzkit/core"; } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { Locale } from "discord.js"; import { Locale } from 'discord.js';
import { chunk } from "lodash-es"; import { chunk } from 'lodash-es';
import * as Breakdown from "../../components/Breakdown"; import * as Breakdown from '../../components/Breakdown';
import { CommandWrapper } from "../../components/CommandWrapper"; import { CommandWrapper } from '../../components/CommandWrapper';
import { NoData } from "../../components/NoData"; import { NoData } from '../../components/NoData';
import { TitleBar } from "../../components/TitleBar"; import { TitleBar } from '../../components/TitleBar';
import { filtersToDescription } from "../../core/blitzkit/filtersToDescription"; import { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
import { tankDefinitions } from "../../core/blitzkit/nonBlockingPromises"; import { tankDefinitions } from '../../core/blitzkit/nonBlockingPromises';
import { UserError } from "../../core/blitzkit/userError"; import { UserError } from '../../core/blitzkit/userError';
import { filterStats, type StatFilters } from "../../core/blitzstars/filterStats"; import { filterStats, StatFilters } from '../../core/blitzstars/filterStats';
import { getStatsInPeriod } from "../../core/blitzstars/getStatsInPeriod"; import { getStatsInPeriod } from '../../core/blitzstars/getStatsInPeriod';
import { blitzStarsTankAverages } from "../../core/blitzstars/tankAverages"; import { blitzStarsTankAverages } from '../../core/blitzstars/tankAverages';
import type { ResolvedPeriod } from "../../core/discord/resolvePeriodFromCommand"; import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
import type { ResolvedPlayer } from "../../core/discord/resolvePlayerFromCommand"; import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
import { translator } from "../../core/localization/translator"; import { translator } from '../../core/localization/translator';
const ROWS_PER_PAGE = 8; const ROWS_PER_PAGE = 8;
const MAX_PAGES = 9; const MAX_PAGES = 9;
@@ -31,7 +31,7 @@ export async function renderBreakdown(
{ region, id }: ResolvedPlayer, { region, id }: ResolvedPlayer,
{ start, end, name }: ResolvedPeriod, { start, end, name }: ResolvedPeriod,
filters: StatFilters, filters: StatFilters,
locale: Locale locale: Locale,
) { ) {
const { strings, unwrap } = translator(locale); const { strings, unwrap } = translator(locale);
const awaitedTankDefinitions = await tankDefinitions; const awaitedTankDefinitions = await tankDefinitions;
@@ -39,7 +39,7 @@ export async function renderBreakdown(
const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale); const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale);
const { filteredOrder } = await filterStats(statsInPeriod, filters); const { filteredOrder } = await filterStats(statsInPeriod, filters);
const accountInfo = await getAccountInfo(region, id); const accountInfo = await getAccountInfo(region, id);
const clanData = await getClanAccountInfo(region, id, ["clan"]); const clanData = await getClanAccountInfo(region, id, ['clan']);
const tankStats = await getTankStats(region, id); const tankStats = await getTankStats(region, id);
const filterDescriptions = await filtersToDescription(filters, locale); const filterDescriptions = await filtersToDescription(filters, locale);
const orderedCurrentStats: BlitzStats[] = []; const orderedCurrentStats: BlitzStats[] = [];
@@ -74,63 +74,63 @@ export async function renderBreakdown(
orderedCareerWN8Full.push( orderedCareerWN8Full.push(
tankAveragesEntry tankAveragesEntry
? calculateWN8(tankAveragesEntry.all, tank.all) ? calculateWN8(tankAveragesEntry.all, tank.all)
: undefined : undefined,
); );
}); });
const currentBattles = orderedCurrentStats.reduce( const currentBattles = orderedCurrentStats.reduce(
(accumulator, current) => accumulator + current.battles, (accumulator, current) => accumulator + current.battles,
0 0,
); );
const careerBattles = tankStats.reduce( const careerBattles = tankStats.reduce(
(accumulator, current) => accumulator + current.all.battles, (accumulator, current) => accumulator + current.all.battles,
0 0,
); );
const currentWinrate = const currentWinrate =
orderedCurrentStats.reduce( orderedCurrentStats.reduce(
(accumulator, current) => accumulator + current.wins, (accumulator, current) => accumulator + current.wins,
0 0,
) / currentBattles; ) / currentBattles;
const careerWinrate = const careerWinrate =
tankStats.reduce( tankStats.reduce(
(accumulator, current) => accumulator + current.all.wins, (accumulator, current) => accumulator + current.all.wins,
0 0,
) / careerBattles; ) / careerBattles;
const currentWN8 = const currentWN8 =
orderedCurrentWN8.reduce<number>( orderedCurrentWN8.reduce<number>(
(accumulator, current, index) => (accumulator, current, index) =>
accumulator + (current ?? 0) * orderedCurrentStats[index].battles, accumulator + (current ?? 0) * orderedCurrentStats[index].battles,
0 0,
) / ) /
orderedCurrentStats.reduce( orderedCurrentStats.reduce(
(accumulator, current, index) => (accumulator, current, index) =>
accumulator + accumulator +
(orderedCurrentWN8[index] === undefined ? 0 : current.battles), (orderedCurrentWN8[index] === undefined ? 0 : current.battles),
0 0,
); );
const careerWN8 = const careerWN8 =
orderedCareerWN8Full.reduce<number>( orderedCareerWN8Full.reduce<number>(
(accumulator, current) => accumulator + (current ?? 0), (accumulator, current) => accumulator + (current ?? 0),
0 0,
) / ) /
tankStats.reduce( tankStats.reduce(
(accumulator, current, index) => (accumulator, current, index) =>
accumulator + accumulator +
(orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles), (orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles),
0 0,
); );
const currentDamage = const currentDamage =
orderedCurrentStats.reduce( orderedCurrentStats.reduce(
(accumulator, current) => accumulator + current.damage_dealt, (accumulator, current) => accumulator + current.damage_dealt,
0 0,
) / currentBattles; ) / currentBattles;
const careerDamage = const careerDamage =
tankStats.reduce( tankStats.reduce(
(accumulator, current) => accumulator + current.all.damage_dealt, (accumulator, current) => accumulator + current.all.damage_dealt,
0 0,
) / careerBattles; ) / careerBattles;
const children: React.JSX.Element[] = []; const children: JSX.Element[] = [];
if (filteredOrder.length > 0) { if (filteredOrder.length > 0) {
children.push( children.push(
@@ -172,7 +172,7 @@ export async function renderBreakdown(
delta: currentDamage - careerDamage, delta: currentDamage - careerDamage,
}, },
]} ]}
/> />,
); );
filteredOrder.forEach((id, index) => { filteredOrder.forEach((id, index) => {
@@ -193,9 +193,9 @@ export async function renderBreakdown(
title={ title={
tankDefinition tankDefinition
? unwrap(tankDefinition.name) ? unwrap(tankDefinition.name)
: literals(strings.bot.commands.breakdown.body.unknown_tank, { : literals(strings.bot.commands.breakdown.body.unknown_tank, [
id, `${id}`,
}) ])
} }
stats={[ stats={[
{ {
@@ -206,7 +206,7 @@ export async function renderBreakdown(
{ {
title: strings.bot.commands.breakdown.body.winrate, title: strings.bot.commands.breakdown.body.winrate,
current: `${(100 * (current.wins / current.battles)).toFixed( current: `${(100 * (current.wins / current.battles)).toFixed(
2 2,
)}%`, )}%`,
career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`, career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`,
delta: delta:
@@ -230,24 +230,24 @@ export async function renderBreakdown(
{ {
title: strings.bot.commands.breakdown.body.damage, title: strings.bot.commands.breakdown.body.damage,
current: Math.round( current: Math.round(
current.damage_dealt / current.battles current.damage_dealt / current.battles,
).toLocaleString(), ).toLocaleString(),
career: Math.round( career: Math.round(
career.damage_dealt / career.battles career.damage_dealt / career.battles,
).toLocaleString(), ).toLocaleString(),
delta: delta:
current.damage_dealt / current.battles - current.damage_dealt / current.battles -
career.damage_dealt / career.battles, career.damage_dealt / career.battles,
}, },
]} ]}
/> />,
); );
}); });
} }
const pages = chunk( const pages = chunk(
children, children,
Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE) Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE),
); );
if (filteredOrder.length > 0) { if (filteredOrder.length > 0) {
+9 -9
View File
@@ -1,14 +1,14 @@
import packageJSON from "../../../../package.json"; import packageJSON from '../../../../package.json';
import { client } from "../core/discord/client"; import { client } from '../core/discord/client';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
const executionStart = new Date().getTime(); const executionStart = new Date().getTime();
export const debugCommand = new Promise<CommandRegistry>((resolve) => { export const debugCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
command: createLocalizedCommand("debug"), command: createLocalizedCommand('debug'),
async handler(interaction) { async handler(interaction) {
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
@@ -23,15 +23,15 @@ export const debugCommand = new Promise<CommandRegistry>((resolve) => {
[ [
strings.bot.commands.debug.body.uptime, strings.bot.commands.debug.body.uptime,
`${Math.floor((uptime / 1000 / 60 / 60) % 24)}h ${Math.floor( `${Math.floor((uptime / 1000 / 60 / 60) % 24)}h ${Math.floor(
(uptime / 1000 / 60) % 60 (uptime / 1000 / 60) % 60,
)}m ${Math.floor((uptime / 1000) % 60)}s ${Math.floor( )}m ${Math.floor((uptime / 1000) % 60)}s ${Math.floor(
uptime % 1000 uptime % 1000,
)}ms`, )}ms`,
], ],
]; ];
return `${strings.bot.commands.debug.body.title}${list return `${strings.bot.commands.debug.body.title}${list
.map(([key, value]) => `- ${key}: ${value}`) .map(([key, value]) => `- ${key}: ${value}`)
.join("\n")}`; .join('\n')}`;
}, },
}); });
}); });
+47 -47
View File
@@ -1,48 +1,48 @@
import { emblemURL, getAccountInfo, getClanAccountInfo } from "@blitzkit/core"; import { emblemURL, getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
import { Locale, SlashCommandSubcommandGroupBuilder } from "discord.js"; import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
import { CommandWrapper } from "../components/CommandWrapper"; import { CommandWrapper } from '../components/CommandWrapper';
import * as Graph from "../components/Graph"; import * as Graph from '../components/Graph';
import { LineColor } from "../components/Graph/components/Line/constants"; import { LineColor } from '../components/Graph/components/Line/constants';
import { NoData } from "../components/NoData"; import { NoData } from '../components/NoData';
import { TitleBar } from "../components/TitleBar"; import { TitleBar } from '../components/TitleBar';
import { resolveTankId } from "../core/blitz/resolveTankId"; import { resolveTankId } from '../core/blitz/resolveTankId';
import { getBlitzStarsLinkButton } from "../core/blitzstars/getBlitzStarsLinkButton"; import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
import { getPlayerHistories } from "../core/blitzstars/getPlayerHistories"; import { getPlayerHistories } from '../core/blitzstars/getPlayerHistories';
import { getTankHistories } from "../core/blitzstars/getTankHistories"; import { getTankHistories } from '../core/blitzstars/getTankHistories';
import { addPeriodSubCommands } from "../core/discord/addPeriodSubCommands"; import { addPeriodSubCommands } from '../core/discord/addPeriodSubCommands';
import { addTankChoices } from "../core/discord/addTankChoices"; import { addTankChoices } from '../core/discord/addTankChoices';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { autocompleteTanks } from "../core/discord/autocompleteTanks"; import { autocompleteTanks } from '../core/discord/autocompleteTanks';
import { autocompleteUsername } from "../core/discord/autocompleteUsername"; import { autocompleteUsername } from '../core/discord/autocompleteUsername';
import { buttonRefresh } from "../core/discord/buttonRefresh"; import { buttonRefresh } from '../core/discord/buttonRefresh';
import { commandToURL } from "../core/discord/commandToURL"; import { commandToURL } from '../core/discord/commandToURL';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { getCustomPeriodParams } from "../core/discord/getCustomPeriodParams"; import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton"; import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
import { import {
type ResolvedPeriod, ResolvedPeriod,
resolvePeriodFromCommand, resolvePeriodFromCommand,
} from "../core/discord/resolvePeriodFromCommand"; } from '../core/discord/resolvePeriodFromCommand';
import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton"; import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
import { import {
type ResolvedPlayer, ResolvedPlayer,
resolvePlayerFromCommand, resolvePlayerFromCommand,
} from "../core/discord/resolvePlayerFromCommand"; } from '../core/discord/resolvePlayerFromCommand';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
type EvolutionStatType = "player" | "tank"; type EvolutionStatType = 'player' | 'tank';
async function render( async function render(
{ region, id }: ResolvedPlayer, { region, id }: ResolvedPlayer,
{ start, end, name }: ResolvedPeriod, { start, end, name }: ResolvedPeriod,
type: "player" | "tank", type: 'player' | 'tank',
tankId: number | null, tankId: number | null,
locale: Locale locale: Locale,
) { ) {
const accountInfo = await getAccountInfo(region, id); const accountInfo = await getAccountInfo(region, id);
const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan; const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
const logo = clan ? emblemURL(clan.emblem_set_id) : undefined; const logo = clan ? emblemURL(clan.emblem_set_id) : undefined;
const histories = await (type === "player" const histories = await (type === 'player'
? getPlayerHistories(region, id, { ? getPlayerHistories(region, id, {
start, start,
end, end,
@@ -61,7 +61,7 @@ async function render(
[ [
history.all.battles, history.all.battles,
(history.all.wins / history.all.battles) * 100, (history.all.wins / history.all.battles) * 100,
] as Graph.PlotItem ] as Graph.PlotItem,
); );
const times = histories.map((history) => history.last_battle_time); const times = histories.map((history) => history.last_battle_time);
const minTime = Math.min(...times); const minTime = Math.min(...times);
@@ -82,7 +82,7 @@ async function render(
verticalMargin={{ verticalMargin={{
min: minY, min: minY,
max: maxY, max: maxY,
suffix: "%", suffix: '%',
precision: 2, precision: 2,
}} }}
horizontalMargin={{ horizontalMargin={{
@@ -110,22 +110,22 @@ async function render(
export const evolutionCommand = new Promise<CommandRegistry>( export const evolutionCommand = new Promise<CommandRegistry>(
async (resolve) => { async (resolve) => {
resolve({ resolve({
command: createLocalizedCommand("evolution", [ command: createLocalizedCommand('evolution', [
{ {
group: "player", group: 'player',
modify(option: SlashCommandSubcommandGroupBuilder) { modify(option: SlashCommandSubcommandGroupBuilder) {
addPeriodSubCommands(option, (option) => addPeriodSubCommands(option, (option) =>
option.addStringOption(addUsernameChoices) option.addStringOption(addUsernameChoices),
); );
}, },
}, },
{ {
group: "tank", group: 'tank',
modify(option: SlashCommandSubcommandGroupBuilder) { modify(option: SlashCommandSubcommandGroupBuilder) {
addPeriodSubCommands(option, (option) => addPeriodSubCommands(option, (option) =>
option option
.addStringOption(addTankChoices) .addStringOption(addTankChoices)
.addStringOption(addUsernameChoices) .addStringOption(addUsernameChoices),
); );
}, },
}, },
@@ -136,9 +136,9 @@ export const evolutionCommand = new Promise<CommandRegistry>(
interaction.options.getSubcommandGroup() as EvolutionStatType; interaction.options.getSubcommandGroup() as EvolutionStatType;
const player = await resolvePlayerFromCommand(interaction); const player = await resolvePlayerFromCommand(interaction);
const period = resolvePeriodFromCommand(player.region, interaction); const period = resolvePeriodFromCommand(player.region, interaction);
const tankIdRaw = interaction.options.getString("tank")!; const tankIdRaw = interaction.options.getString('tank')!;
const tankId = const tankId =
commandGroup === "tank" commandGroup === 'tank'
? await resolveTankId(tankIdRaw, interaction.locale) ? await resolveTankId(tankIdRaw, interaction.locale)
: null; : null;
const path = commandToURL(interaction, { const path = commandToURL(interaction, {
@@ -153,13 +153,13 @@ export const evolutionCommand = new Promise<CommandRegistry>(
period, period,
commandGroup, commandGroup,
tankId, tankId,
interaction.locale interaction.locale,
), ),
buttonRefresh(interaction, path), buttonRefresh(interaction, path),
await getBlitzStarsLinkButton( await getBlitzStarsLinkButton(
player.region, player.region,
player.id, player.id,
tankId ?? undefined tankId ?? undefined,
), ),
]; ];
}, },
@@ -171,7 +171,7 @@ export const evolutionCommand = new Promise<CommandRegistry>(
async button(interaction) { async button(interaction) {
const url = new URL(`https://example.com/${interaction.customId}`); const url = new URL(`https://example.com/${interaction.customId}`);
const path = url.pathname.split("/"); const path = url.pathname.split('/');
const commandGroup = path[2] as EvolutionStatType; const commandGroup = path[2] as EvolutionStatType;
const player = await resolvePlayerFromButton(interaction); const player = await resolvePlayerFromButton(interaction);
const period = resolvePeriodFromButton(player.region, interaction); const period = resolvePeriodFromButton(player.region, interaction);
@@ -180,10 +180,10 @@ export const evolutionCommand = new Promise<CommandRegistry>(
player, player,
period, period,
commandGroup, commandGroup,
parseInt(url.searchParams.get("tankId") ?? "0") || null, parseInt(url.searchParams.get('tankId') ?? '0') || null,
interaction.locale interaction.locale,
); );
}, },
}); });
} },
); );
+4 -4
View File
@@ -11,7 +11,7 @@ import { NoData } from '../components/NoData';
import { TierWeights } from '../components/TierWeights'; import { TierWeights } from '../components/TierWeights';
import { TitleBar } from '../components/TitleBar'; import { TitleBar } from '../components/TitleBar';
import { filtersToDescription } from '../core/blitzkit/filtersToDescription'; import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
import { filterStats, type StatFilters } from '../core/blitzstars/filterStats'; import { filterStats, StatFilters } from '../core/blitzstars/filterStats';
import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton'; import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod'; import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod';
import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions'; import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions';
@@ -26,15 +26,15 @@ import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand'; import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton'; import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
import { import {
type ResolvedPeriod, ResolvedPeriod,
resolvePeriodFromCommand, resolvePeriodFromCommand,
} from '../core/discord/resolvePeriodFromCommand'; } from '../core/discord/resolvePeriodFromCommand';
import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton'; import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
import { import {
type ResolvedPlayer, ResolvedPlayer,
resolvePlayerFromCommand, resolvePlayerFromCommand,
} from '../core/discord/resolvePlayerFromCommand'; } from '../core/discord/resolvePlayerFromCommand';
import type { CommandRegistry } from '../events/interactionCreate'; import { CommandRegistry } from '../events/interactionCreate';
async function render( async function render(
{ region, id }: ResolvedPlayer, { region, id }: ResolvedPlayer,
+28 -28
View File
@@ -1,44 +1,44 @@
import { getAccountInfo, getClanInfo } from "@blitzkit/core"; import { getAccountInfo, getClanInfo } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { Locale } from "discord.js"; import { Locale } from 'discord.js';
import { CommandWrapper } from "../components/CommandWrapper"; import { CommandWrapper } from '../components/CommandWrapper';
import { GenericStats } from "../components/GenericStats"; import { GenericStats } from '../components/GenericStats';
import { NoData } from "../components/NoData"; import { NoData } from '../components/NoData';
import { TitleBar } from "../components/TitleBar"; import { TitleBar } from '../components/TitleBar';
import { addClanChoices } from "../core/discord/addClanChoices"; import { addClanChoices } from '../core/discord/addClanChoices';
import { autocompleteClan } from "../core/discord/autocompleteClan"; import { autocompleteClan } from '../core/discord/autocompleteClan';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { localizationObject } from "../core/discord/localizationObject"; import { localizationObject } from '../core/discord/localizationObject';
import { resolveClanFromCommand } from "../core/discord/resolveClanFromCommand"; import { resolveClanFromCommand } from '../core/discord/resolveClanFromCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
const DEFAULT_THRESHOLD = 7; const DEFAULT_THRESHOLD = 7;
export const inactiveCommand = new Promise<CommandRegistry>((resolve) => { export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
command: createLocalizedCommand("inactive") command: createLocalizedCommand('inactive')
.addStringOption(addClanChoices) .addStringOption(addClanChoices)
.addNumberOption((option) => { .addNumberOption((option) => {
const { strings } = translator(Locale.EnglishUS); const { strings } = translator(Locale.EnglishUS);
return option return option
.setName("threshold") .setName('threshold')
.setNameLocalizations( .setNameLocalizations(
localizationObject( localizationObject(
(strings) => strings.bot.commands.inactive.options.threshold.name, (strings) => strings.bot.commands.inactive.options.threshold.name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
strings.bot.commands.inactive.options.threshold.description strings.bot.commands.inactive.options.threshold.description,
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.inactive.options.threshold.description strings.bot.commands.inactive.options.threshold.description,
) ),
) )
.setMinValue(0); .setMinValue(0);
}), }),
@@ -47,7 +47,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
const { region, id } = await resolveClanFromCommand(interaction); const { region, id } = await resolveClanFromCommand(interaction);
const threshold = const threshold =
interaction.options.getNumber("threshold")! ?? DEFAULT_THRESHOLD; interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
const time = new Date().getTime() / 1000; const time = new Date().getTime() / 1000;
const clanInfo = await getClanInfo(region, id); const clanInfo = await getClanInfo(region, id);
const accountInfo = await getAccountInfo(region, clanInfo.members_ids); const accountInfo = await getAccountInfo(region, clanInfo.members_ids);
@@ -57,7 +57,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
[ [
account.nickname, account.nickname,
(time - account.last_battle_time) / 60 / 60 / 24, (time - account.last_battle_time) / 60 / 60 / 24,
] as [string, number] ] as [string, number],
) )
.filter(([, inactiveDays]) => inactiveDays >= threshold) .filter(([, inactiveDays]) => inactiveDays >= threshold)
.sort((a, b) => b[1] - a[1]) .sort((a, b) => b[1] - a[1])
@@ -65,10 +65,10 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
([name, days]) => ([name, days]) =>
[ [
name, name,
literals(strings.bot.commands.inactive.body.listing, { literals(strings.bot.commands.inactive.body.listing, [
days: days.toFixed(0), days.toFixed(0),
}), ]),
] as [string, string] ] as [string, string],
); );
const hasInactiveMembers = inactive.length > 0; const hasInactiveMembers = inactive.length > 0;
@@ -79,7 +79,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanInfo.emblem_set_id}.png`} image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanInfo.emblem_set_id}.png`}
description={`${literals( description={`${literals(
strings.bot.commands.inactive.body.subtitle, strings.bot.commands.inactive.body.subtitle,
{ days: threshold } [`${threshold}`],
)} • ${new Date().toLocaleDateString(interaction.locale)}`} )} • ${new Date().toLocaleDateString(interaction.locale)}`}
/> />
+1 -1
View File
@@ -9,7 +9,7 @@ import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { embedInfo } from '../core/discord/embedInfo'; import { embedInfo } from '../core/discord/embedInfo';
import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand'; import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
import { translator } from '../core/localization/translator'; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from '../events/interactionCreate'; import { CommandRegistry } from '../events/interactionCreate';
import { theme } from '../stitches.config'; import { theme } from '../stitches.config';
export const verifyCommand = new Promise<CommandRegistry>((resolve) => { export const verifyCommand = new Promise<CommandRegistry>((resolve) => {
+22 -22
View File
@@ -5,31 +5,31 @@ import {
flags, flags,
getAccountInfo, getAccountInfo,
getTankStats, getTankStats,
} from "@blitzkit/core"; } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import markdownEscape from "markdown-escape"; import markdownEscape from 'markdown-escape';
import { import {
gameDefinitions, gameDefinitions,
tankDefinitions, tankDefinitions,
} from "../core/blitzkit/nonBlockingPromises"; } from '../core/blitzkit/nonBlockingPromises';
import { addTierChoices } from "../core/discord/addTierChoices"; import { addTierChoices } from '../core/discord/addTierChoices';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { autocompleteUsername } from "../core/discord/autocompleteUsername"; import { autocompleteUsername } from '../core/discord/autocompleteUsername';
import { chunkLines } from "../core/discord/chunkLines"; import { chunkLines } from '../core/discord/chunkLines';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand"; import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import { type CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => { export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
command: createLocalizedCommand("owned-tanks") command: createLocalizedCommand('owned-tanks')
.addStringOption(addTierChoices) .addStringOption(addTierChoices)
.addStringOption(addUsernameChoices), .addStringOption(addUsernameChoices),
async handler(interaction) { async handler(interaction) {
const { strings, unwrap } = translator(interaction.locale); const { strings, unwrap } = translator(interaction.locale);
const tier = Number(interaction.options.getString("tier")); const tier = Number(interaction.options.getString('tier'));
const { id, region } = await resolvePlayerFromCommand(interaction); const { id, region } = await resolvePlayerFromCommand(interaction);
const accountInfo = await getAccountInfo(region, id); const accountInfo = await getAccountInfo(region, id);
const tankStats = await getTankStats(region, id); const tankStats = await getTankStats(region, id);
@@ -43,7 +43,7 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
tankStats.map(async (tankData) => ({ tankStats.map(async (tankData) => ({
tankDefinitions: (await tankDefinitions).tanks[tankData.tank_id]!, tankDefinitions: (await tankDefinitions).tanks[tankData.tank_id]!,
id: tankData.tank_id, id: tankData.tank_id,
})) })),
) )
).filter((tank) => tank.tankDefinitions?.tier === tier); ).filter((tank) => tank.tankDefinitions?.tier === tier);
const groupedTanks: Record<string, TankDefinition[]> = {}; const groupedTanks: Record<string, TankDefinition[]> = {};
@@ -60,25 +60,25 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
const awaitedTankDefinitions = await tankDefinitions; const awaitedTankDefinitions = await tankDefinitions;
const awaitedGameDefinitions = await gameDefinitions; const awaitedGameDefinitions = await gameDefinitions;
const title = literals(strings.bot.commands.owned_tanks.body.title, { const title = literals(strings.bot.commands.owned_tanks.body.title, [
name: markdownEscape(accountInfo.nickname), markdownEscape(accountInfo.nickname),
tier: TIER_ROMAN_NUMERALS[tier], TIER_ROMAN_NUMERALS[tier],
}); ]);
const tankList = tankStats const tankList = tankStats
.map(({ tank_id }) => awaitedTankDefinitions.tanks[tank_id]) .map(({ tank_id }) => awaitedTankDefinitions.tanks[tank_id])
.filter((tank) => tank.tier === tier) .filter((tank) => tank.tier === tier)
.sort( .sort(
(a, b) => (a, b) =>
TANK_CLASSES.indexOf(a.class) - TANK_CLASSES.indexOf(b.class) TANK_CLASSES.indexOf(a.class) - TANK_CLASSES.indexOf(b.class),
) )
.sort( .sort(
(a, b) => (a, b) =>
awaitedGameDefinitions.nations.indexOf(a.nation) - awaitedGameDefinitions.nations.indexOf(a.nation) -
awaitedGameDefinitions.nations.indexOf(b.nation) awaitedGameDefinitions.nations.indexOf(b.nation),
) )
.map( .map(
(tank) => (tank) =>
`[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tanks/${tank.slug}>)` `[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tanks/${tank.slug}>)`,
); );
const lines = [title, ...tankList]; const lines = [title, ...tankList];
+13 -13
View File
@@ -1,11 +1,11 @@
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
export const permissionsCommand = new Promise<CommandRegistry>((resolve) => { export const permissionsCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
command: createLocalizedCommand("permissions"), command: createLocalizedCommand('permissions'),
async handler(interaction) { async handler(interaction) {
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
@@ -14,33 +14,33 @@ export const permissionsCommand = new Promise<CommandRegistry>((resolve) => {
new Date().getDay() === 5 && new Date().getDate() === 13; new Date().getDay() === 5 && new Date().getDate() === 13;
const permissions = [ const permissions = [
[ [
interaction.appPermissions?.has("ViewChannel"), interaction.appPermissions?.has('ViewChannel'),
strings.bot.commands.permissions.body.view_channels, strings.bot.commands.permissions.body.view_channels,
], ],
[ [
interaction.appPermissions?.has("ReadMessageHistory"), interaction.appPermissions?.has('ReadMessageHistory'),
strings.bot.commands.permissions.body.read_message_history, strings.bot.commands.permissions.body.read_message_history,
], ],
[ [
interaction.appPermissions?.has("AttachFiles"), interaction.appPermissions?.has('AttachFiles'),
strings.bot.commands.permissions.body.attach_files, strings.bot.commands.permissions.body.attach_files,
], ],
[ [
interaction.appPermissions?.has("UseExternalEmojis"), interaction.appPermissions?.has('UseExternalEmojis'),
strings.bot.commands.permissions.body.external_emojis, strings.bot.commands.permissions.body.external_emojis,
], ],
]; ];
const body = permissions const body = permissions
.map(([hasPermission, description]) => { .map(([hasPermission, description]) => {
if (hasPermission) { if (hasPermission) {
return `${isFridayThe13th ? "😇" : "✅"} ${description}`; return `${isFridayThe13th ? '😇' : '✅'} ${description}`;
} else { } else {
return `${isFridayThe13th ? "💀" : "❌"} ${description}`; return `${isFridayThe13th ? '💀' : '❌'} ${description}`;
} }
}) })
.join("\n"); .join('\n');
return literals(strings.bot.commands.permissions.body.title, { body }); return literals(strings.bot.commands.permissions.body.title, [body]);
}, },
}); });
}); });
+12 -12
View File
@@ -1,15 +1,15 @@
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
export const pingCommand = new Promise<CommandRegistry>((resolve) => { export const pingCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
handlesInteraction: true, handlesInteraction: true,
command: createLocalizedCommand("ping", [ command: createLocalizedCommand('ping', [
{ subcommand: "blitzkit" }, { subcommand: 'blitzkit' },
{ subcommand: "wotb" }, { subcommand: 'wotb' },
]), ]),
async handler(interaction) { async handler(interaction) {
@@ -17,17 +17,17 @@ export const pingCommand = new Promise<CommandRegistry>((resolve) => {
const subcommand = interaction.options.getSubcommand(); const subcommand = interaction.options.getSubcommand();
const executionStart = Date.now(); const executionStart = Date.now();
if (subcommand === "blitzkit") { if (subcommand === 'blitzkit') {
await interaction.editReply(strings.bot.commands.ping.body.pong); await interaction.editReply(strings.bot.commands.ping.body.pong);
} else { } else {
await fetch("https://api.wotblitz.com/"); await fetch('https://api.wotblitz.com/');
} }
const executionTime = Date.now() - executionStart; const executionTime = Date.now() - executionStart;
interaction.editReply( interaction.editReply(
literals(strings.bot.commands.ping.body.pong_with_time, { literals(strings.bot.commands.ping.body.pong_with_time, [
time: executionTime.toFixed(0), `${Math.round(executionTime)}`,
}) ]),
); );
}, },
}); });
+18 -18
View File
@@ -1,19 +1,19 @@
import { getAccountInfo } from "@blitzkit/core"; import { getAccountInfo } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import markdownEscape from "markdown-escape"; import markdownEscape from 'markdown-escape';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { autocompleteUsername } from "../core/discord/autocompleteUsername"; import { autocompleteUsername } from '../core/discord/autocompleteUsername';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { embedInfo } from "../core/discord/embedInfo"; import { embedInfo } from '../core/discord/embedInfo';
import { markdownTable } from "../core/discord/markdownTable"; import { markdownTable } from '../core/discord/markdownTable';
import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand"; import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => { export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
command: command:
createLocalizedCommand("player-info").addStringOption(addUsernameChoices), createLocalizedCommand('player-info').addStringOption(addUsernameChoices),
async handler(interaction) { async handler(interaction) {
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
@@ -22,9 +22,9 @@ export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
const accountInfo = await getAccountInfo(region, id); const accountInfo = await getAccountInfo(region, id);
return embedInfo( return embedInfo(
literals(strings.bot.commands.player_info.body.title, { literals(strings.bot.commands.player_info.body.title, [
name: markdownEscape(accountInfo.nickname), markdownEscape(accountInfo.nickname),
}), ]),
markdownTable([ markdownTable([
[ [
@@ -51,16 +51,16 @@ export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
[ [
strings.bot.commands.player_info.body.created, strings.bot.commands.player_info.body.created,
new Date(accountInfo.created_at * 1000).toLocaleDateString( new Date(accountInfo.created_at * 1000).toLocaleDateString(
interaction.locale interaction.locale,
), ),
], ],
[ [
strings.bot.commands.player_info.body.last_battle, strings.bot.commands.player_info.body.last_battle,
new Date(accountInfo.last_battle_time * 1000).toLocaleDateString( new Date(accountInfo.last_battle_time * 1000).toLocaleDateString(
interaction.locale interaction.locale,
), ),
], ],
]) ]),
); );
}, },
+118 -118
View File
@@ -8,42 +8,42 @@ import {
getRatingInfo, getRatingInfo,
getRatingNeighbors, getRatingNeighbors,
imgur, imgur,
} from "@blitzkit/core"; } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { SlashCommandSubcommandBuilder } from "discord.js"; import { SlashCommandSubcommandBuilder } from 'discord.js';
import markdownEscape from "markdown-escape"; import markdownEscape from 'markdown-escape';
import { Glow } from "../components/AllStatsOverview/components/HeroStat/components/Glow"; import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
import { CommandWrapper } from "../components/CommandWrapper"; import { CommandWrapper } from '../components/CommandWrapper';
import { DeltaCaret } from "../components/DeltaCaret"; import { DeltaCaret } from '../components/DeltaCaret';
import { TitleBar } from "../components/TitleBar"; import { TitleBar } from '../components/TitleBar';
import { normalizeLeagueIcon } from "../core/blitz/normalizeLeagueIcon"; import { normalizeLeagueIcon } from '../core/blitz/normalizeLeagueIcon';
import { iconPng } from "../core/blitzkit/iconPng"; import { iconPng } from '../core/blitzkit/iconPng';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand"; import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
import { theme } from "../stitches.config"; import { theme } from '../stitches.config';
const LEAGUE_ACCENT = [ const LEAGUE_ACCENT = [
"_purple", '_purple',
"_sand", '_sand',
"_amber", '_amber',
"_mauve", '_mauve',
"_brown", '_brown',
] as const; ] as const;
export const ratingCommand = new Promise<CommandRegistry>((resolve) => { export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
command: createLocalizedCommand("rating", [ command: createLocalizedCommand('rating', [
{ {
subcommand: "today", subcommand: 'today',
modify(option: SlashCommandSubcommandBuilder) { modify(option: SlashCommandSubcommandBuilder) {
option.addStringOption(addUsernameChoices); option.addStringOption(addUsernameChoices);
}, },
}, },
{ {
subcommand: "season", subcommand: 'season',
modify(option: SlashCommandSubcommandBuilder) { modify(option: SlashCommandSubcommandBuilder) {
option.addStringOption(addUsernameChoices); option.addStringOption(addUsernameChoices);
}, },
@@ -52,11 +52,11 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
async handler(interaction) { async handler(interaction) {
const subcommand = interaction.options.getSubcommand(true) as const subcommand = interaction.options.getSubcommand(true) as
| "season" | 'season'
| "today"; | 'today';
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
const { id, region } = await resolvePlayerFromCommand(interaction); const { id, region } = await resolvePlayerFromCommand(interaction);
const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan; const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined; const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
const ratingInfo = await getRatingInfo(region); const ratingInfo = await getRatingInfo(region);
@@ -67,20 +67,20 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
const leaderboard = await getArchivedRatingLeaderboard( const leaderboard = await getArchivedRatingLeaderboard(
region, region,
ratingInfo.current_season - (subcommand === "today" ? 0 : 1) ratingInfo.current_season - (subcommand === 'today' ? 0 : 1),
); );
if (leaderboard.version!.$case === "v1") { if (leaderboard.version!.$case === 'v1') {
throw new Error( throw new Error(
"Encountered bkrl minimal format in latest season. Wait till next cron?" 'Encountered bkrl minimal format in latest season. Wait till next cron?',
); );
} }
const accountInfo = await getAccountInfo(region, id, [ const accountInfo = await getAccountInfo(region, id, [
"statistics.rating", 'statistics.rating',
]); ]);
const statsIndex = leaderboard.version!.value.entries.findIndex( const statsIndex = leaderboard.version!.value.entries.findIndex(
(entry) => entry.id === id (entry) => entry.id === id,
); );
const statsA = leaderboard const statsA = leaderboard
? leaderboard.version!.value.entries[statsIndex!] ? leaderboard.version!.value.entries[statsIndex!]
@@ -90,9 +90,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
const statsB2Array = (await getRatingNeighbors(region, id, 0)).neighbors; const statsB2Array = (await getRatingNeighbors(region, id, 0)).neighbors;
if (statsB2Array === undefined) { if (statsB2Array === undefined) {
return literals(strings.bot.commands.rating.errors.no_participation, { return literals(strings.bot.commands.rating.errors.no_participation, [
name: markdownEscape(accountInfo.nickname), markdownEscape(accountInfo.nickname),
}); ]);
} }
const [statsB2] = statsB2Array; const [statsB2] = statsB2Array;
@@ -102,15 +102,15 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
return strings.bot.commands.rating.errors.unrecorded_stats; return strings.bot.commands.rating.errors.unrecorded_stats;
} }
if (!statsB1) { if (!statsB1) {
return literals(strings.bot.commands.rating.errors.no_participation, { return literals(strings.bot.commands.rating.errors.no_participation, [
name: markdownEscape(accountInfo.nickname), markdownEscape(accountInfo.nickname),
}); ]);
} }
const reward = ratingInfo.rewards.find( const reward = ratingInfo.rewards.find(
(reward) => (reward) =>
statsB2.number >= reward.from_position && statsB2.number >= reward.from_position &&
statsB2.number <= reward.to_position statsB2.number <= reward.to_position,
); );
const positionDelta = leaderboard const positionDelta = leaderboard
? statsB2.number - positionA! ? statsB2.number - positionA!
@@ -118,11 +118,11 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
const delta = deltaBkrlBlitzStats( const delta = deltaBkrlBlitzStats(
statsA, statsA,
accountInfo.statistics.rating!, accountInfo.statistics.rating!,
statsB2 statsB2,
); );
const leagueTheme = LEAGUE_ACCENT[league.index]; const leagueTheme = LEAGUE_ACCENT[league.index];
let rewardImage = reward let rewardImage = reward
? reward.type === "vehicle" ? reward.type === 'vehicle'
? reward.vehicle.preview_image_url ? reward.vehicle.preview_image_url
: reward.stuff.image_url : reward.stuff.image_url
: undefined; : undefined;
@@ -131,7 +131,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
const { ok } = await fetch(rewardImage); const { ok } = await fetch(rewardImage);
if (!ok) { if (!ok) {
rewardImage = imgur("kP88vqr"); rewardImage = imgur('kP88vqr');
} }
} }
@@ -147,24 +147,24 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
position: "relative", position: 'relative',
display: "flex", display: 'flex',
overflow: "hidden", overflow: 'hidden',
}} }}
> >
<div <div
style={{ style={{
position: "relative", position: 'relative',
padding: 16, padding: 16,
backgroundColor: theme.colors[`appBackground2${leagueTheme}`], backgroundColor: theme.colors[`appBackground2${leagueTheme}`],
borderRadius: 4, borderRadius: 4,
border: `1px solid ${ border: `1px solid ${
theme.colors[`componentInteractive${leagueTheme}`] theme.colors[`componentInteractive${leagueTheme}`]
}`, }`,
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "space-between", justifyContent: 'space-between',
width: "100%", width: '100%',
}} }}
> >
{reward === undefined && ( {reward === undefined && (
@@ -172,17 +172,17 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
endOpacity={3 / 4} endOpacity={3 / 4}
color={theme.colors[`solidBackground${leagueTheme}`]} color={theme.colors[`solidBackground${leagueTheme}`]}
style={{ style={{
transform: "translateX(-16px) rotate(90deg)", transform: 'translateX(-16px) rotate(90deg)',
}} }}
/> />
)} )}
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 8, gap: 8,
justifyContent: "center", justifyContent: 'center',
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
@@ -190,24 +190,24 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
style={{ style={{
width: 64, width: 64,
height: 64, height: 64,
objectFit: "contain", objectFit: 'contain',
}} }}
src={normalizeLeagueIcon( src={normalizeLeagueIcon(
ratingInfo.leagues[league.index].big_icon ratingInfo.leagues[league.index].big_icon,
)} )}
/> />
<div <div
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "flex-start", justifyContent: 'flex-start',
}} }}
> >
<span <span
@@ -232,7 +232,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
}} }}
> >
{Math.abs(delta.score).toLocaleString( {Math.abs(delta.score).toLocaleString(
interaction.locale interaction.locale,
)} )}
</span> </span>
</> </>
@@ -241,9 +241,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "flex-start", justifyContent: 'flex-start',
}} }}
> >
<span <span
@@ -267,7 +267,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
}} }}
> >
{Math.abs(positionDelta).toLocaleString( {Math.abs(positionDelta).toLocaleString(
interaction.locale interaction.locale,
)} )}
</span> </span>
</> </>
@@ -279,23 +279,23 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
{reward && ( {reward && (
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 8, gap: 8,
justifyContent: "center", justifyContent: 'center',
alignItems: "center", alignItems: 'center',
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "flex-end", justifyContent: 'flex-end',
}} }}
> >
<span <span
@@ -303,13 +303,13 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
color: theme.colors[`textHighContrast${leagueTheme}`], color: theme.colors[`textHighContrast${leagueTheme}`],
fontSize: 16, fontSize: 16,
maxWidth: 136, maxWidth: 136,
textAlign: "right", textAlign: 'right',
whiteSpace: "nowrap", whiteSpace: 'nowrap',
textOverflow: "ellipsis", textOverflow: 'ellipsis',
overflow: "hidden", overflow: 'hidden',
}} }}
> >
{reward.type === "vehicle" {reward.type === 'vehicle'
? reward.vehicle.user_string ? reward.vehicle.user_string
: reward.stuff.title} : reward.stuff.title}
</span> </span>
@@ -317,9 +317,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "flex-end", justifyContent: 'flex-end',
}} }}
> >
<span <span
@@ -329,7 +329,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
}} }}
> >
Reward Reward
{reward.type === "stuff" ? ` x${reward.count}` : ""} {reward.type === 'stuff' ? ` x${reward.count}` : ''}
</span> </span>
</div> </div>
</div> </div>
@@ -338,7 +338,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
style={{ style={{
width: 64, width: 64,
height: 64, height: 64,
objectFit: "cover", objectFit: 'cover',
}} }}
src={await iconPng(rewardImage!)} src={await iconPng(rewardImage!)}
/> />
@@ -350,7 +350,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
endOpacity={3 / 4} endOpacity={3 / 4}
color={theme.colors[`solidBackground${leagueTheme}`]} color={theme.colors[`solidBackground${leagueTheme}`]}
style={{ style={{
transform: "translateX(16px) rotate(-90deg)", transform: 'translateX(16px) rotate(-90deg)',
}} }}
/> />
)} )}
@@ -362,10 +362,10 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
direction="reverse" direction="reverse"
color={theme.colors[`solidBackground${leagueTheme}`]} color={theme.colors[`solidBackground${leagueTheme}`]}
style={{ style={{
position: "absolute", position: 'absolute',
top: -40, top: -40,
left: "50%", left: '50%',
transform: "translateX(-50%)", transform: 'translateX(-50%)',
}} }}
/> />
)} )}
@@ -373,32 +373,32 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
<Glow <Glow
color={theme.colors[`solidBackground${leagueTheme}`]} color={theme.colors[`solidBackground${leagueTheme}`]}
style={{ style={{
position: "absolute", position: 'absolute',
bottom: -40, bottom: -40,
left: "50%", left: '50%',
transform: "translateX(-50%)", transform: 'translateX(-50%)',
}} }}
/> />
)} )}
</div> </div>
{delta.battles > 0 && ( {delta.battles > 0 && (
<div style={{ padding: "8px 0", display: "flex" }}> <div style={{ padding: '8px 0', display: 'flex' }}>
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
flex: 1, flex: 1,
flexDirection: "column", flexDirection: 'column',
}} }}
> >
<span <span
style={{ style={{
fontSize: 24, fontSize: 24,
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
fontWeight: "bold", fontWeight: 'bold',
}} }}
> >
{delta.battles.toLocaleString(interaction.locale)} {delta.battles.toLocaleString(interaction.locale)}
@@ -414,19 +414,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
</div> </div>
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
flex: 1, flex: 1,
flexDirection: "column", flexDirection: 'column',
}} }}
> >
<span <span
style={{ style={{
fontSize: 24, fontSize: 24,
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
fontWeight: "bold", fontWeight: 'bold',
}} }}
> >
{(100 * (delta.wins / delta.battles)).toFixed(0)}% {(100 * (delta.wins / delta.battles)).toFixed(0)}%
@@ -442,23 +442,23 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
</div> </div>
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
flex: 1, flex: 1,
flexDirection: "column", flexDirection: 'column',
}} }}
> >
<span <span
style={{ style={{
fontSize: 24, fontSize: 24,
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
fontWeight: "bold", fontWeight: 'bold',
}} }}
> >
{Math.round(delta.damage / delta.battles).toLocaleString( {Math.round(delta.damage / delta.battles).toLocaleString(
interaction.locale interaction.locale,
)} )}
</span> </span>
<span <span
@@ -472,19 +472,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
</div> </div>
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
flex: 1, flex: 1,
flexDirection: "column", flexDirection: 'column',
}} }}
> >
<span <span
style={{ style={{
fontSize: 24, fontSize: 24,
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
fontWeight: "bold", fontWeight: 'bold',
}} }}
> >
{(100 * (delta.survived / delta.battles)).toFixed(0)}% {(100 * (delta.survived / delta.battles)).toFixed(0)}%
@@ -500,19 +500,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
</div> </div>
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
flex: 1, flex: 1,
flexDirection: "column", flexDirection: 'column',
}} }}
> >
<span <span
style={{ style={{
fontSize: 24, fontSize: 24,
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
fontWeight: "bold", fontWeight: 'bold',
}} }}
> >
{(delta.kills / delta.battles).toFixed(2)} {(delta.kills / delta.battles).toFixed(2)}
+83 -82
View File
@@ -10,30 +10,30 @@ import {
imgur, imgur,
isOnGoingRatingSeason, isOnGoingRatingSeason,
LEAGUES, LEAGUES,
type RatingInfo, RatingInfo,
RatingLeaderboard, RatingLeaderboard,
type Region, Region,
} from "@blitzkit/core"; } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { import {
type APIApplicationCommandOptionChoice, APIApplicationCommandOptionChoice,
Locale, Locale,
SlashCommandSubcommandBuilder, SlashCommandSubcommandBuilder,
} from "discord.js"; } from 'discord.js';
import { range } from "lodash-es"; import { range } from 'lodash-es';
import markdownEscape from "markdown-escape"; import markdownEscape from 'markdown-escape';
import { CommandWrapper } from "../components/CommandWrapper"; import { CommandWrapper } from '../components/CommandWrapper';
import * as Leaderboard from "../components/Leaderboard"; import * as Leaderboard from '../components/Leaderboard';
import { TitleBar } from "../components/TitleBar"; import { TitleBar } from '../components/TitleBar';
import { UserError } from "../core/blitzkit/userError"; import { UserError } from '../core/blitzkit/userError';
import { addRegionChoices } from "../core/discord/addRegionChoices"; import { addRegionChoices } from '../core/discord/addRegionChoices';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { autocompleteUsername } from "../core/discord/autocompleteUsername"; import { autocompleteUsername } from '../core/discord/autocompleteUsername';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { localizationObject } from "../core/discord/localizationObject"; import { localizationObject } from '../core/discord/localizationObject';
import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand"; import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
interface SimplifiedPlayer { interface SimplifiedPlayer {
id: number; id: number;
@@ -51,7 +51,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
const onGoingSeason = await isOnGoingRatingSeason(); const onGoingSeason = await isOnGoingRatingSeason();
const seasonNumbers = range( const seasonNumbers = range(
FIRST_MINIMAL_ARCHIVED_RATING_SEASON, FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1 latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1,
); );
function addOptions(option: SlashCommandSubcommandBuilder) { function addOptions(option: SlashCommandSubcommandBuilder) {
@@ -66,50 +66,51 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
(strings) => (strings) =>
strings.bot.commands.rating_leaderboard.options.limit.name, strings.bot.commands.rating_leaderboard.options.limit.name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
literals( literals(
strings.bot.commands.rating_leaderboard.options.limit strings.bot.commands.rating_leaderboard.options.limit
.description, .description,
{ count: DEFAULT_LIMIT } [`${DEFAULT_LIMIT}`],
) ),
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.rating_leaderboard.options.limit strings.bot.commands.rating_leaderboard.options.limit
.description, .description,
{ count: DEFAULT_LIMIT } [`${DEFAULT_LIMIT}`],
) ),
) )
.setRequired(false) .setRequired(false)
.setMinValue(5) .setMinValue(5)
.setMaxValue(30) .setMaxValue(30),
) )
.addStringOption((option) => .addStringOption((option) =>
option option
.setName( .setName(
strings.bot.commands.rating_leaderboard.options.season.name strings.bot.commands.rating_leaderboard.options.season.name,
) )
.setNameLocalizations( .setNameLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.rating_leaderboard.options.season.name, strings.bot.commands.rating_leaderboard.options.season.name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
strings.bot.commands.rating_leaderboard.options.season.description strings.bot.commands.rating_leaderboard.options.season
.description,
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.rating_leaderboard.options.season strings.bot.commands.rating_leaderboard.options.season
.description .description,
) ),
) )
.setRequired(false) .setRequired(false)
.addChoices( .addChoices(
@@ -123,7 +124,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
? literals( ? literals(
strings.bot.commands.rating_leaderboard.options.season strings.bot.commands.rating_leaderboard.options.season
.choices.current, .choices.current,
{ season: number } [`${number}`],
) )
: `${number}`, : `${number}`,
value: `${number}`, value: `${number}`,
@@ -132,27 +133,27 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
(strings) => (strings) =>
strings.bot.commands.rating_leaderboard.options strings.bot.commands.rating_leaderboard.options
.season.choices.current, .season.choices.current,
{ season: number } [`${number}`],
) )
: undefined, : undefined,
} satisfies APIApplicationCommandOptionChoice<string>; } satisfies APIApplicationCommandOptionChoice<string>;
}) })
.reverse() .reverse(),
) ),
); );
} }
resolve({ resolve({
command: createLocalizedCommand("rating-leaderboard", [ command: createLocalizedCommand('rating-leaderboard', [
{ {
subcommand: "neighbors", subcommand: 'neighbors',
modify(option: SlashCommandSubcommandBuilder) { modify(option: SlashCommandSubcommandBuilder) {
option.addStringOption(addUsernameChoices); option.addStringOption(addUsernameChoices);
addOptions(option); addOptions(option);
}, },
}, },
{ {
subcommand: "league", subcommand: 'league',
modify(option: SlashCommandSubcommandBuilder) { modify(option: SlashCommandSubcommandBuilder) {
option option
.addStringOption((option) => { .addStringOption((option) => {
@@ -160,7 +161,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
return option return option
.setName( .setName(
strings.bot.commands.rating_leaderboard.options.league.name strings.bot.commands.rating_leaderboard.options.league.name,
) )
.setNameLocalizations( .setNameLocalizations(
localizationObject( localizationObject(
@@ -168,19 +169,19 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
strings.bot.commands.rating_leaderboard.options.league strings.bot.commands.rating_leaderboard.options.league
.name, .name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
strings.bot.commands.rating_leaderboard.options.league strings.bot.commands.rating_leaderboard.options.league
.description .description,
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.rating_leaderboard.options.league strings.bot.commands.rating_leaderboard.options.league
.description .description,
) ),
) )
.addChoices( .addChoices(
...LEAGUES.map( ...LEAGUES.map(
@@ -194,10 +195,10 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
(strings) => (strings) =>
( (
strings.common.leagues as Record<string, string> strings.common.leagues as Record<string, string>
)[name] )[name],
),
}) satisfies APIApplicationCommandOptionChoice<string>,
), ),
}) satisfies APIApplicationCommandOptionChoice<string>
)
) )
.setRequired(true); .setRequired(true);
}) })
@@ -212,10 +213,10 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
async handler(interaction) { async handler(interaction) {
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
const subcommand = interaction.options.getSubcommand(true) as const subcommand = interaction.options.getSubcommand(true) as
| "league" | 'league'
| "neighbors"; | 'neighbors';
const limit = interaction.options.getInteger("limit") ?? DEFAULT_LIMIT; const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT;
const seasonOption = interaction.options.getString("season"); const seasonOption = interaction.options.getString('season');
const season = seasonOption const season = seasonOption
? parseInt(seasonOption) ? parseInt(seasonOption)
: onGoingSeason : onGoingSeason
@@ -231,11 +232,11 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
let playerId: number | undefined; let playerId: number | undefined;
let regionRatingInfo: RatingInfo | null; let regionRatingInfo: RatingInfo | null;
if (subcommand === "league") { if (subcommand === 'league') {
const leagueIndex = parseInt( const leagueIndex = parseInt(
interaction.options.getString("league")! interaction.options.getString('league')!,
); );
const region = interaction.options.getString("region") as Region; const region = interaction.options.getString('region') as Region;
regionRatingInfo = await (isCurrentSeason regionRatingInfo = await (isCurrentSeason
? getRatingInfo(region) ? getRatingInfo(region)
: null); : null);
@@ -258,8 +259,8 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
position: player.number, position: player.number,
clan: player.clan_tag, clan: player.clan_tag,
nickname: player.nickname, nickname: player.nickname,
}) satisfies SimplifiedPlayer }) satisfies SimplifiedPlayer,
) ),
) )
: await getArchivedRatingLeaderboard(region, season!).then( : await getArchivedRatingLeaderboard(region, season!).then(
async (players) => { async (players) => {
@@ -268,17 +269,17 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
? 0 ? 0
: players.version!.value.entries.findIndex( : players.version!.value.entries.findIndex(
(player) => (player) =>
player.score < LEAGUES[leagueIndex - 1].minScore player.score < LEAGUES[leagueIndex - 1].minScore,
); );
const lastPlayerIndex = firstPlayerIndex + limit - 1; const lastPlayerIndex = firstPlayerIndex + limit - 1;
const trimmed = players.version!.value.entries.slice( const trimmed = players.version!.value.entries.slice(
firstPlayerIndex, firstPlayerIndex,
lastPlayerIndex + 1 lastPlayerIndex + 1,
); );
const clanData = await getClanAccountInfo( const clanData = await getClanAccountInfo(
region, region,
trimmed.map(({ id }) => id), trimmed.map(({ id }) => id),
["clan"] ['clan'],
); );
return trimmed.map( return trimmed.map(
@@ -293,16 +294,16 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
literals( literals(
strings.bot.commands.rating_leaderboard.body strings.bot.commands.rating_leaderboard.body
.deleted_player, .deleted_player,
{ id: player.id } [`${player.id}`],
), ),
}) satisfies SimplifiedPlayer }) satisfies SimplifiedPlayer,
); );
} },
); );
const leagueInfo = LEAGUES[leagueIndex]; const leagueInfo = LEAGUES[leagueIndex];
archivedLeaderboard = await getArchivedRatingLeaderboard( archivedLeaderboard = await getArchivedRatingLeaderboard(
region, region,
season season,
); );
players = result; players = result;
@@ -315,12 +316,12 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
? (strings.common.leagues as Record<string, string>)[ ? (strings.common.leagues as Record<string, string>)[
LEAGUES[leagueInfo.index].name LEAGUES[leagueInfo.index].name
] ]
: "" : ''
} - ${strings.common.regions.short[region]}`; } - ${strings.common.regions.short[region]}`;
titleImage = imgur(leagueInfo.icon); titleImage = imgur(leagueInfo.icon);
titleDescription = literals( titleDescription = literals(
strings.bot.commands.rating_leaderboard.body.top_players, strings.bot.commands.rating_leaderboard.body.top_players,
{ count: limit } [`${limit}`],
); );
} else { } else {
const { region, id } = await resolvePlayerFromCommand(interaction); const { region, id } = await resolvePlayerFromCommand(interaction);
@@ -337,7 +338,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
} }
const accountInfo = await getAccountInfo(region, id); const accountInfo = await getAccountInfo(region, id);
const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan; const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
const neighbors = isCurrentSeason const neighbors = isCurrentSeason
? await getRatingNeighbors(region, id, Math.round(limit / 2)).then( ? await getRatingNeighbors(region, id, Math.round(limit / 2)).then(
(players) => (players) =>
@@ -349,13 +350,13 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
score: player.score, score: player.score,
clan: player.clan_tag, clan: player.clan_tag,
nickname: player.nickname, nickname: player.nickname,
}) satisfies SimplifiedPlayer }) satisfies SimplifiedPlayer,
) ),
) )
: await getArchivedRatingLeaderboard(region, season!).then( : await getArchivedRatingLeaderboard(region, season!).then(
async (players) => { async (players) => {
const playerIndex = players.version!.value.entries.findIndex( const playerIndex = players.version!.value.entries.findIndex(
(player) => player.id === id (player) => player.id === id,
); );
if (playerIndex === -1) { if (playerIndex === -1) {
@@ -363,20 +364,20 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
literals( literals(
strings.bot.commands.rating_leaderboard.body strings.bot.commands.rating_leaderboard.body
.no_participation, .no_participation,
{ player: markdownEscape(accountInfo.nickname), season } [markdownEscape(accountInfo.nickname), `${season}`],
) ),
); );
} }
const halfRange = Math.round(limit / 2); const halfRange = Math.round(limit / 2);
const trimmed = players.version!.value.entries.slice( const trimmed = players.version!.value.entries.slice(
playerIndex - halfRange, playerIndex - halfRange,
playerIndex + halfRange + 1 playerIndex + halfRange + 1,
); );
const clanData = await getClanAccountInfo( const clanData = await getClanAccountInfo(
region, region,
trimmed.map((player) => player.id), trimmed.map((player) => player.id),
["clan"] ['clan'],
); );
return trimmed.map((player, index) => ({ return trimmed.map((player, index) => ({
@@ -388,18 +389,18 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
? clanData[index]!.account_name ? clanData[index]!.account_name
: `Deleted ${player.id}`, : `Deleted ${player.id}`,
})); }));
} },
); );
archivedLeaderboard = await getArchivedRatingLeaderboard( archivedLeaderboard = await getArchivedRatingLeaderboard(
region, region,
season season,
); );
players = neighbors; players = neighbors;
titleImage = clan titleImage = clan
? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png` ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
: undefined; : undefined;
titleName = neighbors ? accountInfo.nickname : ""; titleName = neighbors ? accountInfo.nickname : '';
titleDescription = titleDescription =
strings.bot.commands.rating_leaderboard.body.neighbors; strings.bot.commands.rating_leaderboard.body.neighbors;
playersAfter = playersAfter =
@@ -413,7 +414,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
const items = players.map((player) => { const items = players.map((player) => {
const midnightIndex = const midnightIndex =
archivedLeaderboard?.version!.value.entries.findIndex( archivedLeaderboard?.version!.value.entries.findIndex(
(item) => item.id === player.id (item) => item.id === player.id,
); );
const midnightScore = const midnightScore =
midnightIndex === undefined midnightIndex === undefined
@@ -452,7 +453,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
<Leaderboard.Gap <Leaderboard.Gap
message={literals( message={literals(
strings.bot.commands.rating_leaderboard.body.more, strings.bot.commands.rating_leaderboard.body.more,
{ count: playersAfter.toLocaleString(interaction.locale) } [`${playersAfter.toLocaleString(interaction.locale)}`],
)} )}
/> />
)} )}
@@ -464,5 +465,5 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
autocomplete: autocompleteUsername, autocomplete: autocompleteUsername,
}); });
} },
); );
+1 -1
View File
@@ -20,7 +20,7 @@ import { blitzStarsTankAverages } from '../core/blitzstars/tankAverages';
import { buttonLink } from '../core/discord/buttonLink'; import { buttonLink } from '../core/discord/buttonLink';
import { createLocalizedCommand } from '../core/discord/createLocalizedCommand'; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { translator } from '../core/localization/translator'; import { translator } from '../core/localization/translator';
import { type CommandRegistry } from '../events/interactionCreate'; import { CommandRegistry } from '../events/interactionCreate';
import { theme } from '../stitches.config'; import { theme } from '../stitches.config';
type WotInspectorReplaySubmission = type WotInspectorReplaySubmission =
+144 -138
View File
@@ -8,31 +8,31 @@ import {
TANK_ICONS, TANK_ICONS,
TankType, TankType,
TIER_ROMAN_NUMERALS, TIER_ROMAN_NUMERALS,
} from "@blitzkit/core"; } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { escapeMarkdown, Locale } from "discord.js"; import { escapeMarkdown, Locale } from 'discord.js';
import { CommandWrapper } from "../components/CommandWrapper"; import { CommandWrapper } from '../components/CommandWrapper';
import { TitleBar } from "../components/TitleBar"; import { TitleBar } from '../components/TitleBar';
import { resolveTankId } from "../core/blitz/resolveTankId"; import { resolveTankId } from '../core/blitz/resolveTankId';
import { buildTechTreeLine } from "../core/blitzkit/buildTechTreeLine"; import { buildTechTreeLine } from '../core/blitzkit/buildTechTreeLine';
import { iconPng } from "../core/blitzkit/iconPng"; import { iconPng } from '../core/blitzkit/iconPng';
import { tankDefinitions } from "../core/blitzkit/nonBlockingPromises"; import { tankDefinitions } from '../core/blitzkit/nonBlockingPromises';
import { resolveAncestry } from "../core/blitzkit/resolveAncestry"; import { resolveAncestry } from '../core/blitzkit/resolveAncestry';
import { tankIconPng } from "../core/blitzkit/tankIconPng"; import { tankIconPng } from '../core/blitzkit/tankIconPng';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { autocompleteTanks } from "../core/discord/autocompleteTanks"; import { autocompleteTanks } from '../core/discord/autocompleteTanks';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { localizationObject } from "../core/discord/localizationObject"; import { localizationObject } from '../core/discord/localizationObject';
import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand"; import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import { type CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
import { theme } from "../stitches.config"; import { theme } from '../stitches.config';
export const researchCommand = new Promise<CommandRegistry>((resolve) => { export const researchCommand = new Promise<CommandRegistry>((resolve) => {
const { strings } = translator(Locale.EnglishUS); const { strings } = translator(Locale.EnglishUS);
resolve({ resolve({
command: createLocalizedCommand("research") command: createLocalizedCommand('research')
.addStringOption((option) => .addStringOption((option) =>
option option
.setName(strings.bot.commands.research.options.target_tank.name) .setName(strings.bot.commands.research.options.target_tank.name)
@@ -41,20 +41,20 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
(strings) => (strings) =>
strings.bot.commands.research.options.target_tank.name, strings.bot.commands.research.options.target_tank.name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
strings.bot.commands.research.options.target_tank.description strings.bot.commands.research.options.target_tank.description,
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.research.options.target_tank.description strings.bot.commands.research.options.target_tank.description,
) ),
) )
.setAutocomplete(true) .setAutocomplete(true)
.setRequired(true) .setRequired(true),
) )
.addStringOption((option) => .addStringOption((option) =>
option option
@@ -64,20 +64,20 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
(strings) => (strings) =>
strings.bot.commands.research.options.starting_tank.name, strings.bot.commands.research.options.starting_tank.name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
strings.bot.commands.research.options.starting_tank.description strings.bot.commands.research.options.starting_tank.description,
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.research.options.starting_tank.description strings.bot.commands.research.options.starting_tank.description,
) ),
) )
.setAutocomplete(true) .setAutocomplete(true)
.setRequired(false) .setRequired(false),
) )
.addStringOption(addUsernameChoices), .addStringOption(addUsernameChoices),
@@ -85,11 +85,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
const { strings, unwrap } = translator(interaction.locale); const { strings, unwrap } = translator(interaction.locale);
const awaitedTankDefinitions = await tankDefinitions; const awaitedTankDefinitions = await tankDefinitions;
const targetTankId = await resolveTankId( const targetTankId = await resolveTankId(
interaction.options.getString("target-tank", true), interaction.options.getString('target-tank', true),
interaction.locale, interaction.locale,
true true,
); );
const startingTankRaw = interaction.options.getString("starting-tank"); const startingTankRaw = interaction.options.getString('starting-tank');
const targetTank = awaitedTankDefinitions.tanks[targetTankId]; const targetTank = awaitedTankDefinitions.tanks[targetTankId];
const { id, region } = await resolvePlayerFromCommand(interaction); const { id, region } = await resolvePlayerFromCommand(interaction);
let startingTankId: number; let startingTankId: number;
@@ -99,45 +99,46 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
startingTankId = await resolveTankId( startingTankId = await resolveTankId(
startingTankRaw, startingTankRaw,
interaction.locale, interaction.locale,
true true,
); );
if (targetTankId === startingTankId) { if (targetTankId === startingTankId) {
return literals( return literals(
strings.bot.commands.research.errors.start_end_equal, strings.bot.commands.research.errors.start_end_equal,
{ tank: escapeMarkdown(unwrap(targetTank.name)) } [escapeMarkdown(unwrap(targetTank.name))],
); );
} }
const startingTank = awaitedTankDefinitions.tanks[startingTankId]; const startingTank = awaitedTankDefinitions.tanks[startingTankId];
if (startingTank.tier > targetTank.tier) { if (startingTank.tier > targetTank.tier) {
return literals(strings.bot.commands.research.errors.unordered, { return literals(strings.bot.commands.research.errors.unordered, [
tank_1: escapeMarkdown(unwrap(startingTank.name)), escapeMarkdown(unwrap(startingTank.name)),
tank_2: escapeMarkdown(unwrap(targetTank.name)), escapeMarkdown(unwrap(targetTank.name)),
}); escapeMarkdown(unwrap(targetTank.name)),
]);
} }
if (!targetTankAncestry.includes(startingTankId)) { if (!targetTankAncestry.includes(startingTankId)) {
return literals( return literals(
strings.bot.commands.research.errors.tanks_not_on_line, strings.bot.commands.research.errors.tanks_not_on_line,
{ [
tank_1: escapeMarkdown(unwrap(targetTank.name)), escapeMarkdown(unwrap(targetTank.name)),
tank_2: escapeMarkdown(unwrap(startingTank.name)), escapeMarkdown(unwrap(startingTank.name)),
} ],
); );
} }
} else { } else {
if (targetTank.type !== TankType.RESEARCHABLE) { if (targetTank.type !== TankType.RESEARCHABLE) {
return literals(strings.bot.commands.research.errors.non_tech_tree, { return literals(strings.bot.commands.research.errors.non_tech_tree, [
tank: escapeMarkdown(unwrap(targetTank.name)), escapeMarkdown(unwrap(targetTank.name)),
}); ]);
} }
if (targetTank.tier === 1) { if (targetTank.tier === 1) {
return literals(strings.bot.commands.research.errors.tier_1, { return literals(strings.bot.commands.research.errors.tier_1, [
tank: escapeMarkdown(unwrap(targetTank.name)), escapeMarkdown(unwrap(targetTank.name)),
}); ]);
} }
const tankStats = await getTankStats(region, id); const tankStats = await getTankStats(region, id);
@@ -149,18 +150,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
if (tankStats.some(({ tank_id }) => tank_id === targetTankId)) { if (tankStats.some(({ tank_id }) => tank_id === targetTankId)) {
return literals( return literals(
strings.bot.commands.research.errors.already_researched, strings.bot.commands.research.errors.already_researched,
{ tank: escapeMarkdown(unwrap(targetTank.name)) } [escapeMarkdown(unwrap(targetTank.name))],
); );
} }
const foundAncestor = targetTankAncestry.find( const foundAncestor = targetTankAncestry.find(
(id) => (id) =>
awaitedTankDefinitions.tanks[id].tier === 1 || awaitedTankDefinitions.tanks[id].tier === 1 ||
tankStats.some(({ tank_id }) => tank_id === id) tankStats.some(({ tank_id }) => tank_id === id),
); );
if (foundAncestor === undefined) { if (foundAncestor === undefined) {
throw new Error("No first owned tech tree found."); throw new Error('No first owned tech tree found.');
} }
startingTankId = foundAncestor; startingTankId = foundAncestor;
@@ -168,12 +169,12 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
const techTreeLine = await buildTechTreeLine( const techTreeLine = await buildTechTreeLine(
startingTankId, startingTankId,
targetTankId targetTankId,
); );
const line = [...techTreeLine, startingTankId].reverse(); const line = [...techTreeLine, startingTankId].reverse();
const { nickname } = await getAccountInfo(region, id); const { nickname } = await getAccountInfo(region, id);
const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan; const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined; const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
const costs = await Promise.all( const costs = await Promise.all(
line.map(async (id) => { line.map(async (id) => {
@@ -186,20 +187,25 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
tank.turrets.forEach((turret) => { tank.turrets.forEach((turret) => {
if ( if (
turret.research_cost !== undefined && turret.research_cost !== undefined &&
typeof turret.research_cost.research_cost_type!.value === "number" typeof turret.research_cost.research_cost_type!.value === 'number'
) { ) {
turretXps.set( turretXps.set(
turret.id, turret.id,
turret.research_cost.research_cost_type!.value turret.research_cost.research_cost_type!.value,
); );
} }
turret.guns.forEach((gun) => { turret.guns.forEach((gun) => {
if ( if (
gun.research_cost !== undefined && gun.gun_type!.value.base.research_cost !== undefined &&
typeof gun.research_cost.research_cost_type!.value === "number" typeof gun.gun_type!.value.base.research_cost
.research_cost_type!.value === 'number'
) { ) {
gunXps.set(gun.id, gun.research_cost.research_cost_type!.value); gunXps.set(
gun.gun_type!.value.base.id,
gun.gun_type!.value.base.research_cost.research_cost_type!
.value,
);
} }
}); });
}); });
@@ -207,11 +213,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
tank.engines.forEach((engine) => { tank.engines.forEach((engine) => {
if ( if (
engine.research_cost !== undefined && engine.research_cost !== undefined &&
typeof engine.research_cost.research_cost_type!.value === "number" typeof engine.research_cost.research_cost_type!.value === 'number'
) { ) {
engineXps.set( engineXps.set(
engine.id, engine.id,
engine.research_cost.research_cost_type!.value engine.research_cost.research_cost_type!.value,
); );
} }
}); });
@@ -219,11 +225,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
tank.tracks.forEach((track) => { tank.tracks.forEach((track) => {
if ( if (
track.research_cost !== undefined && track.research_cost !== undefined &&
typeof track.research_cost.research_cost_type!.value === "number" typeof track.research_cost.research_cost_type!.value === 'number'
) { ) {
trackXps.set( trackXps.set(
track.id, track.id,
track.research_cost.research_cost_type!.value track.research_cost.research_cost_type!.value,
); );
} }
}); });
@@ -248,10 +254,10 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
purchase: tank.price.value, purchase: tank.price.value,
equipment: equipmentPriceMatrix[tank.tier].reduce( equipment: equipmentPriceMatrix[tank.tier].reduce(
(a, b) => a + 3 * b, (a, b) => a + 3 * b,
0 0,
), ),
}; };
}) }),
); );
const image = ( const image = (
@@ -266,14 +272,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
gap: 8, gap: 8,
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
borderRadius: 4, borderRadius: 4,
backgroundColor: theme.colors.appBackground2, backgroundColor: theme.colors.appBackground2,
border: theme.borderStyles.subtle, border: theme.borderStyles.subtle,
@@ -284,10 +290,10 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
flex: 1, flex: 1,
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
position: "relative", position: 'relative',
right: 24, right: 24,
}} }}
> >
@@ -303,23 +309,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
flex: 1, flex: 1,
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
justifyContent: "center", justifyContent: 'center',
gap: 8, gap: 8,
padding: "16px 0", padding: '16px 0',
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
alt="XP icon" alt="XP icon"
src={await iconPng(asset("icons/currencies/xp.webp"))} src={await iconPng(asset('icons/currencies/xp.webp'))}
width={16} width={16}
height={16} height={16}
/> />
@@ -329,7 +335,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
}} }}
> >
Experience:{" "} Experience:{' '}
{costs {costs
.reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0) .reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0)
.toLocaleString(interaction.locale)} .toLocaleString(interaction.locale)}
@@ -338,14 +344,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
alt="Silver icon" alt="Silver icon"
src={await iconPng(asset("icons/currencies/silver.webp"))} src={await iconPng(asset('icons/currencies/silver.webp'))}
width={16} width={16}
height={16} height={16}
/> />
@@ -355,7 +361,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
}} }}
> >
Purchase:{" "} Purchase:{' '}
{costs {costs
.reduce((a, b) => a + b.purchase, 0) .reduce((a, b) => a + b.purchase, 0)
.toLocaleString(interaction.locale)} .toLocaleString(interaction.locale)}
@@ -364,14 +370,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
alt="Silver icon" alt="Silver icon"
src={await iconPng(asset("icons/currencies/silver.webp"))} src={await iconPng(asset('icons/currencies/silver.webp'))}
width={16} width={16}
height={16} height={16}
/> />
@@ -381,7 +387,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
}} }}
> >
Equipment:{" "} Equipment:{' '}
{costs {costs
.reduce((a, b) => a + b.equipment, 0) .reduce((a, b) => a + b.equipment, 0)
.toLocaleString(interaction.locale)} .toLocaleString(interaction.locale)}
@@ -398,7 +404,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
key={id} key={id}
style={{ style={{
display: "flex", display: 'flex',
borderRadius: 4, borderRadius: 4,
backgroundColor: theme.colors.appBackground2, backgroundColor: theme.colors.appBackground2,
border: theme.borderStyles.subtle, border: theme.borderStyles.subtle,
@@ -407,9 +413,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
width: 48, width: 48,
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
}} }}
> >
<span <span
@@ -425,9 +431,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
flex: 1, flex: 1,
display: "flex", display: 'flex',
position: "relative", position: 'relative',
right: "5%", right: '5%',
}} }}
> >
<img <img
@@ -436,23 +442,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
style={{ style={{
height: 100, height: 100,
width: 100, width: 100,
objectFit: "contain", objectFit: 'contain',
position: "absolute", position: 'absolute',
left: "25%", left: '25%',
top: 0, top: 0,
}} }}
/> />
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
position: "absolute", position: 'absolute',
bottom: 8, bottom: 8,
left: "50%", left: '50%',
transform: "translateX(-50%)", transform: 'translateX(-50%)',
}} }}
> >
<img <img
@@ -475,23 +481,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
flex: 1, flex: 1,
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
justifyContent: "center", justifyContent: 'center',
gap: 8, gap: 8,
padding: "16px 0", padding: '16px 0',
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
alt="XP icon" alt="XP icon"
src={await iconPng(asset("icons/currencies/xp.webp"))} src={await iconPng(asset('icons/currencies/xp.webp'))}
width={16} width={16}
height={16} height={16}
/> />
@@ -503,11 +509,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
> >
{literals( {literals(
strings.bot.commands.research.body.research, strings.bot.commands.research.body.research,
{ [
cost: costs[index].research?.toLocaleString( `${costs[index].research?.toLocaleString(
interaction.locale interaction.locale,
), )}`,
} ],
)} )}
</span> </span>
</div> </div>
@@ -515,15 +521,15 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
{costs[index].upgrades > 0 && ( {costs[index].upgrades > 0 && (
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
alt="Free XP icon" alt="Free XP icon"
src={await iconPng( src={await iconPng(
asset("icons/currencies/free-xp.webp") asset('icons/currencies/free-xp.webp'),
)} )}
width={16} width={16}
height={16} height={16}
@@ -536,7 +542,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
> >
{literals( {literals(
strings.bot.commands.research.body.upgrades, strings.bot.commands.research.body.upgrades,
{ cost: costs[index].upgrades.toLocaleString() } [costs[index].upgrades.toLocaleString()],
)} )}
</span> </span>
</div> </div>
@@ -544,15 +550,15 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
alt="Silver icon" alt="Silver icon"
src={await iconPng( src={await iconPng(
asset("icons/currencies/silver.webp") asset('icons/currencies/silver.webp'),
)} )}
width={16} width={16}
height={16} height={16}
@@ -565,26 +571,26 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
> >
{literals( {literals(
strings.bot.commands.research.body.purchase, strings.bot.commands.research.body.purchase,
{ [
cost: costs[index].purchase.toLocaleString( costs[index].purchase.toLocaleString(
interaction.locale interaction.locale,
), ),
} ],
)} )}
</span> </span>
</div> </div>
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
}} }}
> >
<img <img
alt="Silver icon" alt="Silver icon"
src={await iconPng( src={await iconPng(
asset("icons/currencies/silver.webp") asset('icons/currencies/silver.webp'),
)} )}
width={16} width={16}
height={16} height={16}
@@ -597,18 +603,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
> >
{literals( {literals(
strings.bot.commands.research.body.equipment, strings.bot.commands.research.body.equipment,
{ [
cost: costs[index].equipment.toLocaleString( costs[index].equipment.toLocaleString(
interaction.locale interaction.locale,
), ),
} ],
)} )}
</span> </span>
</div> </div>
</div> </div>
</div> </div>
); );
}) }),
)} )}
</div> </div>
</CommandWrapper> </CommandWrapper>
@@ -620,7 +626,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
}, },
autocomplete(interaction) { autocomplete(interaction) {
autocompleteTanks(interaction, true, ["target-tank", "starting-tank"]); autocompleteTanks(interaction, true, ['target-tank', 'starting-tank']);
}, },
}); });
}); });
+28 -28
View File
@@ -1,23 +1,23 @@
import { type ClanList, fetchBlitz, type Region } from "@blitzkit/core"; import { ClanList, fetchBlitz, Region } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { Locale } from "discord.js"; import { Locale } from 'discord.js';
import markdownEscape from "markdown-escape"; import markdownEscape from 'markdown-escape';
import { addClanChoices } from "../core/discord/addClanChoices"; import { addClanChoices } from '../core/discord/addClanChoices';
import { addRegionChoices } from "../core/discord/addRegionChoices"; import { addRegionChoices } from '../core/discord/addRegionChoices';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { embedInfo } from "../core/discord/embedInfo"; import { embedInfo } from '../core/discord/embedInfo';
import { localizationObject } from "../core/discord/localizationObject"; import { localizationObject } from '../core/discord/localizationObject';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
const DEFAULT_LIMIT = 25; const DEFAULT_LIMIT = 25;
export const searchClansCommand = new Promise<CommandRegistry>((resolve) => { export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
resolve({ resolve({
command: createLocalizedCommand("search-clans") command: createLocalizedCommand('search-clans')
.addStringOption(addRegionChoices) .addStringOption(addRegionChoices)
.addStringOption((option) => .addStringOption((option) =>
addClanChoices(option).setAutocomplete(false) addClanChoices(option).setAutocomplete(false),
) )
.addIntegerOption((option) => { .addIntegerOption((option) => {
const { strings } = translator(Locale.EnglishUS); const { strings } = translator(Locale.EnglishUS);
@@ -28,21 +28,21 @@ export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
localizationObject( localizationObject(
(strings) => strings.bot.commands.search_clans.options.limit.name, (strings) => strings.bot.commands.search_clans.options.limit.name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
literals( literals(
strings.bot.commands.search_clans.options.limit.description, strings.bot.commands.search_clans.options.limit.description,
{ limit: DEFAULT_LIMIT } [`${DEFAULT_LIMIT}`],
) ),
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.search_clans.options.limit.description, strings.bot.commands.search_clans.options.limit.description,
{ limit: DEFAULT_LIMIT } [`${DEFAULT_LIMIT}`],
) ),
) )
.setMinValue(1) .setMinValue(1)
.setMaxValue(100); .setMaxValue(100);
@@ -50,24 +50,24 @@ export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
async handler(interaction) { async handler(interaction) {
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
const region = interaction.options.getString("region") as Region; const region = interaction.options.getString('region') as Region;
const clan = interaction.options.getString("clan")!; const clan = interaction.options.getString('clan')!;
const limit = interaction.options.getInteger("limit") ?? DEFAULT_LIMIT; const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT;
const clanList = await fetchBlitz<ClanList>(region, "clans/list", { const clanList = await fetchBlitz<ClanList>(region, 'clans/list', {
search: clan, search: clan,
limit, limit,
}); });
return embedInfo( return embedInfo(
literals(strings.bot.commands.search_clans.body.title, { literals(strings.bot.commands.search_clans.body.title, [
search: markdownEscape(clan), markdownEscape(clan),
region: strings.common.regions.normal[region], strings.common.regions.normal[region],
}), ]),
clanList.length === 0 clanList.length === 0
? strings.bot.commands.search_clans.body.no_results ? strings.bot.commands.search_clans.body.no_results
: `\`\`\`\n${clanList : `\`\`\`\n${clanList
.map((clan) => `${clan.name} [${clan.tag}]`) .map((clan) => `${clan.name} [${clan.tag}]`)
.join("\n")}\n\`\`\`` .join('\n')}\n\`\`\``,
); );
}, },
}); });
+32 -32
View File
@@ -1,19 +1,19 @@
import { import {
type AccountList, AccountList,
fetchBlitz, fetchBlitz,
type Region, Region,
usernamePattern, usernamePattern,
} from "@blitzkit/core"; } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { Locale } from "discord.js"; import { Locale } from 'discord.js';
import markdownEscape from "markdown-escape"; import markdownEscape from 'markdown-escape';
import { addRegionChoices } from "../core/discord/addRegionChoices"; import { addRegionChoices } from '../core/discord/addRegionChoices';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { embedInfo } from "../core/discord/embedInfo"; import { embedInfo } from '../core/discord/embedInfo';
import { localizationObject } from "../core/discord/localizationObject"; import { localizationObject } from '../core/discord/localizationObject';
import { translator } from "../core/localization/translator"; import { translator } from '../core/localization/translator';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
const DEFAULT_LIMIT = 25; const DEFAULT_LIMIT = 25;
@@ -21,10 +21,10 @@ export const searchPlayersCommand = new Promise<CommandRegistry>((resolve) => {
const { strings } = translator(Locale.EnglishUS); const { strings } = translator(Locale.EnglishUS);
resolve({ resolve({
command: createLocalizedCommand("search-players") command: createLocalizedCommand('search-players')
.addStringOption(addRegionChoices) .addStringOption(addRegionChoices)
.addStringOption((option) => .addStringOption((option) =>
addUsernameChoices(option).setAutocomplete(false).setRequired(true) addUsernameChoices(option).setAutocomplete(false).setRequired(true),
) )
.addIntegerOption((option) => .addIntegerOption((option) =>
option option
@@ -34,49 +34,49 @@ export const searchPlayersCommand = new Promise<CommandRegistry>((resolve) => {
(strings) => (strings) =>
strings.bot.commands.search_players.options.limit.name, strings.bot.commands.search_players.options.limit.name,
undefined, undefined,
true true,
) ),
) )
.setDescription( .setDescription(
literals( literals(
strings.bot.commands.search_players.options.limit.description, strings.bot.commands.search_players.options.limit.description,
{ limit: DEFAULT_LIMIT } [`${DEFAULT_LIMIT}`],
) ),
) )
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => (strings) =>
strings.bot.commands.search_players.options.limit.description, strings.bot.commands.search_players.options.limit.description,
{ limit: DEFAULT_LIMIT } [`${DEFAULT_LIMIT}`],
) ),
) )
.setMinValue(1) .setMinValue(1)
.setMaxValue(100) .setMaxValue(100),
), ),
async handler(interaction) { async handler(interaction) {
const { strings } = translator(interaction.locale); const { strings } = translator(interaction.locale);
const region = interaction.options.getString("region") as Region; const region = interaction.options.getString('region') as Region;
const name = interaction.options.getString("username")!; const name = interaction.options.getString('username')!;
const limit = interaction.options.getInteger("limit") ?? 25; const limit = interaction.options.getInteger('limit') ?? 25;
const trimmedSearch = name.trim(); const trimmedSearch = name.trim();
const players = usernamePattern.test(trimmedSearch) const players = usernamePattern.test(trimmedSearch)
? await fetchBlitz<AccountList>(region, "account/list", { ? await fetchBlitz<AccountList>(region, 'account/list', {
search: trimmedSearch, search: trimmedSearch,
limit, limit,
}) })
: []; : [];
return embedInfo( return embedInfo(
literals(strings.bot.commands.search_players.body.title, { literals(strings.bot.commands.search_players.body.title, [
search: markdownEscape(trimmedSearch), markdownEscape(trimmedSearch),
region: strings.common.regions.normal[region], strings.common.regions.normal[region],
}), ]),
`\`\`\`${ `\`\`\`${
players.length === 0 players.length === 0
? strings.bot.commands.search_players.body.no_results ? strings.bot.commands.search_players.body.no_results
: players.map((player) => player.nickname).join("\n") : players.map((player) => player.nickname).join('\n')
}\`\`\`` }\`\`\``,
); );
}, },
}); });
+32 -32
View File
@@ -1,50 +1,50 @@
import { emblemURL, getAccountInfo, getClanAccountInfo } from "@blitzkit/core"; import { emblemURL, getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
import { Locale } from "discord.js"; import { Locale } from 'discord.js';
import { AllStatsOverview } from "../components/AllStatsOverview"; import { AllStatsOverview } from '../components/AllStatsOverview';
import { CommandWrapper } from "../components/CommandWrapper"; import { CommandWrapper } from '../components/CommandWrapper';
import { NoData } from "../components/NoData"; import { NoData } from '../components/NoData';
import { TitleBar } from "../components/TitleBar"; import { TitleBar } from '../components/TitleBar';
import { filtersToDescription } from "../core/blitzkit/filtersToDescription"; import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
import { filterStats, type StatFilters } from "../core/blitzstars/filterStats"; import { filterStats, StatFilters } from '../core/blitzstars/filterStats';
import { getBlitzStarsLinkButton } from "../core/blitzstars/getBlitzStarsLinkButton"; import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
import { getStatsInPeriod } from "../core/blitzstars/getStatsInPeriod"; import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod';
import { addPeriodicFilterOptions } from "../core/discord/addPeriodicFilterOptions"; import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions';
import { addUsernameChoices } from "../core/discord/addUsernameChoices"; import { addUsernameChoices } from '../core/discord/addUsernameChoices';
import { autocompleteTanks } from "../core/discord/autocompleteTanks"; import { autocompleteTanks } from '../core/discord/autocompleteTanks';
import { autocompleteUsername } from "../core/discord/autocompleteUsername"; import { autocompleteUsername } from '../core/discord/autocompleteUsername';
import { buttonRefresh } from "../core/discord/buttonRefresh"; import { buttonRefresh } from '../core/discord/buttonRefresh';
import { commandToURL } from "../core/discord/commandToURL"; import { commandToURL } from '../core/discord/commandToURL';
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import { getCustomPeriodParams } from "../core/discord/getCustomPeriodParams"; import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
import { getFiltersFromButton } from "../core/discord/getFiltersFromButton"; import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
import { getFiltersFromCommand } from "../core/discord/getFiltersFromCommand"; import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton"; import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
import { import {
type ResolvedPeriod, ResolvedPeriod,
resolvePeriodFromCommand, resolvePeriodFromCommand,
} from "../core/discord/resolvePeriodFromCommand"; } from '../core/discord/resolvePeriodFromCommand';
import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton"; import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
import { import {
type ResolvedPlayer, ResolvedPlayer,
resolvePlayerFromCommand, resolvePlayerFromCommand,
} from "../core/discord/resolvePlayerFromCommand"; } from '../core/discord/resolvePlayerFromCommand';
import type { CommandRegistry } from "../events/interactionCreate"; import { CommandRegistry } from '../events/interactionCreate';
async function render( async function render(
{ region, id }: ResolvedPlayer, { region, id }: ResolvedPlayer,
{ start, end, name }: ResolvedPeriod, { start, end, name }: ResolvedPeriod,
filters: StatFilters, filters: StatFilters,
locale: Locale locale: Locale,
) { ) {
const { nickname } = await getAccountInfo(region, id); const { nickname } = await getAccountInfo(region, id);
const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan; const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined; const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
const diffedTankStats = await getStatsInPeriod( const diffedTankStats = await getStatsInPeriod(
region, region,
id, id,
start, start,
end, end,
locale locale,
); );
const { stats, supplementary } = await filterStats(diffedTankStats, filters); const { stats, supplementary } = await filterStats(diffedTankStats, filters);
const filterDescriptions = await filtersToDescription(filters, locale); const filterDescriptions = await filtersToDescription(filters, locale);
@@ -72,8 +72,8 @@ async function render(
export const statsCommand = new Promise<CommandRegistry>(async (resolve) => { export const statsCommand = new Promise<CommandRegistry>(async (resolve) => {
resolve({ resolve({
command: await addPeriodicFilterOptions( command: await addPeriodicFilterOptions(
createLocalizedCommand("stats"), createLocalizedCommand('stats'),
(option) => option.addStringOption(addUsernameChoices) (option) => option.addStringOption(addUsernameChoices),
), ),
async handler(interaction) { async handler(interaction) {
+1 -1
View File
@@ -14,7 +14,7 @@ import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton
import { resolvePeriodFromCommand } from '../core/discord/resolvePeriodFromCommand'; import { resolvePeriodFromCommand } from '../core/discord/resolvePeriodFromCommand';
import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton'; import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand'; import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
import { type CommandRegistry } from '../events/interactionCreate'; import { CommandRegistry } from '../events/interactionCreate';
import { renderBreakdown } from './breakdown/render'; import { renderBreakdown } from './breakdown/render';
export const todayCommand = new Promise<CommandRegistry>(async (resolve) => { export const todayCommand = new Promise<CommandRegistry>(async (resolve) => {
@@ -1,8 +1,8 @@
import { type ComponentProps } from "react"; import { ComponentProps } from 'react';
export interface GlowProps extends ComponentProps<"div"> { export interface GlowProps extends ComponentProps<'div'> {
color: string; color: string;
direction?: "default" | "reverse"; direction?: 'default' | 'reverse';
rotation?: number; rotation?: number;
startOpacity?: number; startOpacity?: number;
endOpacity?: number; endOpacity?: number;
@@ -12,7 +12,7 @@ const width = 16;
export function Glow({ export function Glow({
color, color,
direction = "default", direction = 'default',
rotation = 0, rotation = 0,
style, style,
startOpacity = 0, startOpacity = 0,
@@ -21,20 +21,20 @@ export function Glow({
}: GlowProps) { }: GlowProps) {
const color1 = `${color}${Math.round(endOpacity * 255) const color1 = `${color}${Math.round(endOpacity * 255)
.toString(16) .toString(16)
.padStart(2, "0")}`; .padStart(2, '0')}`;
const color2 = `${color}${Math.round(startOpacity * 255) const color2 = `${color}${Math.round(startOpacity * 255)
.toString(16) .toString(16)
.padStart(2, "0")}`; .padStart(2, '0')}`;
const background = `linear-gradient(${ const background = `linear-gradient(${
direction === "default" ? 0 : 180 direction === 'default' ? 0 : 180
}deg, ${color1} 0%, ${color2} 100%)`; }deg, ${color1} 0%, ${color2} 100%)`;
return ( return (
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: direction === "default" ? "flex-end" : "flex-start", alignItems: direction === 'default' ? 'flex-end' : 'flex-start',
justifyContent: "center", justifyContent: 'center',
transform: `rotate(${rotation}deg)`, transform: `rotate(${rotation}deg)`,
...style, ...style,
}} }}
@@ -1,7 +1,7 @@
import { import {
getWN8Percentile, getWN8Percentile,
Percentile, Percentile,
type SupplementaryStats, SupplementaryStats,
} from '@blitzkit/core'; } from '@blitzkit/core';
import { Locale } from 'discord.js'; import { Locale } from 'discord.js';
import { translator } from '../../core/localization/translator'; import { translator } from '../../core/localization/translator';
@@ -1,4 +1,4 @@
import { type ReactNode } from "react"; import { ReactNode } from 'react';
interface RootProps { interface RootProps {
children: ReactNode; children: ReactNode;
@@ -8,7 +8,7 @@ export function Root({ children }: RootProps) {
return ( return (
<div <div
className="session-tracker-root" className="session-tracker-root"
style={{ display: "flex", flexDirection: "column", gap: 8 }} style={{ display: 'flex', flexDirection: 'column', gap: 8 }}
> >
{children} {children}
</div> </div>
@@ -6,8 +6,8 @@ import {
} from '@blitzkit/core'; } from '@blitzkit/core';
import { createColors } from 'bepaint'; import { createColors } from 'bepaint';
import { import {
type AccentColor, AccentColor,
type GrayColor, GrayColor,
PALETTES, PALETTES,
} from '../../../core/radix/radixColors'; } from '../../../core/radix/radixColors';
import { RowStat } from './RowStat'; import { RowStat } from './RowStat';
@@ -1,11 +1,11 @@
import { Percentile } from "@blitzkit/core"; import { Percentile } from '@blitzkit/core';
import { createColors } from "bepaint"; import { createColors } from 'bepaint';
import { import {
type AccentColor, AccentColor,
type GrayColor, GrayColor,
PALETTES, PALETTES,
} from "../../../core/radix/radixColors"; } from '../../../core/radix/radixColors';
import { PercentileIndicator } from "../../PercentileIndicator"; import { PercentileIndicator } from '../../PercentileIndicator';
interface RowStatProps { interface RowStatProps {
name: string; name: string;
@@ -22,7 +22,7 @@ export function RowStat({
delta, delta,
percentile, percentile,
minimized = false, minimized = false,
color = "slate", color = 'slate',
}: RowStatProps) { }: RowStatProps) {
const theme = createColors(PALETTES[`${color}Dark`]); const theme = createColors(PALETTES[`${color}Dark`]);
@@ -30,29 +30,29 @@ export function RowStat({
<div <div
className="session-tracker-row-stat" className="session-tracker-row-stat"
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
flex: 1, flex: 1,
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
}} }}
> >
{percentile === undefined && delta !== undefined && delta !== 0 && ( {percentile === undefined && delta !== undefined && delta !== 0 && (
<img <img
alt={delta > 0 ? "Increase" : "Decrease"} alt={delta > 0 ? 'Increase' : 'Decrease'}
src={ src={
(delta ?? 0) > 0 (delta ?? 0) > 0
? "https://i.imgur.com/qbjiXa1.png" ? 'https://i.imgur.com/qbjiXa1.png'
: "https://i.imgur.com/3uyNhun.png" : 'https://i.imgur.com/3uyNhun.png'
} }
style={{ width: 12, height: 12 }} style={{ width: 12, height: 12 }}
/> />
@@ -66,7 +66,7 @@ export function RowStat({
color: theme.textHighContrast, color: theme.textHighContrast,
fontWeight: 700, fontWeight: 700,
fontSize: 16, fontSize: 16,
textAlign: "center", textAlign: 'center',
}} }}
> >
{value} {value}
@@ -77,7 +77,7 @@ export function RowStat({
<span <span
style={{ style={{
color: theme.textLowContrast, color: theme.textLowContrast,
textAlign: "center", textAlign: 'center',
fontSize: 12, fontSize: 12,
}} }}
> >
@@ -1,5 +1,5 @@
import { type ReactNode } from "react"; import { ReactNode } from 'react';
import { theme } from "../stitches.config"; import { theme } from '../stitches.config';
interface CommandWrapperProps { interface CommandWrapperProps {
children: ReactNode; children: ReactNode;
@@ -10,14 +10,14 @@ export function CommandWrapper({ children, fat }: CommandWrapperProps) {
return ( return (
<div <div
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
padding: `16px ${fat ? 0 : 16}px`, padding: `16px ${fat ? 0 : 16}px`,
gap: 16, gap: 16,
width: "100%", width: '100%',
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
backgroundColor: theme.colors.appBackground1, backgroundColor: theme.colors.appBackground1,
position: "relative", position: 'relative',
}} }}
> >
{children} {children}
@@ -1,8 +1,8 @@
import { import {
type BlitzStats, BlitzStats,
getWN8Percentile, getWN8Percentile,
isNumber, isNumber,
type SupplementaryStats, SupplementaryStats,
} from '@blitzkit/core'; } from '@blitzkit/core';
import { Locale } from 'discord.js'; import { Locale } from 'discord.js';
import { translator } from '../../core/localization/translator'; import { translator } from '../../core/localization/translator';
@@ -1,5 +1,5 @@
import { type GenericStat } from ".."; import { GenericStat } from '..';
import { GenericStatsRow } from "./GenericStatsRow"; import { GenericStatsRow } from './GenericStatsRow';
interface GenericStatsColumnProps { interface GenericStatsColumnProps {
stats: GenericStat[]; stats: GenericStat[];
@@ -7,7 +7,7 @@ interface GenericStatsColumnProps {
export function GenericStatsColumn({ stats }: GenericStatsColumnProps) { export function GenericStatsColumn({ stats }: GenericStatsColumnProps) {
return ( return (
<div style={{ flex: 1, display: "flex", flexDirection: "column", gap: 8 }}> <div style={{ flex: 1, display: 'flex', flexDirection: 'column', gap: 8 }}>
{stats.map((stat) => ( {stats.map((stat) => (
<GenericStatsRow key={stat[0]} stat={stat} /> <GenericStatsRow key={stat[0]} stat={stat} />
))} ))}
@@ -1,6 +1,6 @@
import { type GenericStat } from ".."; import { GenericStat } from '..';
import { theme } from "../../../stitches.config"; import { theme } from '../../../stitches.config';
import { PercentileIndicator } from "../../PercentileIndicator"; import { PercentileIndicator } from '../../PercentileIndicator';
interface GenericStatsRowProps { interface GenericStatsRowProps {
stat: GenericStat; stat: GenericStat;
@@ -10,18 +10,18 @@ export function GenericStatsRow({ stat }: GenericStatsRowProps) {
return ( return (
<div <div
style={{ style={{
display: "flex", display: 'flex',
justifyContent: "space-between", justifyContent: 'space-between',
alignItems: "center", alignItems: 'center',
}} }}
> >
<span <span
style={{ style={{
color: theme.colors.textLowContrast, color: theme.colors.textLowContrast,
fontSize: 16, fontSize: 16,
whiteSpace: "nowrap", whiteSpace: 'nowrap',
maxWidth: 128, maxWidth: 128,
overflow: "hidden", overflow: 'hidden',
}} }}
> >
{stat[0]} {stat[0]}
@@ -32,9 +32,9 @@ export function GenericStatsRow({ stat }: GenericStatsRowProps) {
color: theme.colors.textHighContrast, color: theme.colors.textHighContrast,
fontWeight: 700, fontWeight: 700,
fontSize: 16, fontSize: 16,
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
}} }}
> >
@@ -1,6 +1,6 @@
import { times } from 'lodash-es'; import { times } from 'lodash-es';
import { theme } from '../../../../stitches.config'; import { theme } from '../../../../stitches.config';
import { type MarginInputProps } from '../Root'; import { MarginInputProps } from '../Root';
import { MarginOrientation } from './constants'; import { MarginOrientation } from './constants';
interface MarginProps extends MarginInputProps { interface MarginProps extends MarginInputProps {
@@ -1,9 +1,9 @@
import { times } from "lodash-es"; import { times } from 'lodash-es';
import { type ReactNode } from "react"; import { ReactNode } from 'react';
import { theme } from "../../../../stitches.config"; import { theme } from '../../../../stitches.config';
import { Margin } from "../Margin"; import { Margin } from '../Margin';
import { MarginOrientation } from "../Margin/constants"; import { MarginOrientation } from '../Margin/constants';
import { GRAPH_HEIGHT, GRAPH_WIDTH } from "./constants"; import { GRAPH_HEIGHT, GRAPH_WIDTH } from './constants';
export interface MarginInputProps { export interface MarginInputProps {
min: number; min: number;
@@ -32,12 +32,12 @@ export function Root({
xTitle, xTitle,
}: RootProps) { }: RootProps) {
return ( return (
<div style={{ display: "flex", flexDirection: "column", gap: 16 }}> <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
<div <div
style={{ style={{
paddingLeft: 64, paddingLeft: 64,
display: "flex", display: 'flex',
justifyContent: "space-between", justifyContent: 'space-between',
}} }}
> >
<span style={{ fontSize: 16, color: theme.colors.textHighContrast }}> <span style={{ fontSize: 16, color: theme.colors.textHighContrast }}>
@@ -48,7 +48,7 @@ export function Root({
</span> </span>
</div> </div>
<div style={{ display: "flex", gap: 16 }}> <div style={{ display: 'flex', gap: 16 }}>
{verticalMargin && ( {verticalMargin && (
<Margin {...verticalMargin} verticalSeparations={separations} /> <Margin {...verticalMargin} verticalSeparations={separations} />
)} )}
@@ -94,9 +94,9 @@ export function Root({
<div <div
style={{ style={{
paddingLeft: 64, paddingLeft: 64,
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
}} }}
> >
<span style={{ fontSize: 16, color: theme.colors.textLowContrast }}> <span style={{ fontSize: 16, color: theme.colors.textLowContrast }}>
@@ -1,7 +1,7 @@
import { type ComponentProps } from "react"; import { ComponentProps } from 'react';
import { theme } from "../../../stitches.config"; import { theme } from '../../../stitches.config';
interface ItemProps extends ComponentProps<"div"> { interface ItemProps extends ComponentProps<'div'> {
position: number; position: number;
deltaPosition?: number; deltaPosition?: number;
score?: number; score?: number;
@@ -25,15 +25,15 @@ export function Item({
<div <div
{...props} {...props}
style={{ style={{
cursor: "pointer", cursor: 'pointer',
display: "flex", display: 'flex',
padding: 8, padding: 8,
backgroundColor: highlight backgroundColor: highlight
? theme.colors.componentInteractive_blue ? theme.colors.componentInteractive_blue
: theme.colors.componentInteractive, : theme.colors.componentInteractive,
borderRadius: 4, borderRadius: 4,
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 8, gap: 8,
}} }}
> >
@@ -50,9 +50,9 @@ export function Item({
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
}} }}
> >
@@ -83,22 +83,22 @@ export function Item({
{deltaPosition !== undefined && deltaPosition !== 0 && ( {deltaPosition !== undefined && deltaPosition !== 0 && (
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
gap: 4, gap: 4,
}} }}
> >
<img <img
alt={deltaPosition > 0 ? "Increase" : "Decrease"} alt={deltaPosition > 0 ? 'Increase' : 'Decrease'}
style={{ style={{
width: 8, width: 8,
height: 8, height: 8,
}} }}
src={ src={
deltaPosition > 0 deltaPosition > 0
? "https://i.imgur.com/qbjiXa1.png" ? 'https://i.imgur.com/qbjiXa1.png'
: "https://i.imgur.com/3uyNhun.png" : 'https://i.imgur.com/3uyNhun.png'
} }
/> />
<span <span
@@ -119,11 +119,11 @@ export function Item({
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 4, gap: 4,
alignItems: "center", alignItems: 'center',
width: 96, width: 96,
justifyContent: "flex-end", justifyContent: 'flex-end',
}} }}
> >
{deltaScore !== 0 && deltaScore !== undefined && ( {deltaScore !== 0 && deltaScore !== undefined && (
@@ -140,15 +140,15 @@ export function Item({
)} )}
{deltaScore !== 0 && deltaScore !== undefined && ( {deltaScore !== 0 && deltaScore !== undefined && (
<img <img
alt={deltaScore > 0 ? "Increase" : "Decrease"} alt={deltaScore > 0 ? 'Increase' : 'Decrease'}
style={{ style={{
width: 8, width: 8,
height: 8, height: 8,
}} }}
src={ src={
deltaScore > 0 deltaScore > 0
? "https://i.imgur.com/qbjiXa1.png" ? 'https://i.imgur.com/qbjiXa1.png'
: "https://i.imgur.com/3uyNhun.png" : 'https://i.imgur.com/3uyNhun.png'
} }
/> />
)} )}
@@ -1,4 +1,4 @@
import { type ReactNode } from 'react'; import { ReactNode } from 'react';
interface RootProps { interface RootProps {
children: ReactNode; children: ReactNode;
@@ -1,4 +1,4 @@
import { type ReactNode } from 'react'; import { ReactNode } from 'react';
interface ColumnProps { interface ColumnProps {
children: ReactNode; children: ReactNode;
@@ -1,4 +1,4 @@
import { type ReactNode } from "react"; import { ReactNode } from 'react';
interface RootProps { interface RootProps {
children: ReactNode; children: ReactNode;
@@ -8,8 +8,8 @@ export function Root({ children }: RootProps) {
return ( return (
<div <div
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
gap: 16, gap: 16,
}} }}
> >
@@ -1,4 +1,4 @@
import { type ReactNode } from "react"; import { ReactNode } from 'react';
interface RowProps { interface RowProps {
children: ReactNode; children: ReactNode;
@@ -8,7 +8,7 @@ export function Row({ children }: RowProps) {
return ( return (
<div <div
style={{ style={{
display: "flex", display: 'flex',
gap: 8, gap: 8,
}} }}
> >
+7 -7
View File
@@ -1,5 +1,5 @@
import type { TierWeightsRecord } from "@blitzkit/core"; import { TierWeightsRecord } from '@blitzkit/core';
import { theme } from "../stitches.config"; import { theme } from '../stitches.config';
interface TierWeightsProps { interface TierWeightsProps {
weights: TierWeightsRecord; weights: TierWeightsRecord;
@@ -7,7 +7,7 @@ interface TierWeightsProps {
export function TierWeights({ weights }: TierWeightsProps) { export function TierWeights({ weights }: TierWeightsProps) {
return ( return (
<div style={{ display: "flex", gap: 8 }}> <div style={{ display: 'flex', gap: 8 }}>
{Object.entries(weights).map(([tier, weight]) => ( {Object.entries(weights).map(([tier, weight]) => (
<div <div
key={tier} key={tier}
@@ -15,11 +15,11 @@ export function TierWeights({ weights }: TierWeightsProps) {
backgroundColor: theme.colors.appBackground1_light, backgroundColor: theme.colors.appBackground1_light,
flex: weight, flex: weight,
color: theme.colors.textHighContrast_light, color: theme.colors.textHighContrast_light,
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
fontSize: 16, fontSize: 16,
overflow: "hidden", overflow: 'hidden',
borderRadius: 8, borderRadius: 8,
minWidth: 16, minWidth: 16,
}} }}
+16 -18
View File
@@ -1,33 +1,33 @@
import { SEARCH_KEYS } from "@blitzkit/core"; import { SEARCH_KEYS } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { Locale } from "discord.js"; import { Locale } from 'discord.js';
import { go } from "fuzzysort"; import { go } from 'fuzzysort';
import markdownEscape from "markdown-escape"; import markdownEscape from 'markdown-escape';
import { tankDefinitions, tankNames } from "../blitzkit/nonBlockingPromises"; import { tankDefinitions, tankNames } from '../blitzkit/nonBlockingPromises';
import { UserError } from "../blitzkit/userError"; import { UserError } from '../blitzkit/userError';
import { tankNamesTechTreeOnly } from "../discord/autocompleteTanks"; import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
import { translator } from "../localization/translator"; import { translator } from '../localization/translator';
export async function resolveTankId( export async function resolveTankId(
tank: string | number, tank: string | number,
locale: Locale, locale: Locale,
techTreeOnly = false techTreeOnly = false,
) { ) {
const { strings } = translator(locale); const { strings } = translator(locale);
const number = typeof tank === "string" ? Number(tank) : tank; const number = typeof tank === 'string' ? Number(tank) : tank;
if (Number.isNaN(number)) { if (Number.isNaN(number)) {
const searchResult = go( const searchResult = go(
`${tank}`, `${tank}`,
await (techTreeOnly ? tankNamesTechTreeOnly : tankNames), await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
{ keys: SEARCH_KEYS, limit: 1 } { keys: SEARCH_KEYS, limit: 1 },
); );
if (searchResult.length === 0) { if (searchResult.length === 0) {
throw new UserError( throw new UserError(
literals(strings.bot.common.errors.tank_name_not_found, { literals(strings.bot.common.errors.tank_name_not_found, [
search: markdownEscape(`${tank}`), markdownEscape(`${tank}`),
}) ]),
); );
} else { } else {
return searchResult[0].obj.id; return searchResult[0].obj.id;
@@ -39,9 +39,7 @@ export async function resolveTankId(
return number; return number;
} else { } else {
throw new UserError( throw new UserError(
literals(strings.bot.common.errors.tank_id_not_found, { literals(strings.bot.common.errors.tank_id_not_found, [`${number}`]),
search: number,
})
); );
} }
} }
@@ -1,12 +1,12 @@
import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from "@blitzkit/core"; import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from '@blitzkit/core';
import { literals } from "@blitzkit/i18n"; import { literals } from '@blitzkit/i18n';
import { Locale } from "discord.js"; import { Locale } from 'discord.js';
import { type StatFilters } from "../blitzstars/filterStats"; import { StatFilters } from '../blitzstars/filterStats';
import { translator } from "../localization/translator"; import { translator } from '../localization/translator';
export async function filtersToDescription( export async function filtersToDescription(
{ nation, tier, type, class: tankClass, tank }: StatFilters, { nation, tier, type, class: tankClass, tank }: StatFilters,
locale: Locale locale: Locale,
) { ) {
const { strings, bkLocale } = translator(locale); const { strings, bkLocale } = translator(locale);
const awaitedTankDefinitions = await fetchTankDefinitions(); const awaitedTankDefinitions = await fetchTankDefinitions();
@@ -18,13 +18,11 @@ export async function filtersToDescription(
info.push((strings.common.nations as Record<string, string>)[nation]); info.push((strings.common.nations as Record<string, string>)[nation]);
if (tier) { if (tier) {
info.push( info.push(
literals(strings.bot.common.filters.tier, { literals(strings.bot.common.filters.tier, [TIER_ROMAN_NUMERALS[tier]]),
tier: TIER_ROMAN_NUMERALS[tier],
})
); );
} }
if (tankClass) info.push(strings.common.tank_class_short[tankClass]); if (tankClass) info.push(strings.common.tank_class_short[tankClass]);
if (type) info.push(strings.common.tree_type[type]); if (type) info.push(strings.common.tree_type[type]);
return info.length === 0 ? strings.bot.common.filters.none : info.join(", "); return info.length === 0 ? strings.bot.common.filters.none : info.join(', ');
} }
@@ -1,5 +1,5 @@
import { getTimeDaysAgo, type Region } from '@blitzkit/core'; import { getTimeDaysAgo, Region } from '@blitzkit/core';
import type { PeriodSize } from '../discord/addPeriodSubCommands'; import { PeriodSize } from '../discord/addPeriodSubCommands';
export function getPeriodStart(region: Region, period: PeriodSize) { export function getPeriodStart(region: Region, period: PeriodSize) {
if (period === 'career') return 0; if (period === 'career') return 0;
+3 -3
View File
@@ -1,9 +1,9 @@
import sharp from "sharp"; import sharp from 'sharp';
const cache: Record<string, Buffer> = {}; const cache: Record<string, Buffer> = {};
export async function iconPng(url: string) { export async function iconPng(url: string) {
if (!url.endsWith(".webp")) return url; if (!url.endsWith('.webp')) return url;
if (!cache[url]) { if (!cache[url]) {
const imageResponse = await fetch(url); const imageResponse = await fetch(url);
@@ -12,5 +12,5 @@ export async function iconPng(url: string) {
cache[url] = imageBufferPNG; cache[url] = imageBufferPNG;
} }
return `data:image/png;base64,${cache[url].toString("base64")}`; return `data:image/png;base64,${cache[url].toString('base64')}`;
} }
+3 -3
View File
@@ -1,7 +1,7 @@
import { jsxToSvg } from "./jsxToSvg"; import { jsxToSvg } from './jsxToSvg';
import { svgToPng } from "./svgToPng"; import { svgToPng } from './svgToPng';
export async function jsxToPng(jsx: React.JSX.Element) { export async function jsxToPng(jsx: JSX.Element) {
const svg = await jsxToSvg(jsx); const svg = await jsxToSvg(jsx);
const png = svgToPng(svg); const png = svgToPng(svg);
@@ -1,10 +1,10 @@
import { jsxToSvg } from "./jsxToSvg"; import { jsxToSvg } from './jsxToSvg';
import { RenderConfiguration } from "./renderConfiguration"; import { RenderConfiguration } from './renderConfiguration';
import { svgToPngThreaded } from "./svgToPngThreaded"; import { svgToPngThreaded } from './svgToPngThreaded';
export async function jsxToPngThreaded( export async function jsxToPngThreaded(
jsx: React.JSX.Element, jsx: JSX.Element,
renderConfiguration: RenderConfiguration renderConfiguration: RenderConfiguration,
) { ) {
const svg = await jsxToSvg(jsx, renderConfiguration); const svg = await jsxToSvg(jsx, renderConfiguration);
const png = await svgToPngThreaded(svg); const png = await svgToPngThreaded(svg);
@@ -1,9 +1,9 @@
import { readFile } from "fs/promises"; import { readFile } from 'fs/promises';
import satori from "satori"; import satori from 'satori';
import { RenderConfiguration } from "../renderConfiguration"; import { RenderConfiguration } from '../renderConfiguration';
import robotoBlack from "./Roboto-Black.ttf"; import robotoBlack from './Roboto-Black.ttf';
import robotoBold from "./Roboto-Bold.ttf"; import robotoBold from './Roboto-Bold.ttf';
import roboto from "./Roboto.ttf"; import roboto from './Roboto.ttf';
const fontsPromise = [ const fontsPromise = [
{ file: roboto, weight: 400 as const }, { file: roboto, weight: 400 as const },
@@ -11,12 +11,12 @@ const fontsPromise = [
{ file: robotoBlack, weight: 900 as const }, { file: robotoBlack, weight: 900 as const },
].map(async ({ file, weight }) => { ].map(async ({ file, weight }) => {
const data = await readFile(`${__dirname}/${file}`); const data = await readFile(`${__dirname}/${file}`);
return { name: "Roboto", weight, data }; return { name: 'Roboto', weight, data };
}); });
export async function jsxToSvg( export async function jsxToSvg(
jsx: React.JSX.Element, jsx: JSX.Element,
renderConfiguration = new RenderConfiguration() renderConfiguration = new RenderConfiguration(),
) { ) {
const fonts = await Promise.all(fontsPromise); const fonts = await Promise.all(fontsPromise);
return await satori(jsx, { width: renderConfiguration.width, fonts }); return await satori(jsx, { width: renderConfiguration.width, fonts });
+12 -12
View File
@@ -1,10 +1,10 @@
import { TankClass, TankType } from "@blitzkit/core"; import { TankClass, TankType } from '@blitzkit/core';
import type { SupplementaryStats } from "@blitzkit/core/src/blitz/getAccountInfo"; import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo';
import { calculateWN8 } from "@blitzkit/core/src/statistics/calculateWN8"; import { calculateWN8 } from '@blitzkit/core/src/statistics/calculateWN8';
import type { BlitzStats } from "@blitzkit/core/src/statistics/compositeStats"; import { BlitzStats } from '@blitzkit/core/src/statistics/compositeStats';
import { sumAllStats } from "@blitzkit/core/src/statistics/sumAllStats"; import { sumAllStats } from '@blitzkit/core/src/statistics/sumAllStats';
import { tankDefinitions } from "../blitzkit/nonBlockingPromises"; import { tankDefinitions } from '../blitzkit/nonBlockingPromises';
import { blitzStarsTankAverages } from "./tankAverages"; import { blitzStarsTankAverages } from './tankAverages';
export interface StatFilters { export interface StatFilters {
nation?: string; nation?: string;
@@ -16,7 +16,7 @@ export interface StatFilters {
export async function filterStats( export async function filterStats(
{ diff, order }: DiffedTankStats, { diff, order }: DiffedTankStats,
filters: StatFilters filters: StatFilters,
) { ) {
// tank, if provided, takes priority over all other filters // tank, if provided, takes priority over all other filters
if (filters.tank) filters = { tank: filters.tank }; if (filters.tank) filters = { tank: filters.tank };
@@ -45,14 +45,14 @@ export async function filterStats(
const battlesOfTanksWithAverages = filteredOrder.reduce<number>( const battlesOfTanksWithAverages = filteredOrder.reduce<number>(
(accumulator, id) => (accumulator, id) =>
awaitedTankAverages[id] ? accumulator + diff[id].battles : accumulator, awaitedTankAverages[id] ? accumulator + diff[id].battles : accumulator,
0 0,
); );
const battlesOfTanksWithTankDefinition = filteredOrder.reduce<number>( const battlesOfTanksWithTankDefinition = filteredOrder.reduce<number>(
(accumulator, id) => (accumulator, id) =>
awaitedTankDefinitions.tanks[id] awaitedTankDefinitions.tanks[id]
? accumulator + diff[id].battles ? accumulator + diff[id].battles
: accumulator, : accumulator,
0 0,
); );
const supplementary = { const supplementary = {
WN8: WN8:
@@ -63,7 +63,7 @@ export async function filterStats(
calculateWN8(awaitedTankAverages[id].all, diff[id]) * calculateWN8(awaitedTankAverages[id].all, diff[id]) *
diff[id].battles diff[id].battles
: accumulator, : accumulator,
0 0,
) / battlesOfTanksWithAverages, ) / battlesOfTanksWithAverages,
tier: tier:
filteredOrder.reduce<number>( filteredOrder.reduce<number>(
@@ -72,7 +72,7 @@ export async function filterStats(
? accumulator + ? accumulator +
awaitedTankDefinitions.tanks[id]!.tier * diff[id].battles awaitedTankDefinitions.tanks[id]!.tier * diff[id].battles
: accumulator, : accumulator,
0 0,
) / battlesOfTanksWithTankDefinition, ) / battlesOfTanksWithTankDefinition,
} satisfies SupplementaryStats; } satisfies SupplementaryStats;
@@ -1,17 +1,17 @@
import { getAccountInfo, type Region } from "@blitzkit/core"; import { getAccountInfo, Region } from '@blitzkit/core';
import { buttonLink } from "../discord/buttonLink"; import { buttonLink } from '../discord/buttonLink';
export async function getBlitzStarsLinkButton( export async function getBlitzStarsLinkButton(
region: Region, region: Region,
id: number, id: number,
tankId?: number tankId?: number,
) { ) {
const { nickname } = await getAccountInfo(region, id); const { nickname } = await getAccountInfo(region, id);
return buttonLink( return buttonLink(
`https://www.blitzstars.com/player/${region}/${nickname}${ `https://www.blitzstars.com/player/${region}/${nickname}${
tankId ? `/tank/${tankId!}` : "" tankId ? `/tank/${tankId!}` : ''
}`, }`,
"BlitzStars" 'BlitzStars',
); );
} }
@@ -1,11 +1,11 @@
import { type Region, emptyAllStats, getAccountInfo } from '@blitzkit/core'; import { Region, emptyAllStats, getAccountInfo } from '@blitzkit/core';
import { import {
type GetHistoriesOptions, GetHistoriesOptions,
type Histories, Histories,
type History, History,
getHistoriesDefaultOptions, getHistoriesDefaultOptions,
} from '../../types/histories'; } from '../../types/histories';
import type { PlayerStats } from './getPlayerStats'; import { PlayerStats } from './getPlayerStats';
export async function getPlayerHistories( export async function getPlayerHistories(
server: Region, server: Region,
@@ -1,4 +1,4 @@
import type { BlitzStats, Region } from "@blitzkit/core"; import { BlitzStats, Region } from '@blitzkit/core';
interface IndividualPlayerStats { interface IndividualPlayerStats {
clan: { clan_id: number; name: string; tag: string }; clan: { clan_id: number; name: string; tag: string };
@@ -25,13 +25,13 @@ export async function getPlayerStats<
ReturnType = Ids extends number ? PlayerStats : PlayerStats[], ReturnType = Ids extends number ? PlayerStats : PlayerStats[],
>(region: Region, ids: Ids) { >(region: Region, ids: Ids) {
const stats = await Promise.all( const stats = await Promise.all(
((typeof ids === "number" ? [ids] : ids) as number[]).map((id) => ((typeof ids === 'number' ? [ids] : ids) as number[]).map((id) =>
fetch(`https://www.blitzstars.com/api/playerstats/${id}`).then( fetch(`https://www.blitzstars.com/api/playerstats/${id}`).then(
(response) => response.json() as Promise<PlayerStats> (response) => response.json() as Promise<PlayerStats>,
) ),
) ),
); );
if (typeof ids === "number") return stats[0] as ReturnType; if (typeof ids === 'number') return stats[0] as ReturnType;
return stats as ReturnType; return stats as ReturnType;
} }
Loaded 100 of 657 files, more files were not shown because too many files have changed in this diff. Show more