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

Author: tomast1337

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Hello! We're glad to have you interested in contributing to Note Block World. This document will guide you through the process of setting up the project and submitting your contributions.
 
-This page is a work-in-progress and will be updated as the project evolves. If you have any questions or need help, feel free to reach out to us on our [Discord server](https://discord.gg/open-note-block-studio-608692895179997252).
+This page is a work-in-progress and will be updated as the project evolves. If you have any questions or need help, feel free to reach out to us on our [Discord server](https://discord.gg/note-block-world-608692895179997252).
 
 ## Stack
 

README.md

@@ -1,5 +1,7 @@
 <p align="center">
-  <img src="img/header.png" alt="Note Block World header" />
+  <a href="https://noteblock.world">
+    <img src="img/header.png" alt="Note Block World header" />
+  </a>
 </p>
 
 <p align="center">
@@ -9,15 +11,15 @@
 </p>
 
 <p align="center">
-  👥 <a href="https://discord.gg/open-note-block-studio-608692895179997252">Discord</a> • 
+  👥 <a href="https://discord.gg/note-block-world-608692895179997252">Discord</a> • 
   📆 <a href="https://github.com/orgs/OpenNBS/projects/4">Roadmap</a> • 
   🗨 <a href="https://github.com/OpenNBS/NoteBlockWorld/issues/new/choose">Feedback</a> • 
   ☕ <a href="https://opencollective.com/opennbs/donate">Buy us a coffee!</a>
 </p>
 
 ## ℹ About the project
 
-**Note Block World** is a collaborative, social website where users can share their note block songs made with [Note Block Studio](https://noteblock.studio/). Our goal is to give the NBS community a platform to share their creations with the world, discover new music and connect with other creators!
+[**Note Block World**](https://noteblock.world/) is a collaborative, social website where users can share their note block songs made with [Note Block Studio](https://noteblock.studio/). Our goal is to give the NBS community a platform to share their creations with the world, discover new music and connect with other creators!
 
 ## 💬 Issues/Feedback
 
@@ -27,7 +29,7 @@ If you have found an issue or would like to suggest a feature, please open a [ne
 
 We welcome contributions to the project! Read our [contributor guide](CONTRIBUTING.md) to set up the project and get started.
 
-Please [open an issue](/issues/new/choose) discussing the changes you would like to make before submitting a pull request. Alternatively, you can join our [Discord server](https://discord.gg/open-note-block-studio-608692895179997252) to discuss the changes with our development team!
+Please [open an issue](/issues/new/choose) discussing the changes you would like to make before submitting a pull request. Alternatively, you can join our [Discord server](https://discord.gg/note-block-world-608692895179997252) to discuss the changes with our development team!
 
 ## ❤ Donate
 
@@ -38,6 +40,7 @@ Thanks to all our current and past sponsors for helping us keep Note Block World
 ###### Supporters
 
 <img src="https://opencollective.com/opennbs/backers.svg" height="48px"/>
+<img src="https://opencollective.com/opennbs/sponsors.svg" height="48px"/>
 
 ---
 

server/src/auth/auth.service.ts

@@ -220,7 +220,7 @@ export class AuthService {
 
     const frontEndURL = this.FRONTEND_URL;
     const domain = this.APP_DOMAIN;
-    const maxAge = parseInt(this.COOKIE_EXPIRES_IN);
+    const maxAge = parseInt(this.COOKIE_EXPIRES_IN) * 1000;
 
     res.cookie('token', token.access_token, {
       domain: domain,

server/src/song/song.controller.ts

@@ -122,6 +122,8 @@ export class SongController {
     @GetRequestToken() user: UserDocument | null,
     @Res() res: Response,
   ): Promise<void> {
+    user = validateUser(user);
+
     // TODO: no longer used
     res.set({
       'Content-Disposition': 'attachment; filename="song.nbs"',

shared/features/song/obfuscate.ts

@@ -119,8 +119,21 @@ export class SongObfuscator {
 
     const resolveKeyAndPitch = (note: Note) => {
       const factoredPitch = note.key * 100 + note.pitch;
-      const key = Math.floor((factoredPitch + 50) / 100);
-      const pitch = ((factoredPitch + 50) % 100) - 50;
+
+      let key, pitch;
+
+      if (factoredPitch < 0) {
+        // Below A0
+        key = 0;
+        pitch = factoredPitch;
+      } else if (factoredPitch >= 87 * 100) {
+        // Above C8
+        key = 87;
+        pitch = factoredPitch - 87 * 100;
+      } else {
+        key = Math.floor((factoredPitch + 50) / 100);
+        pitch = ((factoredPitch + 50) % 100) - 50;
+      }
 
       return { key, pitch };
     };

shared/validation/song/constants.ts

@@ -128,7 +128,6 @@ export const MY_SONGS = deepFreeze({
 });
 
 export const BROWSER_SONGS = deepFreeze({
-  max_recent_songs: 100,
   featuredPageSize: 10,
   paddedFeaturedPageSize: 5,
 });

web/src/app/(content)/(info)/contact/contact.mdx

@@ -1,7 +1,7 @@
 Have you got any question, suggestion or feedback? We'd love to hear from you!
 
-To report an issue or suggest a new feature, please [open a new issue](https://github.com/issues/new/choose) in our GitHub repository. Make sure to search the existing issues to see if your suggestion has already been made. Also, check our [project roadmap](https://github.com/orgs/OpenNBS/projects/4) to see if the feature you want is already planned!
+To report an issue or suggest a new feature, please [open a new issue](https://github.com/OpenNBS/NoteBlockWorld/issues/new/choose) in our GitHub repository. Make sure to search the existing issues to see if your suggestion has already been made. Also, check our [project roadmap](https://github.com/orgs/OpenNBS/projects/4) to see if the feature you want is already planned!
 
-For general support, or if you'd just like to have a chat, the fastest way to get in touch with us is by joining our public community on [Discord](https://discord.gg/open-note-block-studio-608692895179997252). We're always happy to help!
+For general support, or if you'd just like to have a chat, the fastest way to get in touch with us is by joining our public community on [Discord](https://discord.gg/note-block-world-608692895179997252). We're always happy to help!
 
 For business inquiries, or if you need to reach out to us privately, you can send us an email at [[email protected]]([email protected]).

web/src/app/(content)/page.tsx

@@ -52,12 +52,12 @@ export const metadata: Metadata = {
 };
 
 async function Home() {
-  const recentSongs = await fetchRecentSongs();
+  //const recentSongs = await fetchRecentSongs();
   const featuredSongs = await fetchFeaturedSongs();
 
   return (
     <HomePageProvider
-      initialRecentSongs={recentSongs}
+      initialRecentSongs={[]}
       initialFeaturedSongs={featuredSongs}
     >
       <HomePageComponent />

web/src/modules/browse/WelcomeBanner.tsx

@@ -40,7 +40,7 @@ export const WelcomeBanner = () => {
           </Link>
           {' • '}
           <Link
-            href='https://github.com/OpenNBS/NoteBlockWorld/issues/new/choose'
+            href='https://discord.gg/note-block-world-608692895179997252'
             className='text-blue-400 hover:text-blue-300'
           >
             Discord Server

web/src/modules/browse/components/client/context/RecentSongs.context.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { BROWSER_SONGS } from '@shared/validation/song/constants';
 import { SongPreviewDtoType } from '@shared/validation/song/dto/types';
 import {
   createContext,
@@ -39,7 +38,7 @@ export function RecentSongsProvider({
     useState<SongPreviewDtoType[]>(initialRecentSongs);
 
   const [recentError, setRecentError] = useState<string>('');
-  const [page, setPage] = useState<number>(3);
+  const [page, setPage] = useState<number>(0);
   const [loading, setLoading] = useState(false);
   const [hasMore, setHasMore] = useState(true);
   const [categories, setCategories] = useState<Record<string, number>>({});
@@ -56,7 +55,7 @@ export function RecentSongsProvider({
           {
             params: {
               page,
-              limit: 8, // TODO: fix constants
+              limit: 12, // TODO: fix constants
               order: false,
             },
           },
@@ -67,7 +66,7 @@ export function RecentSongsProvider({
           ...response.data,
         ]);
 
-        if (response.data.length < 8) {
+        if (response.data.length < 12) {
           setHasMore(false);
         }
       } catch (error) {
@@ -114,18 +113,13 @@ export function RecentSongsProvider({
     setEndpoint(newEndpoint);
   }, [selectedCategory]);
 
-  // Fetch recent songs when the page or endpoint changes
   useEffect(() => {
+    if (page === 0) return;
     fetchRecentSongs();
-  }, [page, endpoint]);
+  }, [page, endpoint, fetchRecentSongs]);
 
   async function increasePageRecent() {
-    if (
-      BROWSER_SONGS.max_recent_songs <= recentSongs.length ||
-      loading ||
-      recentError ||
-      !hasMore
-    ) {
+    if (loading || recentError || !hasMore) {
       return;
     }