Merge branch 'develop' of github.com:OpenNBS/NoteBlockWorld into develop

Author: tomast1337

.vscode/settings.json

@@ -1,4 +1,7 @@
 {
+  /***********************************
+  Linting and formatting settings
+  **********************************/
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "eslint.validate": [
@@ -13,10 +16,27 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "always"
   },
+
+  /***********************************
+  Tailwind CSS IntelliSense settings
+  ***********************************/
+  // Enable suggestions inside strings for Tailwind CSS class names
+  // https://github.com/tailwindlabs/tailwindcss-intellisense#editorquicksuggestions
+  "editor.quickSuggestions": {
+    "strings": "on"
+  },
+  "tailwindCSS.experimental.configFile": {
+    "apps/frontend/src/app/globals.css": "apps/frontend/src/**"
+  },
+  "tailwindCSS.classFunctions": ["tw", "clsx", "cn"],
   "files.associations": {
     ".css": "tailwindcss",
     "*.scss": "tailwindcss"
   },
+
+  /***********************************
+  Use the workspace version of TypeScript
+  ***********************************/
   "typescript.tsdk": "./node_modules/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true
 }

apps/backend/src/song/song.controller.spec.ts

@@ -31,7 +31,6 @@ const mockSongService = {
   getSongEdit: jest.fn(),
   patchSong: jest.fn(),
   getSongDownloadUrl: jest.fn(),
-  getSongFileBuffer: jest.fn(),
   deleteSong: jest.fn(),
   uploadSong: jest.fn(),
   getRandomSongs: jest.fn(),
@@ -803,40 +802,31 @@ describe('SongController', () => {
   });
 
   describe('getSongFile', () => {
-    it('should get song .nbs file', async () => {
+    it('should redirect to download URL', async () => {
       const id = 'test-id';
       const src = 'test-src';
       const user: UserDocument = {
         _id: 'test-user-id',
       } as unknown as UserDocument;
+      const downloadUrl = 'https://example.com/download/song.nbs';
 
       const res = {
         set: jest.fn(),
-        send: jest.fn(),
+        redirect: jest.fn(),
       } as unknown as Response;
 
-      const buffer = Buffer.from('test-song-data');
-      const filename = 'test-song.nbs';
-
-      mockSongService.getSongFileBuffer.mockResolvedValueOnce({
-        buffer,
-        filename,
-      });
+      mockSongService.getSongDownloadUrl.mockResolvedValueOnce(downloadUrl);
 
       await songController.getSongFile(id, src, user, res);
 
       expect(res.set).toHaveBeenCalledWith({
-        'Content-Type': 'application/octet-stream',
-        'Content-Disposition': `attachment; filename="${filename.replace(
-          /[/"]/g,
-          '_',
-        )}"`,
+        'Content-Disposition': 'attachment; filename="song.nbs"',
         'Access-Control-Expose-Headers': 'Content-Disposition',
       });
 
-      expect(res.send).toHaveBeenCalledWith(Buffer.from(buffer));
+      expect(res.redirect).toHaveBeenCalledWith(HttpStatus.FOUND, downloadUrl);
 
-      expect(songService.getSongFileBuffer).toHaveBeenCalledWith(
+      expect(songService.getSongDownloadUrl).toHaveBeenCalledWith(
         id,
         user,
         src,
@@ -853,16 +843,16 @@ describe('SongController', () => {
 
       const res = {
         set: jest.fn(),
-        send: jest.fn(),
+        redirect: jest.fn(),
       } as unknown as Response;
 
-      mockSongService.getSongFileBuffer.mockRejectedValueOnce(
+      mockSongService.getSongDownloadUrl.mockRejectedValueOnce(
         new Error('Error'),
       );
 
       await expect(
         songController.getSongFile(id, src, user, res),
-      ).rejects.toThrow('An error occurred while retrieving the song file');
+      ).rejects.toThrow('Error');
     });
   });
 

apps/backend/src/song/song.controller.ts

@@ -321,37 +321,15 @@ export class SongController {
   ): Promise<void> {
     user = validateUser(user);
 
-    try {
-      // Get file directly from S3/MinIO and proxy it to avoid CORS issues
-      // This bypasses presigned URLs and CORS entirely
-      const { buffer, filename } = await this.songService.getSongFileBuffer(
-        id,
-        user,
-        src,
-        false,
-      );
-
-      // Set headers and send file
-      res.set({
-        'Content-Type': 'application/octet-stream',
-        'Content-Disposition': `attachment; filename="${filename.replace(
-          /[/"]/g,
-          '_',
-        )}"`,
-        'Access-Control-Expose-Headers': 'Content-Disposition',
-      });
+    // TODO: no longer used
+    res.set({
+      'Content-Disposition': 'attachment; filename="song.nbs"',
+      // Expose the Content-Disposition header to the client
+      'Access-Control-Expose-Headers': 'Content-Disposition',
+    });
 
-      res.send(Buffer.from(buffer));
-    } catch (error) {
-      this.logger.error('Error downloading song file:', error);
-      if (error instanceof HttpException) {
-        throw error;
-      }
-      throw new HttpException(
-        'An error occurred while retrieving the song file',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
+    const url = await this.songService.getSongDownloadUrl(id, user, src, false);
+    res.redirect(HttpStatus.FOUND, url);
   }
 
   @Get('/:id/open')

apps/backend/src/song/song.service.ts

@@ -393,57 +393,6 @@ export class SongService {
     }
   }
 
-  public async getSongFileBuffer(
-    publicId: string,
-    user: UserDocument | null,
-    src?: string,
-    packed: boolean = false,
-  ): Promise<{ buffer: ArrayBuffer; filename: string }> {
-    const foundSong = await this.songModel.findOne({ publicId: publicId });
-
-    if (!foundSong) {
-      throw new HttpException('Song not found with ID', HttpStatus.NOT_FOUND);
-    }
-
-    if (foundSong.visibility !== 'public') {
-      if (!user || foundSong.uploader.toString() !== user._id.toString()) {
-        throw new HttpException(
-          'This song is private',
-          HttpStatus.UNAUTHORIZED,
-        );
-      }
-    }
-
-    if (!packed && !foundSong.allowDownload) {
-      throw new HttpException(
-        'The uploader has disabled downloads of this song',
-        HttpStatus.UNAUTHORIZED,
-      );
-    }
-
-    const fileKey = packed ? foundSong.packedSongUrl : foundSong.nbsFileUrl;
-    const fileExt = packed ? '.zip' : '.nbs';
-    const fileName = `${foundSong.title}${fileExt}`;
-
-    try {
-      const fileBuffer = await this.fileService.getSongFile(fileKey);
-
-      // increment download count
-      if (!packed && src === 'downloadButton') {
-        foundSong.downloadCount++;
-        await foundSong.save();
-      }
-
-      return { buffer: fileBuffer, filename: fileName };
-    } catch (e) {
-      this.logger.error('Error getting song file', e);
-      throw new HttpException(
-        'An error occurred while retrieving the song file',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
   public async getMySongsPage({
     query,
     user,

apps/frontend/components.json

@@ -12,7 +12,7 @@
     "rsc": true,
     "tsx": true
   },
-  "iconLibrary": "lucide",
+  "iconLibrary": "fontawesome",
   "aliases": {
     "components": "@web/modules/shared/components",
     "utils": "@web/lib/utils",

apps/frontend/package.json

@@ -56,19 +56,19 @@
     "react-infinite-scroll-component": "^6.1.1",
     "react-loading-skeleton": "^3.5.0",
     "react-markdown": "^10.1.0",
+    "remove-markdown": "^0.6.3",
     "schema-dts": "^1.1.5",
     "sharp": "^0.34.5",
     "tailwind-merge": "^3.4.0",
-    "tailwindcss": "4.1.17",
+    "tailwindcss": "^4.1.18",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "^5.9.3",
     "zod": "^4.1.13",
     "zod-validation-error": "^5.0.0",
     "zustand": "^5.0.9"
   },
   "devDependencies": {
-    "@shrutibalasa/tailwind-grid-auto-fit": "^1.1.0",
-    "@tailwindcss/postcss": "^4.1.17",
+    "@tailwindcss/postcss": "^4.1.18",
     "@types/mdx": "^2.0.13",
     "@types/react-modal": "^3.16.3",
     "eslint-config-next": "16.0.8",

apps/frontend/postcss.config.js apps/frontend/postcss.config.mjsapps/frontend/postcss.config.js renamed to apps/frontend/postcss.config.mjs

@@ -1,6 +1,7 @@
-module.exports = {
+const config = {
   plugins: {
     '@tailwindcss/postcss': {},
-    autoprefixer: {},
   },
 };
+
+export default config;

apps/frontend/src/app/(content)/(info)/about/page.tsx

@@ -12,7 +12,7 @@ export const metadata: Metadata = {
 const AboutPage = () => {
   return (
     <>
-      <article className='max-w-screen-md mx-auto mb-36'>
+      <article className='max-w-(--breakpoint-md) mx-auto mb-36'>
         <NoteBlockWorldLogo
           size={112}
           orientation='horizontal'

apps/frontend/src/app/(content)/(info)/blog/[id]/page.tsx

@@ -50,12 +50,12 @@ const BlogPost = async ({ params }: BlogPageProps) => {
         <Image
           src={post.image}
           alt=''
-          className='w-full h-[30vh] md:h-[50vh] object-cover mb-8 mt-[-2.5rem] rounded-xl'
+          className='w-full h-[30vh] md:h-[50vh] object-cover mb-8 -mt-10 rounded-xl'
           width={1920}
           height={1080}
         />
       )}
-      <article className='max-w-screen-md mx-auto mb-36'>
+      <article className='max-w-(--breakpoint-md) mx-auto mb-36'>
         <Link
           href='/blog'
           className='text-zinc-500 hover:text-zinc-400 text-sm'

apps/frontend/src/app/(content)/(info)/blog/page.tsx

@@ -3,6 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Metadata } from 'next';
 import Image from 'next/image';
 import Link from 'next/link';
+import removeMarkdown from 'remove-markdown';
 
 import { getSortedPostsData } from '@web/lib/posts';
 import type { PostType } from '@web/lib/posts';
@@ -33,7 +34,7 @@ const BlogPageComponent = ({ posts }: { posts: PostType[] }) => {
         {"See what we've been working on!"}
       </h2>
 
-      <section className='grid grid-auto-fit-xl max-w-screen-md mx-auto justify-center w-full items-center gap-8'>
+      <section className='grid grid-auto-fit-xl max-w-(--breakpoint-md) mx-auto justify-center w-full items-center gap-8'>
         {posts.map((post, i) => (
           <Link
             key={i}
@@ -46,10 +47,10 @@ const BlogPageComponent = ({ posts }: { posts: PostType[] }) => {
                 width={480}
                 height={360}
                 alt=''
-                className='rounded-md aspect-[16/9] w-full object-cover transition-all duration-300 mb-2'
+                className='rounded-md aspect-video w-full object-cover transition-all duration-300 mb-2'
               />
 
-              <h3 className='text-lg font-bold text-opacity-50 mb-2 leading-6 flex-grow'>
+              <h3 className='text-lg font-bold mb-2 leading-6 grow'>
                 {post.title}
               </h3>
               <p className='text-zinc-300 tracking-wide text-sm mb-2'>
@@ -58,7 +59,7 @@ const BlogPageComponent = ({ posts }: { posts: PostType[] }) => {
                   .replace(/\//g, '.')}
               </p>
               <p className='self-end line-clamp-3 text-sm text-zinc-400 leading-[1.3]'>
-                {post.content.slice(0, 200)}
+                {removeMarkdown(post.content).slice(0, 250)}
               </p>
             </article>
           </Link>