GM event fixes

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

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

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

@@ -4,6 +4,7 @@ import path from 'path'
 import fs from 'fs'
 import prisma from '../../../../utilities/prisma'
 import CharacterManager from '../../../../managers/characterManager'
+import characterRepository from '../../../../repositories/characterRepository'
 
 interface IPayload {
   object: string
@@ -16,9 +17,11 @@ interface IPayload {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:object:remove', async (data: IPayload, callback: (response: boolean) => void) => {
-    const character = CharacterManager.getCharacterFromSocket(socket);
-    if (character?.role !== 'gm') {
-      return
+    const character = await characterRepository.getById(socket.characterId as number);
+    if (!character) return callback(false)
+
+    if (character.role !== 'gm') {
+      return callback(false)
     }
 
     try {

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

@@ -2,6 +2,7 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
 import CharacterManager from '../../../../managers/characterManager'
+import characterRepository from '../../../../repositories/characterRepository'
 
 type Payload = {
   id: string
@@ -22,9 +23,11 @@ type Payload = {
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:object:update', async (data: Payload, callback: (success: boolean) => void) => {
-    const character = CharacterManager.getCharacterFromSocket(socket);
-    if (character?.role !== 'gm') {
-      return
+    const character = await characterRepository.getById(socket.characterId as number);
+    if (!character) return callback(false)
+
+    if (character.role !== 'gm') {
+      return callback(false)
     }
 
     try {

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

@@ -7,6 +7,7 @@ import prisma from '../../../../utilities/prisma'
 import sharp from 'sharp'
 import logger from '../../../../utilities/logger'
 import CharacterManager from '../../../../managers/characterManager'
+import characterRepository from '../../../../repositories/characterRepository'
 
 interface IObjectData {
   [key: string]: Buffer
@@ -24,12 +25,12 @@ export default class ObjectUploadEvent {
 
   private async handleObjectUpload(data: IObjectData, callback: (response: boolean) => void): Promise<void> {
     try {
-      const character = CharacterManager.getCharacterFromSocket(this.socket);
-      if (character?.role !== 'gm') {
-        callback(false)
-        return
-      }
+      const character = await characterRepository.getById(this.socket.characterId as number);
+      if (!character) return callback(false)
 
+      if (character.role !== 'gm') {
+        return callback(false)
+      }
       const public_folder = path.join(process.cwd(), 'public', 'objects')
 
       // Ensure the folder exists

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

@@ -4,6 +4,7 @@ import path from 'path'
 import fs from 'fs/promises'
 import prisma from '../../../../utilities/prisma'
 import CharacterManager from '../../../../managers/characterManager'
+import characterRepository from '../../../../repositories/characterRepository'
 
 /**
  * Handle game master new sprite event
@@ -13,13 +14,11 @@ import CharacterManager from '../../../../managers/characterManager'
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:sprite:create', async (data: undefined, callback: (response: boolean) => void) => {
     try {
-      if (!socket.characterId) return
-      const character = CharacterManager.getCharacterFromSocket(socket);
-      if(!character) return
+      const character = await characterRepository.getById(socket.characterId as number);
+      if (!character) return callback(false)
 
       if (character.role !== 'gm') {
-        callback(false)
-        return
+        return callback(false)
       }
 
       const public_folder = path.join(process.cwd(), 'public', 'sprites')

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

@@ -27,8 +27,7 @@ export default class GMSpriteDeleteEvent {
   private async handleSpriteDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
     const character = CharacterManager.getCharacterFromSocket(this.socket);
     if (character?.role !== 'gm') {
-      callback(false)
-      return
+      return callback(false)
     }
 
     try {

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

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

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

@@ -31,8 +31,7 @@ export default function (socket: TSocket, io: Server) {
   socket.on('gm:sprite:update', async (data: Payload, callback: (success: boolean) => void) => {
     const character = CharacterManager.getCharacterFromSocket(socket);
     if (character?.role !== 'gm') {
-      callback(false)
-      return
+      return callback(false)
     }
 
     try {

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

@@ -5,6 +5,7 @@ import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
 import logger from '../../../../utilities/logger'
 import CharacterManager from '../../../../managers/characterManager'
+import characterRepository from '../../../../repositories/characterRepository'
 
 type Payload = {
   id: string
@@ -25,9 +26,10 @@ export default class GMTileDeleteEvent {
   }
 
   private async handleTileDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    const character = CharacterManager.getCharacterFromSocket(this.socket);
-    if (character?.role !== 'gm') {
-      callback(false)
+    const character = await characterRepository.getById(this.socket.characterId as number);
+    if (!character) return callback(false)
+
+    if (character.role !== 'gm') {
       return
     }
 

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

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

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

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

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

@@ -5,6 +5,8 @@ import path from 'path'
 import fs from 'fs/promises'
 import prisma from '../../../../utilities/prisma'
 import CharacterManager from '../../../../managers/characterManager'
+import characterRepository from '../../../../repositories/characterRepository'
+import logger from '../../../../utilities/logger'
 
 interface ITileData {
   [key: string]: Buffer
@@ -18,9 +20,10 @@ interface ITileData {
 export default function (socket: TSocket, io: Server) {
   socket.on('gm:tile:upload', async (data: ITileData, callback: (response: boolean) => void) => {
     try {
-      const character = CharacterManager.getCharacterFromSocket(socket);
-      if (character?.role !== 'gm') {
-        callback(false)
+      const character = await characterRepository.getById(socket.characterId as number);
+      if (!character) return callback(false)
+
+      if (character.role !== 'gm') {
         return
       }