Merge branch 'main' into develop

Author: Bentroen

build.ts

@@ -2,7 +2,6 @@ import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 
 import { getLatestVersionSoundList } from './shared/features/sounds';
-import { SEARCH_INCLUDE_PATTERNS } from './shared/features/sounds/filterIncludePatterns';
 
 function writeJSONFile(
   dir: string,
@@ -17,7 +16,6 @@ function writeJSONFile(
 const dataDir = resolve(__dirname, 'server', 'public', 'data');
 
 const soundListPath = 'soundList.json';
-const filteredSoundListPath = 'filteredSoundList.json';
 
 // Try to create the output directory if it doesn't exist
 try {
@@ -29,9 +27,7 @@ try {
 }
 
 // If the files already exist, exit early
-const files = [soundListPath, filteredSoundListPath].map((fileName) =>
-  resolve(dataDir, fileName),
-);
+const files = [soundListPath].map((fileName) => resolve(dataDir, fileName));
 
 if (files.every((file) => existsSync(file))) {
   console.log('Sound data files already exist; skipping generation.');
@@ -44,16 +40,5 @@ console.log('Generating sound data files...');
 // Filter the list to only include sounds that match the chosen patterns
 // (defined in the shared/ module)
 getLatestVersionSoundList().then((soundList) => {
-  const filteredSoundList: string[] = Object.keys(soundList)
-    .filter((sound) =>
-      SEARCH_INCLUDE_PATTERNS.some((pattern) =>
-        new RegExp(pattern).test(sound),
-      ),
-    )
-    .sort((a, b) =>
-      a.localeCompare(b, undefined, { sensitivity: 'base', numeric: true }),
-    );
-
   writeJSONFile(dataDir, soundListPath, soundList);
-  writeJSONFile(dataDir, filteredSoundListPath, filteredSoundList);
 });

pnpm-lock.yaml

@@ -31,3 +31,5 @@ S3_SECRET=
 S3_REGION=
 
 WHITELISTED_USERS=
+
+DISCORD_WEBHOOK_URL=

server/.env.development.example

@@ -22,7 +22,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.525.0",
     "@aws-sdk/s3-request-presigner": "^3.525.0",
-    "@encode42/nbs.js": "^5.0.0",
+    "@encode42/nbs.js": "^5.0.2",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.0.0",
     "@nestjs/core": "^10.0.0",

server/package.json

@@ -102,9 +102,7 @@ export class FileService {
     const command = new GetObjectCommand({
       Bucket: bucket,
       Key: key,
-      ResponseContentDisposition: `attachment; filename="${filename
-        .split('/')
-        .pop()}"`,
+      ResponseContentDisposition: `attachment; filename="${filename}"`,
     });
 
     const signedUrl = await getSignedUrl(this.s3Client, command, {

server/src/file/file.service.ts

@@ -88,6 +88,11 @@ export class Song {
 
   @Prop({ type: SongStats, required: true })
   stats: SongStats;
+
+  // EXTERNAL ATTRIBUTES
+
+  @Prop({ type: String, required: false })
+  webhookMessageId?: string | null;
 }
 
 export const SongSchema = SchemaFactory.createForClass(Song);

server/src/song/entity/song.entity.ts

@@ -57,16 +57,16 @@ export class SongUploadService {
   }
 
   private async getValidSoundsSubset() {
-    // Creates a set of valid sound paths from filteredSoundList.json,
-    // a manually-crafted subset of sounds from Minecraft
+    // Creates a set of valid sound paths from the full list of sounds in Minecraft
 
     if (!this.soundsSubset) {
       try {
         const response = await fetch(
-          process.env.SERVER_URL + '/api/v1/data/filteredSoundList.json',
+          process.env.SERVER_URL + '/api/v1/data/soundList.json',
         );
 
-        const soundList = (await response.json()) as string[];
+        const soundMapping = (await response.json()) as Record<string, string>;
+        const soundList = Object.keys(soundMapping);
         this.soundsSubset = new Set(soundList);
       } catch (e) {
         throw new HttpException(