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

Author: tomast1337

server/src/file/file.service.ts

@@ -131,7 +131,10 @@ export class FileService {
     const command = new GetObjectCommand({
       Bucket: bucket,
       Key: key,
-      ResponseContentDisposition: `attachment; filename="${filename}"`,
+      ResponseContentDisposition: `attachment; filename="${filename.replace(
+        /[/"]/g,
+        '_',
+      )}"`,
     });
 
     const signedUrl = await getSignedUrl(this.s3Client, command, {

server/src/main.ts

@@ -36,7 +36,7 @@ async function bootstrap() {
   app.enableCors({
     allowedHeaders: ['content-type', 'authorization', 'src'],
     exposedHeaders: ['Content-Disposition'],
-    origin: process.env.FRONTEND_URL,
+    origin: [process.env.FRONTEND_URL || '', 'https://bentroen.github.io'],
     credentials: true,
   });
 

server/src/user/entity/user.entity.ts

@@ -83,24 +83,6 @@ export class User {
 
   @Prop({ type: Boolean, required: true, default: true })
   prefersDarkTheme: boolean;
-
-  @Prop({ type: Array, required: true, default: [] })
-  likedSongs: string[];
-
-  @Prop({ type: Array, required: true, default: [] })
-  following: string[];
-
-  @Prop({ type: Array, required: true, default: [] })
-  likedComments: string[];
-
-  @Prop({ type: Array, required: true, default: [] })
-  dislikedComments: string[];
-
-  @Prop({ type: Array, required: true, default: [] })
-  notifications: string[];
-
-  @Prop({ type: Array, required: true, default: [] })
-  achievements: string[];
 }
 
 export const UserSchema = SchemaFactory.createForClass(User);

shared/features/song/obfuscate.ts

@@ -122,6 +122,7 @@ export class SongObfuscator {
 
       let key, pitch;
 
+      // TODO: add regression test for this behavior
       if (factoredPitch < 0) {
         // Below A0
         key = 0;

web/posts/blog/2025-04-25_blanketcon-2025

@@ -0,0 +1,16 @@
+---
+title: 'Note Block World is at BlanketCon 2025!'
+date: '2025-04-25'
+author: 'encode42'
+authorImage: 'encode42.png'
+image: '/img/blog/blanketcon-2025.jpg'
+tags: ['news']
+---
+
+Hello all! **Note Block Studio** and **Note Block World** will be attending [BlanketCon](https://modfest.net/bc25), an in-game Minecraft modding convention hosted by [ModFest](https://modfest.net/)! Featuring **200+ projects** from the Minecraft modding ecosystem, as well as various mini-games and much to explore, there's much to offer during the event.
+
+The opening ceremony starts at **April 26th, 2025** at **midnight (UTC)**. You'll be able to explore the server until its closing ceremony at **April 27th, 2025**, at **11 PM (UTC)**. We hope to see you there!
+
+You can learn more about the event on ModFest's [website](https://modfest.net/), or through their Discord server and event, which you can find [here](https://discord.com/channels/608692895179997252/609153152360513555/1365213248227377202).
+
+We hope you enjoy the event, and we can't wait to see you there! Have fun!!

web/public/img/blog/blanketcon-2025.jpg

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

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

@@ -46,7 +46,7 @@ const BlogPageComponent = ({ posts }: { posts: PostType[] }) => {
                 width={480}
                 height={360}
                 alt=''
-                className='rounded-md aspect-[3/2] w-full object-cover transition-all duration-300 mb-2'
+                className='rounded-md aspect-[16/9] 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'>

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

@@ -18,12 +18,6 @@ export type LoggedUserData = {
   creationDate: string;
   lastEdited: string;
   lastLogin: string;
-  likedSongs: string[]; // Assuming the array contains strings
-  following: string[]; // Assuming the array contains strings
-  likedComments: string[]; // Assuming the array contains strings
-  dislikedComments: string[]; // Assuming the array contains strings
-  notifications: string[]; // Assuming the array contains strings
-  achievements: string[]; // Assuming the array contains strings
   createdAt: string;
   updatedAt: string;
   id: string;
@@ -60,7 +54,4 @@ export type UserProfileData = {
   description: string;
   profileImage: string;
   socialLinks: SocialLinks;
-  likedSongs: string[];
-  following: string[];
-  achievements: string[];
 };

web/src/modules/auth/types/User.ts

@@ -56,7 +56,11 @@ const AdTemplate = ({
 
   useEffect(() => {
     if (window) {
-      (window.adsbygoogle = window.adsbygoogle || []).push({});
+      try {
+        (window.adsbygoogle = window.adsbygoogle || []).push({});
+      } catch (e) {
+        console.error(e);
+      }
     }
   }, []);
 

web/src/modules/shared/components/client/ads/AdSlots.tsx

@@ -15,8 +15,6 @@ const UserProfile = ({ userData }: UserProfileProps) => {
     description,
     profileImage,
     socialLinks,
-    following,
-    achievements,
   } = userData;
 
   return (
@@ -33,7 +31,6 @@ const UserProfile = ({ userData }: UserProfileProps) => {
       <p className='text-gray-500'>Last Login: {lastLogin.toLocaleString()}</p>
       <p className='text-gray-500'>Login Streak: {loginStreak}</p>
       <p className='text-gray-500'>Play Count: {playCount}</p>
-      <p className='text-gray-500'>Following: {following}</p>
       <ul className='mt-4'>
         {Object.keys(socialLinks).map((key, index) => {
           const link = socialLinks[key as SocialLinksTypes];
@@ -48,14 +45,6 @@ const UserProfile = ({ userData }: UserProfileProps) => {
           );
         })}
       </ul>
-      <ul></ul>
-      <ul className='mt-4'>
-        {achievements.map((achievement, index) => (
-          <li key={index} className='text-gray-500'>
-            {achievement}
-          </li>
-        ))}
-      </ul>
     </section>
   );
 };