fix: remove leading/trailing/consecutive spaces from song metadata

OpenNBS · Jul 7, 2024 · a6feb38 · a6feb38
1 parent 6b91ce8
commit a6feb38
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/server/src/song/song-upload/song-upload.service.ts b/server/src/song/song-upload/song-upload.service.ts
@@ -22,7 +22,7 @@ import { UserDocument } from '@server/user/entity/user.entity';
 import { UserService } from '@server/user/user.service';
 
 import { SongDocument, Song as SongEntity } from '../entity/song.entity';
-import { generateSongId } from '../song.util';
+import { generateSongId, removeExtraSpaces } from '../song.util';
 
 @Injectable()
 export class SongUploadService {
@@ -109,9 +109,9 @@ export class SongUploadService {
     const song = new SongEntity();
     song.uploader = await this.validateUploader(user);
     song.publicId = publicId;
-    song.title = body.title;
-    song.originalAuthor = body.originalAuthor;
-    song.description = body.description;
+    song.title = removeExtraSpaces(body.title);
+    song.originalAuthor = removeExtraSpaces(body.originalAuthor);
+    song.description = removeExtraSpaces(body.description);
     song.category = body.category;
     song.allowDownload = true || body.allowDownload; //TODO: implement allowDownload;
     song.visibility = body.visibility;
@@ -295,10 +295,10 @@ export class SongUploadService {
     // Update NBS file with form values
     injectSongFileMetadata(
       nbsSong,
-      body.title,
-      user.username,
-      body.originalAuthor,
-      body.description,
+      removeExtraSpaces(body.title),
+      removeExtraSpaces(user.username),
+      removeExtraSpaces(body.originalAuthor),
+      removeExtraSpaces(body.description),
       body.customInstruments,
     );
 

diff --git a/server/src/song/song.service.ts b/server/src/song/song.service.ts
@@ -24,6 +24,7 @@ import {
   SongWithUser,
 } from './entity/song.entity';
 import { SongUploadService } from './song-upload/song-upload.service';
+import { removeExtraSpaces } from './song.util';
 
 @Injectable()
 export class SongService {
@@ -155,9 +156,9 @@ export class SongService {
     await this.songUploadService.processSongPatch(foundSong, body, user);
 
     // Update song document
-    foundSong.title = body.title;
-    foundSong.originalAuthor = body.originalAuthor;
-    foundSong.description = body.description;
+    foundSong.title = removeExtraSpaces(body.title);
+    foundSong.originalAuthor = removeExtraSpaces(body.originalAuthor);
+    foundSong.description = removeExtraSpaces(body.description);
     foundSong.category = body.category;
     foundSong.allowDownload = body.allowDownload;
     foundSong.visibility = body.visibility;

diff --git a/server/src/song/song.util.ts b/server/src/song/song.util.ts
@@ -1,5 +1,9 @@
 import { customAlphabet } from 'nanoid';
 
+export function removeExtraSpaces(input: string): string {
+  return input.replace(/\s+/g, ' ').trim();
+}
+
 const alphabet =
   '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';