Merge branch 'osuAkatsuki:master' into master

Author: rodrigopina360

.env.example

@@ -35,9 +35,9 @@ MIRROR_DOWNLOAD_ENDPOINT=https://catboy.best/d
 
 COMMAND_PREFIX=!
 
-SEASONAL_BGS=https://akatsuki.pw/static/flower.png,https://i.cmyui.xyz/nrMT4V2RR3PR.jpeg
+SEASONAL_BGS=https://i.cmyui.xyz/T74WiQG5wVyf.jpg,https://i.cmyui.xyz/nrMT4V2RR3PR.jpeg
 
-MENU_ICON_URL=https://akatsuki.pw/static/logos/logo_ingame.png
+MENU_ICON_URL=https://akatsuki.pw/static/images/logos/logo_ingame.png
 MENU_ONCLICK_URL=https://akatsuki.pw
 
 DATADOG_API_KEY=

.github/workflows/docker-build.yaml

@@ -19,21 +19,24 @@ jobs:
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64, linux/arm64
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build
         uses: docker/build-push-action@v5
         with:
           context: .
-          outputs: type=docker,dest=/tmp/docker.tar
+          platforms: linux/amd64, linux/arm64
+          outputs: type=oci,dest=/tmp/docker.tar
           tags: bancho.py:${{ github.sha }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4
         with:
           name: docker
           path: /tmp/docker.tar
@@ -50,7 +53,7 @@ jobs:
         if: ${{ github.ref == 'refs/heads/master' }}
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64, linux/arm64
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/bancho.py:latest

.github/workflows/lint.yaml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: "pip"

.github/workflows/sync-docs.yaml

@@ -5,25 +5,25 @@ on:
     branches:
       - master
     paths:
-      - '.github/docs/wiki/**'
+      - ".github/docs/wiki/**"
   repository_dispatch:
     types: [docs]
   gollum:
 
 env:
-  REPO_PATH: '.github/docs/wiki'
-  WIKI_PATH: 'wiki'
-  GIT_USERNAME: 'github-actions[bot]'
-  GIT_EMAIL: 'github-actions@github.com'
-  GIT_COMMIT_MESSAGE: 'docs: Bidirectional sync between docs and wiki'
+  REPO_PATH: ".github/docs/wiki"
+  WIKI_PATH: "wiki"
+  GIT_USERNAME: "github-actions[bot]"
+  GIT_EMAIL: "github-actions@github.com"
+  GIT_COMMIT_MESSAGE: "docs: Bidirectional sync between docs and wiki"
 
 jobs:
   sync-docs-to-wiki:
     if: github.repository == 'osuAkatsuki/bancho.py' && github.event_name != 'gollum'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Push files into wiki repo
         uses: newrelic/wiki-sync-action@main
         with:
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: master

.github/workflows/test.yaml

@@ -52,23 +52,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build application image
         run: docker build -t bancho:latest .
 
       - name: Start containers
-        run: docker-compose -f docker-compose.test.yml up -d bancho-test mysql-test redis-test
+        run: docker compose -f docker-compose.test.yml up --detach --wait --wait-timeout 30 bancho-test mysql-test redis-test
 
       - name: Run tests
-        run: docker-compose -f docker-compose.test.yml exec -T bancho-test /srv/root/scripts/run-tests.sh
+        run: docker compose -f docker-compose.test.yml exec -T bancho-test /srv/root/scripts/run-tests.sh
 
       - name: Stop containers
         if: always()
         run: docker-compose down
 
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: coverage/

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -12,11 +12,11 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 24.2.0
+    rev: 24.4.0
     hooks:
       - id: black
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.1
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [--py311-plus, --keep-runtime-typing]

app/api/domains/osu.py

@@ -454,15 +454,19 @@ async def osuSearchSetHandler(
     player: Player = Depends(authenticate_player_session(Query, "u", "h")),
     map_set_id: int | None = Query(None, alias="s"),
     map_id: int | None = Query(None, alias="b"),
+    checksum: str | None = Query(None, alias="c"),
 ) -> Response:
     # Since we only need set-specific data, we can basically
     # just do same query with either bid or bsid.
 
+    v: int | str
     if map_set_id is not None:
         # this is just a normal request
         k, v = ("set_id", map_set_id)
     elif map_id is not None:
         k, v = ("id", map_id)
+    elif checksum is not None:
+        k, v = ("md5", checksum)
     else:
         return Response(b"")  # invalid args
 

app/api/v1/api.py

@@ -755,13 +755,11 @@ async def api_get_map_scores(
     else:
         mods = None
 
-    # NOTE: userid will eventually become player_id,
-    # along with everywhere else in the codebase.
     query = [
         "SELECT s.map_md5, s.score, s.pp, s.acc, s.max_combo, s.mods, "
         "s.n300, s.n100, s.n50, s.nmiss, s.ngeki, s.nkatu, s.grade, s.status, "
         "s.mode, s.play_time, s.time_elapsed, s.userid, s.perfect, "
-        "u.name player_name, "
+        "u.name player_name, u.country player_country, "
         "c.id clan_id, c.name clan_name, c.tag clan_tag "
         "FROM scores s "
         "INNER JOIN users u ON u.id = s.userid "

app/repositories/users.py

@@ -155,7 +155,7 @@ async def fetch_count(
     play_style: int | None = None,
 ) -> int:
     """Fetch the number of users in the database."""
-    select_stmt = select(func.count().label("count"))
+    select_stmt = select(func.count().label("count")).select_from(UsersTable)
     if priv is not None:
         select_stmt = select_stmt.where(UsersTable.priv == priv)
     if country is not None: