Merge master

.dockerignore

@@ -10,6 +10,6 @@ public/assets
 public/uploads
 public/uploads-avatar
 public/uploads-replay
-resources/assets/build/
+resources/builds/
 storage/
 vendor/

.env.dusk.local.example

@@ -1,8 +1,8 @@
 APP_KEY=
 APP_ENV=testing
 
-APP_URL=http://nginx
-NOTIFICATION_ENDPOINT=/home/notifications/feed-dusk
+APP_URL=http://localhost:8000
+NOTIFICATION_ENDPOINT=ws://notification-server-dusk:2345
 
 DB_DATABASE=osu_test
 DB_DATABASE_CHAT=osu_chat_test
@@ -11,5 +11,3 @@ DB_DATABASE_STORE=osu_store_test
 DB_DATABASE_UPDATES=osu_updates_test
 
 ES_INDEX_PREFIX=test_
-
-CACHE_DRIVER_LOCAL=array

.env.example

@@ -36,7 +36,6 @@ OSU_API_KEY=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-# CACHE_DRIVER_LOCAL=file
 SESSION_DRIVER=file
 # SESSION_DOMAIN=
 # SESSION_SECURE_COOKIE=false
@@ -230,6 +229,7 @@ CLIENT_CHECK_VERSION=false
 
 # USER_MAX_SCORE_PINS=10
 # USER_MAX_SCORE_PINS_SUPPORTER=50
+# USER_HIDE_PINNED_SOLO_SCORES=true
 
 # the content is in markdown format
 # USER_PROFILE_SCORES_NOTICE=
@@ -251,8 +251,16 @@ CLIENT_CHECK_VERSION=false
 
 # OAUTH_MAX_USER_CLIENTS=1
 
-# USER_REPORT_NOTIFICATION_ENDPOINT_MODERATION=
 # USER_REPORT_NOTIFICATION_ENDPOINT_CHEATING=
+# default if nothing specified for specific type
+# USER_REPORT_NOTIFICATION_ENDPOINT_MODERATION=
+
+# USER_REPORT_NOTIFICATION_ENDPOINT_BEATMAPSET=
+# USER_REPORT_NOTIFICATION_ENDPOINT_BEATMAPSET_DISCUSSION=
+# USER_REPORT_NOTIFICATION_ENDPOINT_CHAT=
+# USER_REPORT_NOTIFICATION_ENDPOINT_COMMENT=
+# USER_REPORT_NOTIFICATION_ENDPOINT_FORUM=
+# USER_REPORT_NOTIFICATION_ENDPOINT_USER=
 
 # LOG_CHANNEL=single
 
@@ -281,6 +289,8 @@ CLIENT_CHECK_VERSION=false
 # TWITCH_CLIENT_SECRET=
 
 # SCORES_ES_CACHE_DURATION=
+# SCORES_EXPERIMENTAL_RANK_AS_DEFAULT=false
+# SCORES_EXPERIMENTAL_RANK_AS_EXTRA=false
 # SCORES_RANK_CACHE_LOCAL_SERVER=0
 # SCORES_RANK_CACHE_MIN_USERS=35000
 # SCORES_RANK_CACHE_SERVER_URL=
@@ -293,3 +303,13 @@ CLIENT_CHECK_VERSION=false
 # TRUSTED_PROXIES=
 
 # IS_DEVELOPMENT_DEPLOY=true
+# OSU_EXPERIMENTAL_HOST=
+
+# OSU_URL_LAZER_ANDROID='https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk'
+# OSU_URL_LAZER_IOS='/home/testflight'
+# OSU_URL_LAZER_LINUX_X64='https://github.com/ppy/osu/releases/latest/download/osu.AppImage'
+# OSU_URL_LAZER_MACOS_AS='https://github.com/ppy/osu/releases/latest/download/osu.app.Apple.Silicon.zip'
+# OSU_URL_LAZER_OTHER='https://github.com/ppy/osu/#running-osu'
+# OSU_URL_LAZER_WINDOWS_X64='https://github.com/ppy/osu/releases/latest/download/install.exe'
+# OSU_URL_LAZER_INFO=
+# OSU_URL_USER_RESTRICTION=/wiki/Help_centre/Account_restrictions

.env.testing.example

