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

Author: tomast1337

apps/backend/package.json

@@ -48,7 +48,7 @@
     "esm": "^3.2.25",
     "express": "^5.2.1",
     "mongoose": "^9.0.1",
-    "multer": "2.0.2",
+    "multer": "2.1.1",
     "nanoid": "^5.1.6",
     "passport": "^0.7.0",
     "passport-github": "^1.1.0",

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

@@ -105,11 +105,6 @@ export class SongController {
   ): Promise<PageDto<SongPreviewDto>> {
     // Handle random sort
     if (query.sort === SongSortType.RANDOM) {
-      if (query.limit && (query.limit < 1 || query.limit > 10)) {
-        throw new BadRequestException(
-          'Limit must be between 1 and 10 for random sort',
-        );
-      }
       const data = await this.songService.getRandomSongs(
         query.limit ?? 1,
         query.category,

apps/frontend/posts/blog/2025-12-31_song-search.md

@@ -1,47 +1,61 @@
 ---
 title: 'You can now search for songs in Note Block World!'
-date: '2025-12-31'
+date: '2026-02-18'
 author: 'Bentroen'
 authorImage: 'bentroen.png'
 image: '/img/blog/song-search.webp'
 tags: ['updates']
 ---
 
-**That's right:** the (delayed) Christmas present you have been asking for since forever has just arrived! **Song search has been released to everyone in Note Block World, starting now!**
+**That's right:** the feature you ALL have been asking for since the beginning of the website has just arrived! **Song search has been released to everyone in Note Block World, starting now.** 🔍
 
-This was simply our most requested feature, and we're glad to finally be able to unveil it to you!
+This was simply our **most requested feature**, and we're glad to finally be able to unveil it to you!
+
+---
 
 ## List of changes
 
 - Added a search bar on the page's navbar!
 - The results page includes:
   - Total number of results returned
-  - Sorting by recent, popular, duration, play count and note count
+  - Sorting by **recent, **popular**, **duration**, **play count** and **note count\*\*
   - Ordering (ascending, descending)
   - Many more filtering options coming right next!
 
-We'd like to thank [tomast1337](https://github.com/tomast1337) for a significant portion of the implementation, as well as our Discord community for providing valuable feedback, and even developing some alternatives (such as the **awesome** [Note Block World Finder](https://nbw.flwc.cc/)) to fill in the gap while the official solution wasn't out!
+### Bugfixes and improvements
 
-We hope you enjoy the update, and the search feature makes it ever easier to find creations you like on Note Block World!
+- Added a translucent, glass-like effect on the navbar!
+- Fixed icons looking huge during page load, before settling in place. We've had an... \*_ahem_\*- _alignment_ session with the icons and they will behave now.
+- Fixed unformatted Markdown showing on blog post previews.
+- The navbar becomes scrollable if its contents are too large to fit the screen. (This will be replaced by a proper responsive design soon!)
+- Fixed song preview cards being huge when there weren't enough entries to fill an entire column.
+- Mouse hover areas for the popup and the hover effect are now the same on the navbar buttons.
+
+---
+
+We'd like to thank [tomast1337](https://github.com/tomast1337) for a significant portion of the implementation, as well as our Discord community for providing valuable feedback — and even developing some alternatives (such as the **awesome** [Note Block World Finder](https://nbw.flwc.cc/)) to fill in the gap while the official solution wasn't out!
 
-As always, report bugs to us in [Discord](https://discord.gg/note-block-world-608692895179997252) or in our [GitHub](https://github.com/OpenNBS/NoteBlockWorld/issues/new/choose) page. We'd like to make the website the best it can be, and we count on your support to help us achieve this goal!
+As always, report bugs to us in [Discord](https://discord.gg/note-block-world-608692895179997252) or in our [GitHub](https://github.com/OpenNBS/NoteBlockWorld/issues/new/choose) page. We'd like to make the website the best it can be, and we count on **your support** to help us achieve this goal!
+
+We hope you enjoy the update, and the search feature makes it ever easier to find creations you like on Note Block World!
 
 ## Up next
 
-Search is just a small step in our plan to become **the world's largest public, open repository of note block creations.** Although this is a very small feature, some important refactoring is underway to pave the way for even more advanced features:
+Search is just a small step in our plan to become **the world's largest public, open repository of note block creations.** Although this is a tiny feature, some important refactoring is underway to pave the way for even more advanced features:
 
 - In-browser song playback!
 - Advanced search filtering!
 - User profiles!
+- ...and much, much more!
 
-You can expect these features to start rolling out in the next few months. Stay tuned — there's much more to come in 2026!
+You can expect these features to start rolling out in the next few months. Stay tuned — there's much more to come this year!
 
 ## Wrapping up
 
-This year couldn't have been more amazing. We've reached over **two thousand songs** uploaded to Note Block World, and held our **second community-wide [collaboration event](http://localhost:3000/blog/maestro's-musical-masterpieces)** with the creators of [M.A.E.S.T.R.O.](https://noteblock.world/blog/maestro), which had over **30 submissions** spanning **over 90 minutes of music!** And there was even time for a bonus feature before closing off this year! 🎁
+The year of 2025 couldn't have been more amazing. Thanks to **your** engagement and support, we've reached over **two thousand songs** uploaded to Note Block World, and held our **second community-wide [collaboration event](/blog/maestro's-musical-masterpieces)** with the creators of [M.A.E.S.T.R.O.](/blog/maestro), which got over **30 submissions** spanning **over 90 minutes of music!**
 
-Thank you to everyone who visited the website, shared music with their friends, submitted their own creations, or even [donated](https://opencollective.com/opennbs/donate/profile) to help us keep the website running. **Our community is at the core of everything we do, and the reason why we're excited to keep working on cool things everyday!**
+Thank you to everyone who visited the website, shared music with their friends, submitted their own creations, or even [donated](https://opencollective.com/opennbs/donate) to help us keep the website running. **Our community is at the core of everything we do, and the reason why we're excited to keep working on cool things everyday!**
 
-We wish everyone an **incredible 2026**, full of achievements and amazing moments. We'll certainly work hard to make sure it is a wonderful year for Note Block World — especially as it will mark **Note Block Studio's 15th Anniversary!** Stay tuned for the many cool things we're planning to celebrate this remarkable moment in the history of note blocks.
+We wish everyone an **incredible 2026**, full of achievements and amazing moments. We'll certainly work hard to make sure it is a wonderful year for Note Block World — especially as **Note Block Studio will turn 15 years old!** Stay tuned for the many cool things we're planning to celebrate this remarkable moment in the history of note blocks.
 
-**Happy New Year!** See y'all in the next one! :fireworks: :wave_tone1:
+See y'all in the next one! 🎆👋

apps/frontend/src/app/(content)/(info)/about/about.mdx

@@ -30,16 +30,16 @@ Note Block World is made possible by our amazing community of note block enthusi
 
 <Image
   unoptimized
-  src='https://opencollective.com/opennbs/backers.svg?width=900'
+  src='https://opencollective.com/opennbs/backers.svg?width=800'
   alt='Backers'
-  width={900}
-  height={900}
+  width={800}
+  height={800}
 />
 
 <Image
   unoptimized
-  src='https://opencollective.com/opennbs/sponsors.svg?width=900'
+  src='https://opencollective.com/opennbs/sponsors.svg?width=800'
   alt='Sponsors'
-  width={900}
-  height={900}
+  width={800}
+  height={800}
 />

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

@@ -41,7 +41,7 @@ const BlogPageComponent = ({ posts }: { posts: PostType[] }) => {
             href={`/blog/${post.id}`}
             className='w-full h-full p-4 rounded-md bg-zinc-800/50 hover:bg-zinc-700/80 transition-all duration-200'
           >
-            <article key={i} className='flex flex-col'>
+            <article key={i} className='flex flex-col h-full'>
               <Image
                 src={post.image || '/img/post.png'}
                 width={480}

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

@@ -10,7 +10,7 @@ async function fetchRecentSongs() {
     const response = await axiosInstance.get<PageDto<SongPreviewDto>>('/song', {
       params: {
         page: 1, // TODO: fix constants
-        limit: 16, // TODO: change 'limit' parameter to 'skip' and load 12 songs initially, then load 8 more songs on each pagination
+        limit: 11, // TODO: change 'limit' parameter to 'skip' and load 12 songs initially, then load 8 more songs on each pagination
         sort: 'recent',
         order: 'desc',
       },

apps/frontend/src/modules/browse/WelcomeBanner.tsx

@@ -71,7 +71,7 @@ export const WelcomeBanner = () => {
           </Link>
           {' • '}
           <Link
-            href='https://opencollective.com/opennbs/donate/profile'
+            href='https://opencollective.com/opennbs/donate'
             className='text-blue-400 hover:text-blue-300'
           >
             Donate

apps/frontend/src/modules/browse/components/HomePageComponent.tsx

@@ -87,7 +87,7 @@ export const HomePageComponent = () => {
       </div>
       <div className='h-6' />
       <SongCardGroup data-test='recent-songs'>
-        {(recentSongs || []).map((song, i) =>
+        {recentSongs.map((song, i) =>
           // TODO: currently null = skeleton, undefined = ad slot. There must be a more robust system to indicate this.
           song === undefined ? (
             <SongCardAdSlot key={i} />

apps/frontend/src/modules/browse/components/SongCard.tsx

@@ -41,7 +41,7 @@ const SongDataDisplay = ({ song }: { song: SongPreviewDtoType | null }) => {
       </div>
       <div className='flex flex-row justify-between items-center gap-4 px-4'>
         {/* Song author */}
-        <p className='text-sm text-zinc-400 flex-1'>
+        <p className='text-sm text-zinc-400 flex-1 text-pretty leading-tight'>
           {!song ? (
             <Skeleton />
           ) : (

apps/frontend/src/modules/browse/components/client/context/RecentSongs.context.tsx

@@ -7,7 +7,7 @@ import type { PageDto, SongPreviewDtoType } from '@nbw/database';
 import axiosInstance from '@web/lib/axios';
 
 interface RecentSongsState {
-  recentSongs: (SongPreviewDtoType | null)[];
+  recentSongs: (SongPreviewDtoType | null | undefined)[];
   recentError: string;
   isLoading: boolean;
   hasMore: boolean;
@@ -28,6 +28,20 @@ type RecentSongsStore = RecentSongsState & RecentSongsActions;
 
 const adCount = 1;
 const pageSize = 12;
+const fetchCount = pageSize - adCount;
+
+function injectAdSlots(
+  songs: SongPreviewDtoType[],
+): Array<SongPreviewDtoType | undefined> {
+  const songsWithAds: Array<SongPreviewDtoType | undefined> = [...songs];
+
+  for (let i = 0; i < adCount; i++) {
+    const adPosition = Math.floor(Math.random() * (songsWithAds.length + 1));
+    songsWithAds.splice(adPosition, 0, undefined);
+  }
+
+  return songsWithAds;
+}
 
 export const useRecentSongsStore = create<RecentSongsStore>((set, get) => ({
   // Initial state
@@ -37,16 +51,13 @@ export const useRecentSongsStore = create<RecentSongsStore>((set, get) => ({
   hasMore: true,
   selectedCategory: '',
   categories: {},
-  page: 0,
+  page: 1,
 
   // Actions
   initialize: (initialRecentSongs) => {
-    // If no initial songs, set page to 1 to trigger fetch
-    // Otherwise, keep page at 0 since we already have the first page of data
-    const initialPage = initialRecentSongs.length === 0 ? 1 : 0;
     set({
-      recentSongs: initialRecentSongs,
-      page: initialPage,
+      recentSongs: injectAdSlots(initialRecentSongs),
+      page: 1,
       hasMore: true,
       recentError: '',
     });
@@ -68,8 +79,6 @@ export const useRecentSongsStore = create<RecentSongsStore>((set, get) => ({
     set({ isLoading: true });
 
     try {
-      const fetchCount = pageSize - adCount;
-
       const params: Record<string, any> = {
         page,
         limit: fetchCount, // TODO: fix constants
@@ -86,20 +95,15 @@ export const useRecentSongsStore = create<RecentSongsStore>((set, get) => ({
         { params },
       );
 
-      const newSongs: Array<SongPreviewDtoType | undefined> =
-        response.data.content;
-
-      for (let i = 0; i < adCount; i++) {
-        const adPosition = Math.floor(Math.random() * newSongs.length) + 1;
-        newSongs.splice(adPosition, 0, undefined);
-      }
+      const fetchedSongs = response.data.content;
+      const newSongs = injectAdSlots(fetchedSongs);
 
       set((state) => ({
         recentSongs: [
           ...state.recentSongs.filter((song) => song !== null),
-          ...response.data.content,
+          ...newSongs,
         ],
-        hasMore: response.data.content.length >= fetchCount,
+        hasMore: fetchedSongs.length >= fetchCount,
         recentError: '',
       }));
     } catch (error) {
@@ -116,7 +120,7 @@ export const useRecentSongsStore = create<RecentSongsStore>((set, get) => ({
     set({
       selectedCategory: category,
       page: 1,
-      recentSongs: Array(12).fill(null),
+      recentSongs: Array(pageSize).fill(null),
       hasMore: true,
     });
   },
@@ -129,7 +133,7 @@ export const useRecentSongsStore = create<RecentSongsStore>((set, get) => ({
     }
 
     set({
-      recentSongs: [...recentSongs, ...Array(12).fill(null)],
+      recentSongs: [...recentSongs, ...Array(pageSize).fill(null)],
       page: get().page + 1,
     });
   },
@@ -146,7 +150,7 @@ export const useRecentSongsPageLoader = () => {
   );
 
   useEffect(() => {
-    if (page === 0) return;
+    if (page === 1) return; // Skip fetching page 1 as it's already loaded initially
     fetchRecentSongs();
   }, [page, selectedCategory, fetchRecentSongs]);
 };