Feature/username edit

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
 

server/src/auth/auth.service.spec.ts

@@ -51,7 +51,7 @@ describe('AuthService', () => {
         },
         {
           provide: 'COOKIE_EXPIRES_IN',
-          useValue: '1d',
+          useValue: '3600',
         },
         {
           provide: 'JWT_SECRET',
@@ -373,15 +373,15 @@ describe('AuthService', () => {
 
       expect(res.cookie).toHaveBeenCalledWith('token', 'access-token', {
         domain: '.test.com',
-        maxAge: 1,
+        maxAge: 3600000,
       });
 
       expect(res.cookie).toHaveBeenCalledWith(
         'refresh_token',
         'refresh-token',
         {
           domain: '.test.com',
-          maxAge: 1,
+          maxAge: 3600000,
         },
       );
 

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"',

server/src/user/user.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Inject, Query } from '@nestjs/common';
+import { Body, Controller, Get, Inject, Patch, Query } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { PageQueryDTO } from '@shared/validation/common/dto/PageQuery.dto';
 import { GetUser } from '@shared/validation/user/dto/GetUser.dto';
@@ -7,6 +7,7 @@ import { GetRequestToken, validateUser } from '@server/GetRequestUser';
 
 import { UserDocument } from './entity/user.entity';
 import { UserService } from './user.service';
+import { UpdateUsernameDto } from '@shared/validation/user/dto/UpdateUsername.dto';
 
 @Controller('user')
 export class UserController {
@@ -37,4 +38,16 @@ export class UserController {
     user = validateUser(user);
     return await this.userService.getSelfUserData(user);
   }
+
+  @Patch('username')
+  @ApiTags('user')
+  @ApiBearerAuth()
+  @ApiOperation({ summary: 'Update the username' })
+  async updateUsername(
+    @GetRequestToken() user: UserDocument | null,
+    @Body() body: UpdateUsernameDto,
+  ) {
+    user = validateUser(user);
+    return await this.userService.updateUsername(user, body);
+  }
 }

server/src/user/user.service.spec.ts

@@ -287,4 +287,75 @@ describe('UserService', () => {
       expect(service.usernameExists).toHaveBeenCalledWith(baseUsername);
     });
   });
+
+  describe('normalizeUsername', () => {
+    it('should normalize a username', () => {
+      const inputUsername = 'tést user';
+      const normalizedUsername = 'test_user';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+
+    it('should remove special characters from a username', () => {
+      const inputUsername = '静_かな';
+      const normalizedUsername = '_';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+
+    it('should replace spaces with underscores in a username', () => {
+      const inputUsername = 'Имя пользователя';
+      const normalizedUsername = '_';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+
+    it('should replace spaces with underscores in a username', () => {
+      const inputUsername = 'Eglė Čepulytė';
+      const normalizedUsername = 'Egle_Cepulyte';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+  });
+
+  describe('updateUsername', () => {
+    it('should update a user username', async () => {
+      const user = {
+        username: 'testuser',
+        save: jest.fn().mockReturnThis(),
+      } as unknown as UserDocument;
+      const body = { username: 'newuser' };
+
+      jest.spyOn(service, 'usernameExists').mockResolvedValue(false);
+
+      const result = await service.updateUsername(user, body);
+
+      expect(result).toEqual(user);
+      expect(user.username).toBe(body.username);
+      expect(service.usernameExists).toHaveBeenCalledWith(body.username);
+    });
+
+    it('should throw an error if username already exists', async () => {
+      const user = {
+        username: 'testuser',
+        save: jest.fn().mockReturnThis(),
+      } as unknown as UserDocument;
+
+      const body = { username: 'newuser' };
+
+      jest.spyOn(service, 'usernameExists').mockResolvedValue(true);
+
+      await expect(service.updateUsername(user, body)).rejects.toThrow(
+        new HttpException('Username already exists', HttpStatus.BAD_REQUEST),
+      );
+    });
+  });
 });

server/src/user/user.service.ts

@@ -5,7 +5,7 @@ import { CreateUser } from '@shared/validation/user/dto/CreateUser.dto';
 import { GetUser } from '@shared/validation/user/dto/GetUser.dto';
 import { validate } from 'class-validator';
 import { Model } from 'mongoose';
-
+import { UpdateUsernameDto } from '@shared/validation/user/dto/UpdateUsername.dto';
 import { User, UserDocument } from './entity/user.entity';
 
 @Injectable()
@@ -106,14 +106,17 @@ export class UserService {
     return !!user;
   }
 
-  public async generateUsername(inputUsername: string) {
-    // Normalize username (remove accents, replace spaces with underscores)
-    const baseUsername = inputUsername
+  private normalizeUsername = (inputUsername: string) =>
+    inputUsername
       .replace(' ', '_')
       .normalize('NFKD')
       .replace(/[\u0300-\u036f]/g, '')
       .replace(/[^a-zA-Z0-9_]/g, '');
 
+  public async generateUsername(inputUsername: string) {
+    // Normalize username (remove accents, replace spaces with underscores)
+    const baseUsername = this.normalizeUsername(inputUsername);
+
     let newUsername = baseUsername;
     let counter = 1;
 
@@ -125,4 +128,24 @@ export class UserService {
 
     return newUsername;
   }
+
+  public async updateUsername(user: UserDocument, body: UpdateUsernameDto) {
+    let { username } = body;
+    username = this.normalizeUsername(username);
+
+    if (await this.usernameExists(username)) {
+      throw new HttpException(
+        'Username already exists',
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    if (user.username === username) {
+      throw new HttpException('Username is the same', HttpStatus.BAD_REQUEST);
+    }
+
+    user.username = username;
+
+    return await user.save();
+  }
 }

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,
 });

shared/validation/user/dto/UpdateUsername.dto.ts

@@ -0,0 +1,13 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsNotEmpty, MinLength, MaxLength } from 'class-validator';
+
+export class UpdateUsernameDto {
+  @IsString()
+  @MaxLength(64)
+  @MinLength(3)
+  @ApiProperty({
+    description: 'Username of the user',
+    example: 'tomast1137',
+  })
+  username: string;
+}

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

@@ -2,6 +2,6 @@ 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!
 
-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 [opennbs@gmail.com](opennbs@gmail.com).

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/lib/axios/ClientAxios.ts

@@ -0,0 +1,24 @@
+import axios from 'axios';
+import { getTokenLocal } from './token.utils';
+export const baseApiURL = process.env.NEXT_PUBLIC_API_URL;
+
+const ClientAxios = axios.create({
+  baseURL: baseApiURL,
+  withCredentials: true,
+});
+
+// Add a request interceptor to add the token to the request
+ClientAxios.interceptors.request.use(
+  (config) => {
+    const token = getTokenLocal();
+
+    config.headers.authorization = `Bearer ${token}`;
+
+    return config;
+  },
+  (error) => {
+    return Promise.reject(error);
+  },
+);
+
+export default ClientAxios;

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;
     }