@@ -1,10 +1,12 @@
-DB_DATABASE=osu_test
 DB_DATABASE_CHAT=osu_chat_test
 DB_DATABASE_MP=osu_mp_test
 DB_DATABASE_STORE=osu_store_test
 DB_DATABASE_UPDATES=osu_updates_test
 DB_DATABASE_CHARTS=osu_charts_test
 
+# match with docker-compose.yml
+DB_DATABASE=osu_test
 ES_INDEX_PREFIX=test_
+SCHEMA=test
 
 PAYMENT_SANDBOX=true

.eslintrc.js

@@ -17,7 +17,7 @@ module.exports = {
         'plugin:react-hooks/recommended',
         'plugin:react/recommended',
       ],
-      files: ['resources/assets/lib/**/*.{ts,tsx}', 'tests/karma/**/*.ts'],
+      files: ['resources/js/**/*.{ts,tsx}', 'tests/karma/**/*.{ts,tsx}'],
       parser: '@typescript-eslint/parser',
       plugins: [
         '@typescript-eslint',
@@ -170,7 +170,7 @@ module.exports = {
         browser: true,
         node: false,
       },
-      files: ['resources/assets/lib/**/*.{ts,tsx}'],
+      files: ['resources/js/**/*.{ts,tsx}'],
       parserOptions: {
         project: 'tsconfig.json',
         sourceType: 'module',
@@ -181,7 +181,7 @@ module.exports = {
         browser: false,
         node: true,
       },
-      files: ['tests/karma/**/*.ts'],
+      files: ['tests/karma/**/*.{ts,tsx}'],
       parserOptions: {
         project: 'tests/karma/tsconfig.json',
         sourceType: 'module',

.gitattributes

@@ -1,4 +1,4 @@
 * text=auto
 *.sh eol=lf
 /public/images/** binary
-/resources/assets/fonts/** binary
+/resources/fonts/** binary

.github/workflows/lint.yml

@@ -27,14 +27,14 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           tools: composer:v2
-          php-version: '8.0'
+          php-version: '8.1'
 
       - name: Get composer cache directory
         id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -48,7 +48,7 @@ jobs:
       - name: Install js dependencies
         run: yarn --frozen-lockfile
 
-      - run: 'yarn lint --max-warnings 177 > /dev/null'
+      - run: 'yarn lint --max-warnings 123 > /dev/null'
 
       - run: ./bin/update_licence.sh -nf
 

.github/workflows/pack.yml

@@ -57,11 +57,47 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
+  notify_pending_production_deploy:
+    if: ${{ github.ref_type == 'tag' }}
+    runs-on: ubuntu-latest
+    needs:
+      - push_to_registry
+    steps:
+      -
+        name: Submit pending deployment notification
+        run: |
+          export TITLE="Pending osu-web Production Deployment: $GITHUB_REF_NAME"
+          export URL="https://github.com/ppy/osu-web/actions/runs/$GITHUB_RUN_ID"
+          export DESCRIPTION="Docker image was built for tag $GITHUB_REF_NAME and awaiting approval for production deployment:  
+          [View Workflow Run]($URL)"
+          export ACTOR_ICON="https://avatars.githubusercontent.com/u/$GITHUB_ACTOR_ID"
+
+          BODY="$(jq --null-input '{
+            "embeds": [
+              {
+                "title": env.TITLE,
+                "color": 15098112,
+                "description": env.DESCRIPTION,
+                "url": env.URL,
+                "author": {
+                  "name": env.GITHUB_ACTOR,
+                  "icon_url": env.ACTOR_ICON
+                }
+              }
+            ]
+          }')"
+
+          curl \
+            -H "Content-Type: application/json" \
+            -d "$BODY" \
+            "${{ secrets.DISCORD_INFRA_WEBHOOK_URL }}"
+
   push_to_production:
     if: ${{ github.ref_type == 'tag' }}
     runs-on: ubuntu-latest
     needs:
       - push_to_registry
+    environment: production
     steps:
       -
         name: Checkout
@@ -73,6 +109,7 @@ jobs:
           token: ${{ secrets.KUBERNETES_CONFIG_REPO_ACCESS_TOKEN }}
           repository: ppy/osu-kubernetes-config
           event-type: osu-web-deploy
+          client-payload: '{ "dockerTag": "${{ github.ref_name }}" }'
       -
         name: Create Sentry release
         uses: getsentry/action-release@v1
@@ -90,6 +127,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - push_to_registry
+    environment: staging
     steps:
       -
         name: Checkout