Merge pull request #1 from hanzydev/main

refactor: improvements

package.json

@@ -3,7 +3,7 @@
     "main": "dist/index.js",
     "type": "module",
     "scripts": {
-        "start": "node scripts/start.js --no-warnings",
+        "start": "node . --no-warnings",
         "dev": "tsup && pnpm start",
         "dev:watch": "tsup --watch --onSuccess \"pnpm start\"",
         "build": "tsup",

src/events/ban.ts

@@ -9,17 +9,14 @@ import { CoreParticipant, Participant } from './login';
 export default class BanOrUnbanParticipant {
     async handle({ socket, io, data }: { socket: Socket; io: Server; data: any }) {
         const targetUserId = data?.target;
-
         if (!targetUserId) return;
 
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         const socketRoomParticipants = (await get(`room:${room}:users`)) as Participant[];
 
         if (socketRoomParticipants) {

src/events/disconnecting.ts

@@ -5,13 +5,11 @@ import { del, delWithPattern, get, set } from '@utils/cache';
 export default class Disconnect {
     async handle({ socket, io }: { socket: Socket; io: Server }) {
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         const socketRoomParticipants = await get(`room:${room}:users`);
 
         if (socketRoomParticipants) {
@@ -25,7 +23,6 @@ export default class Disconnect {
         }
 
         const remainingParticipants = io.sockets.adapter.rooms.get(room);
-
         if (!remainingParticipants) {
             await delWithPattern(`room:${room}:*`);
             await del(`sid:${socketId}`);

src/events/kick.ts

@@ -9,17 +9,14 @@ import { Participant } from './login';
 export default class KickParticipant {
     async handle({ socket, io, data }: { socket: Socket; io: Server; data: any }) {
         const targetUserId = data?.target;
-
         if (!targetUserId) return;
 
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         const socketRoomParticipants = (await get(`room:${room}:users`)) as Participant[];
 
         if (socketRoomParticipants) {

src/events/login.ts

@@ -63,24 +63,21 @@ export default class Login {
         password = password.trim();
         room = room.trim();
 
-        const user = await fetch(`${process.env.API_URL}/user`, {
+        const user = (await fetch(`${process.env.API_URL}/user`, {
             headers: {
                 Authorization: token,
             },
-        });
+        })) as any;
 
         const json = await user.json();
-
         if (!json?.id) return callback({ error: 'Kullanıcı verisi alınamadı' });
 
         const roomParticipants = await get(`${prefix}:users`);
-
         if (roomParticipants && roomParticipants.find((user) => user.id == json.id)) {
             return callback({ error: 'Zaten bu odadasın' });
         }
 
         const getPass = await get(`${prefix}:password`);
-
         if (getPass && getPass != password) {
             return callback({ error: 'Yanlış şifre' });
         }
@@ -89,7 +86,6 @@ export default class Login {
             []) as CoreParticipant[];
 
         const banned = bannedParticipants.find((x) => x.id == json.id);
-
         if (banned) {
             return callback({ error: 'Bu odadan yasaklandınız' });
         }

src/events/message.ts

@@ -11,13 +11,11 @@ export default class CreateMessage {
             data.message.trim().length <= 250
         ) {
             const rooms = Array.from(socket.rooms);
-
             const room = rooms[1];
 
             if (!room) return;
 
             const socketRoomParticipants = await get(`room:${room}:users`);
-
             const author = socketRoomParticipants.find((user) => user.sid == socket.id);
 
             if (!author) return;

src/events/mod.ts

@@ -8,17 +8,14 @@ import { Participant } from './login';
 export default class MakeModeratorOrTakeModerator {
     async handle({ socket, io, data }: { socket: Socket; io: Server; data: any }) {
         const targetUserId = data?.target;
-
         if (!targetUserId) return;
 
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         const socketRoomParticipants = (await get(`room:${room}:users`)) as Participant[];
 
         if (socketRoomParticipants) {

src/events/modControl.ts

@@ -7,19 +7,15 @@ import { Participant } from './login';
 export default class ChangeModeratorControl {
     async handle({ socket, io, data }: { socket: Socket; io: Server; data: any }) {
         const controlledByMods = data?.controlledByMods;
-
-        if (!(controlledByMods == true || controlledByMods == false)) return;
+        if (typeof controlledByMods !== 'boolean') return;
 
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         const socketRoomParticipants = (await get(`room:${room}:users`)) as Participant[];
-
         const user = socketRoomParticipants.find((user) => user.sid == socketId);
 
         if (user.owner) {

src/events/mute.ts

@@ -9,17 +9,14 @@ import { Participant } from './login';
 export default class MuteOrUnmuteParticipant {
     async handle({ socket, io, data }: { socket: Socket; io: Server; data: any }) {
         const targetUserId = data?.target;
-
         if (!targetUserId) return;
 
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         const socketRoomParticipants = (await get(`room:${room}:users`)) as Participant[];
 
         if (socketRoomParticipants) {

src/events/playerState.ts

@@ -7,21 +7,17 @@ import { Participant } from './login';
 export default class MuteOrUnmuteParticipant {
     async handle({ socket, data }: { socket: Socket; data: any }) {
         const playing = data?.playing;
-
-        if (!(playing == true || playing == false)) return;
+        if (typeof data?.playing !== 'boolean') return;
 
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         let pass = false;
 
         const modRequired = (await get(`room:${room}:controlledByMods`)) ?? false;
-
         if (modRequired) {
             const socketRoomParticipants = (await get(`room:${room}:users`)) as Participant[];
 

src/events/playerTimestamp.ts

@@ -7,21 +7,17 @@ import { Participant } from './login';
 export default class MuteOrUnmuteParticipant {
     async handle({ socket, data }: { socket: Socket; data: any }) {
         const videoTimestamp = data?.timestamp;
-
         if (isNaN(videoTimestamp)) return;
 
         const rooms = Array.from(socket.rooms);
-
         const room = rooms[1];
 
         if (!room) return;
 
         const socketId = socket.id;
-
         let pass = false;
 
         const modRequired = (await get(`room:${room}:controlledByMods`)) ?? false;
-
         if (modRequired) {
             const socketRoomParticipants = (await get(`room:${room}:users`)) as Participant[];