fuk it

src/events/gameMaster/assetManager/object/list.ts

@@ -2,6 +2,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import { Object } from '@prisma/client'
 import ObjectRepository from '../../../../repositories/objectRepository'
+import CharacterManager from '../../../../managers/characterManager'
 
 interface IPayload {}
 
@@ -12,8 +13,9 @@ interface IPayload {}
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:object:list', async (data: any, callback: (response: Object[]) => void) => {
-    if (socket.character?.role !== 'gm') {
-      console.log(`---Character #${socket.character?.id} is not a game master.`)
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
+      console.log(`---Character #${character?.id} is not a game master.`)
       return
     }
 

src/events/gameMaster/assetManager/object/remove.ts

@@ -3,6 +3,7 @@ import { TSocket } from '../../../../utilities/types'
 import path from 'path'
 import fs from 'fs'
 import prisma from '../../../../utilities/prisma'
+import CharacterManager from '../../../../managers/characterManager'
 
 interface IPayload {
   object: string
@@ -15,7 +16,8 @@ interface IPayload {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:object:remove', async (data: IPayload, callback: (response: boolean) => void) => {
-    if (socket.character?.role !== 'gm') {
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
       return
     }
 

src/events/gameMaster/assetManager/object/update.ts

@@ -1,6 +1,7 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
+import CharacterManager from '../../../../managers/characterManager'
 
 type Payload = {
   id: string
@@ -21,7 +22,8 @@ type Payload = {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:object:update', async (data: Payload, callback: (success: boolean) => void) => {
-    if (socket.character?.role !== 'gm') {
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
       return
     }
 

src/events/gameMaster/assetManager/object/upload.ts

@@ -6,6 +6,7 @@ import fs from 'fs/promises'
 import prisma from '../../../../utilities/prisma'
 import sharp from 'sharp'
 import logger from '../../../../utilities/logger'
+import CharacterManager from '../../../../managers/characterManager'
 
 interface IObjectData {
   [key: string]: Buffer
@@ -23,7 +24,8 @@ export default class ObjectUploadEvent {
 
   private async handleObjectUpload(data: IObjectData, callback: (response: boolean) => void): Promise<void> {
     try {
-      if (this.socket.character?.role !== 'gm') {
+      const character = CharacterManager.getCharacterFromSocket(this.socket);
+      if (character?.role !== 'gm') {
         callback(false)
         return
       }

src/events/gameMaster/assetManager/sprite/create.ts

@@ -3,6 +3,7 @@ import { TSocket } from '../../../../utilities/types'
 import path from 'path'
 import fs from 'fs/promises'
 import prisma from '../../../../utilities/prisma'
+import CharacterManager from '../../../../managers/characterManager'
 
 /**
  * Handle game master new sprite event
@@ -12,7 +13,11 @@ import prisma from '../../../../utilities/prisma'
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:sprite:create', async (data: undefined, callback: (response: boolean) => void) => {
     try {
-      if (socket.character?.role !== 'gm') {
+      if (!socket.characterId) return
+      const character = CharacterManager.getCharacterFromSocket(socket);
+      if(!character) return
+
+      if (character.role !== 'gm') {
         callback(false)
         return
       }

src/events/gameMaster/assetManager/sprite/delete.ts

@@ -4,6 +4,7 @@ import fs from 'fs'
 import path from 'path'
 import prisma from '../../../../utilities/prisma'
 import logger from '../../../../utilities/logger'
+import CharacterManager from '../../../../managers/characterManager'
 
 type Payload = {
   id: string
@@ -24,7 +25,8 @@ export default class GMSpriteDeleteEvent {
   }
 
   private async handleSpriteDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    if (this.socket.character?.role !== 'gm') {
+    const character = CharacterManager.getCharacterFromSocket(this.socket);
+    if (character?.role !== 'gm') {
       callback(false)
       return
     }

src/events/gameMaster/assetManager/sprite/list.ts

@@ -2,6 +2,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import { Sprite } from '@prisma/client'
 import SpriteRepository from '../../../../repositories/spriteRepository'
+import CharacterManager from '../../../../managers/characterManager'
 
 interface IPayload {}
 
@@ -12,8 +13,9 @@ interface IPayload {}
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:sprite:list', async (data: any, callback: (response: Sprite[]) => void) => {
-    if (socket.character?.role !== 'gm') {
-      console.log(`---Character #${socket.character?.id} is not a game master.`)
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
+      console.log(`---Character #${character?.id} is not a game master.`)
       return
     }
 

src/events/gameMaster/assetManager/sprite/update.ts

@@ -5,6 +5,7 @@ import type { Prisma, SpriteAction } from '@prisma/client'
 import path from 'path'
 import { writeFile, mkdir } from 'node:fs/promises'
 import sharp from 'sharp'
+import CharacterManager from '../../../../managers/characterManager'
 
 type SpriteActionInput = Omit<SpriteAction, 'id' | 'spriteId' | 'frameWidth' | 'frameHeight'> & {
   sprites: string[]
@@ -28,7 +29,8 @@ interface ProcessedSpriteAction extends SpriteActionInput {
 
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:sprite:update', async (data: Payload, callback: (success: boolean) => void) => {
-    if (socket.character?.role !== 'gm') {
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
       callback(false)
       return
     }

src/events/gameMaster/assetManager/tile/delete.ts

@@ -4,6 +4,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
 import logger from '../../../../utilities/logger'
+import CharacterManager from '../../../../managers/characterManager'
 
 type Payload = {
   id: string
@@ -24,7 +25,8 @@ export default class GMTileDeleteEvent {
   }
 
   private async handleTileDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    if (this.socket.character?.role !== 'gm') {
+    const character = CharacterManager.getCharacterFromSocket(this.socket);
+    if (character?.role !== 'gm') {
       callback(false)
       return
     }

src/events/gameMaster/assetManager/tile/list.ts

@@ -2,6 +2,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import { Tile } from '@prisma/client'
 import TileRepository from '../../../../repositories/tileRepository'
+import CharacterManager from '../../../../managers/characterManager'
 
 interface IPayload {}
 
@@ -12,8 +13,9 @@ interface IPayload {}
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:tile:list', async (data: any, callback: (response: Tile[]) => void) => {
-    if (socket.character?.role !== 'gm') {
-      console.log(`---Character #${socket.character?.id} is not a game master.`)
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
+      console.log(`---Character #${character?.id} is not a game master.`)
       return
     }
 

src/events/gameMaster/assetManager/tile/update.ts

@@ -1,6 +1,7 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
+import CharacterManager from '../../../../managers/characterManager'
 
 type Payload = {
   id: string
@@ -15,7 +16,8 @@ type Payload = {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:tile:update', async (data: Payload, callback: (success: boolean) => void) => {
-    if (socket.character?.role !== 'gm') {
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
       return
     }
 

src/events/gameMaster/assetManager/tile/upload.ts

@@ -4,6 +4,7 @@ import { writeFile } from 'node:fs/promises'
 import path from 'path'
 import fs from 'fs/promises'
 import prisma from '../../../../utilities/prisma'
+import CharacterManager from '../../../../managers/characterManager'
 
 interface ITileData {
   [key: string]: Buffer
@@ -17,7 +18,8 @@ interface ITileData {
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:tile:upload', async (data: ITileData, callback: (response: boolean) => void) => {
     try {
-      if (socket.character?.role !== 'gm') {
+      const character = CharacterManager.getCharacterFromSocket(socket);
+      if (character?.role !== 'gm') {
         callback(false)
         return
       }

src/events/gameMaster/zoneEditor/create.ts

@@ -3,6 +3,7 @@ import { TSocket } from '../../../utilities/types'
 import ZoneRepository from '../../../repositories/zoneRepository'
 import { Zone } from '@prisma/client'
 import prisma from '../../../utilities/prisma'
+import CharacterManager from '../../../managers/characterManager'
 
 type Payload = {
   name: string
@@ -17,12 +18,13 @@ type Payload = {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:zone_editor:zone:create', async (data: Payload, callback: (response: Zone[]) => void) => {
-    if (socket.character?.role !== 'gm') {
-      console.log(`---Character #${socket.character?.id} is not a game master.`)
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
+      console.log(`---Character #${character?.id} is not a game master.`)
       return
     }
 
-    console.log(`---GM ${socket.character?.id} has created a new zone via zone editor.`)
+    console.log(`---GM ${character?.id} has created a new zone via zone editor.`)
     let zoneList: Zone[] = []
     try {
       const zone = await prisma.zone.create({

src/events/gameMaster/zoneEditor/delete.ts

@@ -2,6 +2,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/types'
 import ZoneRepository from '../../../repositories/zoneRepository'
 import prisma from '../../../utilities/prisma'
+import CharacterManager from '../../../managers/characterManager'
 
 type Payload = {
   zoneId: number
@@ -14,12 +15,14 @@ type Payload = {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:zone_editor:zone:delete', async (data: Payload, callback: (response: boolean) => void) => {
-    if (socket.character?.role !== 'gm') {
-      console.log(`---Character #${socket.character?.id} is not a game master.`)
+    const character = CharacterManager.getCharacterFromSocket(socket);
+
+    if (character?.role !== 'gm') {
+      console.log(`---Character #${character?.id} is not a game master.`)
       return
     }
 
-    console.log(`---GM ${socket.character?.id} has deleted a zone via zone editor.`)
+    console.log(`---GM ${character?.id} has deleted a zone via zone editor.`)
 
     try {
       const zone = await ZoneRepository.getById(data.zoneId)

src/events/gameMaster/zoneEditor/list.ts

@@ -2,6 +2,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/types'
 import { Zone } from '@prisma/client'
 import ZoneRepository from '../../../repositories/zoneRepository'
+import CharacterManager from '../../../managers/characterManager'
 
 interface IPayload {}
 
@@ -12,12 +13,13 @@ interface IPayload {}
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:zone_editor:zone:list', async (data: IPayload, callback: (response: Zone[]) => void) => {
-    if (socket.character?.role !== 'gm') {
-      console.log(`---Character #${socket.character?.id} is not a game master.`)
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
+      console.log(`---Character #${character?.id} is not a game master.`)
       return
     }
 
-    console.log(`---GM ${socket.character?.id} has requested zone list via zone editor.`)
+    console.log(`---GM ${character?.id} has requested zone list via zone editor.`)
 
     try {
       const zones = await ZoneRepository.getAll()

src/events/gameMaster/zoneEditor/request.ts

@@ -2,6 +2,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/types'
 import ZoneRepository from '../../../repositories/zoneRepository'
 import { Zone } from '@prisma/client'
+import CharacterManager from '../../../managers/characterManager'
 
 interface IPayload {
   zoneId: number
@@ -14,11 +15,12 @@ interface IPayload {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:zone_editor:zone:request', async (data: IPayload, callback: (response: Zone) => void) => {
-    if (socket.character?.role !== 'gm') {
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
       return
     }
 
-    console.log(`---GM ${socket.character?.id} has requested zone via zone editor.`)
+    console.log(`---GM ${character?.id} has requested zone via zone editor.`)
 
     if (!data.zoneId) {
       console.log(`---Zone id not provided.`)

src/events/gameMaster/zoneEditor/update.ts

@@ -5,6 +5,7 @@ import { Zone, ZoneEventTile, ZoneEventTileType, ZoneObject } from '@prisma/clie
 import prisma from '../../../utilities/prisma'
 import zoneManager from '../../../managers/zoneManager'
 import logger from '../../../utilities/logger'
+import CharacterManager from '../../../managers/characterManager'
 
 interface IPayload {
   zoneId: number
@@ -33,15 +34,16 @@ interface IPayload {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:zone_editor:zone:update', async (data: IPayload, callback: (response: Zone) => void) => {
-    if (socket.character?.role !== 'gm') {
-      logger.info(`User ${socket.character?.id} tried to update zone but is not a game master.`)
+    const character = CharacterManager.getCharacterFromSocket(socket);
+    if (character?.role !== 'gm') {
+      logger.info(`User ${character?.id} tried to update zone but is not a game master.`)
       return
     }
 
-    logger.info(`User ${socket.character?.id} has updated zone via zone editor.`)
+    logger.info(`User ${character?.id} has updated zone via zone editor.`)
 
     if (!data.zoneId) {
-      logger.info(`User ${socket.character?.id} tried to update zone but did not provide a zone id.`)
+      logger.info(`User ${character?.id} tried to update zone but did not provide a zone id.`)
       return
     }
 
@@ -49,7 +51,7 @@ export default function (socket: TSocket, io: Server) {
       let zone = await ZoneRepository.getById(data.zoneId)
 
       if (!zone) {
-        logger.info(`User ${socket.character?.id} tried to update zone ${data.zoneId} but it does not exist.`)
+        logger.info(`User ${character?.id} tried to update zone ${data.zoneId} but it does not exist.`)
         return
       }
 
@@ -103,7 +105,7 @@ export default function (socket: TSocket, io: Server) {
       zone = await ZoneRepository.getById(data.zoneId)
 
       if (!zone) {
-        logger.info(`User ${socket.character?.id} tried to update zone ${data.zoneId} but it does not exist.`)
+        logger.info(`User ${character?.id} tried to update zone ${data.zoneId} but it does not exist.`)
         return
       }