GM event fixes

This commit is contained in:
2024-09-21 00:42:08 +02:00
parent 0a629bf80f
commit 6b2433f814
20 changed files with 105 additions and 72 deletions

View File

@ -4,6 +4,8 @@ import ZoneRepository from '../../../repositories/zoneRepository'
import { Zone } from '@prisma/client'
import prisma from '../../../utilities/prisma'
import CharacterManager from '../../../managers/characterManager'
import characterRepository from '../../../repositories/characterRepository'
import logger from '../../../utilities/logger'
type Payload = {
name: string
@ -18,13 +20,16 @@ type Payload = {
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:zone_editor:zone:create', async (data: Payload, callback: (response: Zone[]) => 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') {
logger.info(`User ${character.id} tried to create zone but is not a game master.`)
return
}
console.log(`---GM ${character?.id} has created a new zone via zone editor.`)
logger.info(`User ${character.id} has created a new zone via zone editor.`)
let zoneList: Zone[] = []
try {
const zone = await prisma.zone.create({

View File

@ -3,6 +3,8 @@ import { TSocket } from '../../../utilities/types'
import ZoneRepository from '../../../repositories/zoneRepository'
import prisma from '../../../utilities/prisma'
import CharacterManager from '../../../managers/characterManager'
import characterRepository from '../../../repositories/characterRepository'
import logger from '../../../utilities/logger'
type Payload = {
zoneId: number
@ -15,14 +17,15 @@ type Payload = {
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:zone_editor:zone:delete', async (data: Payload, callback: (response: boolean) => 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') {
logger.info(`User ${character.id} tried to delete zone but is not a game master.`)
return
}
console.log(`---GM ${character?.id} has deleted a zone via zone editor.`)
logger.info(`User ${character.id} has deleted a zone via zone editor.`)
try {
const zone = await ZoneRepository.getById(data.zoneId)

View File

@ -3,6 +3,8 @@ import { TSocket } from '../../../utilities/types'
import { Zone } from '@prisma/client'
import ZoneRepository from '../../../repositories/zoneRepository'
import CharacterManager from '../../../managers/characterManager'
import characterRepository from '../../../repositories/characterRepository'
import logger from '../../../utilities/logger'
interface IPayload {}
@ -13,13 +15,15 @@ interface IPayload {}
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:zone_editor:zone:list', async (data: IPayload, callback: (response: Zone[]) => 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') {
logger.info(`User ${character.id} tried to list zones but is not a game master.`)
return
}
console.log(`---GM ${character?.id} has requested zone list via zone editor.`)
logger.info(`User ${character.id} has requested zone list via zone editor.`)
try {
const zones = await ZoneRepository.getAll()

View File

@ -1,8 +1,10 @@
import { Server } from 'socket.io'
import { TSocket } from '../../../utilities/types'
import ZoneRepository from '../../../repositories/zoneRepository'
import { Zone } from '@prisma/client'
import { Character, Zone } from '@prisma/client'
import CharacterManager from '../../../managers/characterManager'
import characterRepository from '../../../repositories/characterRepository'
import logger from '../../../utilities/logger'
interface IPayload {
zoneId: number
@ -15,15 +17,18 @@ interface IPayload {
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:zone_editor:zone:request', async (data: IPayload, callback: (response: Zone) => void) => {
const character = CharacterManager.getCharacterFromSocket(socket);
if (character?.role !== 'gm') {
const character = await characterRepository.getById(socket.characterId as number);
if (!character) return
if (character.role !== 'gm') {
logger.info(`User ${character!.id} tried to request zone but is not a game master.`)
return
}
console.log(`---GM ${character?.id} has requested zone via zone editor.`)
logger.info(`User ${character.id} has requested zone via zone editor.`)
if (!data.zoneId) {
console.log(`---Zone id not provided.`)
logger.info(`User ${character.id} tried to request zone but did not provide a zone id.`)
return
}
@ -31,7 +36,7 @@ export default function (socket: TSocket, io: Server) {
const zone = await ZoneRepository.getById(data.zoneId)
if (!zone) {
console.log(`---Zone not found.`)
logger.info(`User ${character.id} tried to request zone ${data.zoneId} but it does not exist.`)
return
}

View File

@ -6,6 +6,7 @@ import prisma from '../../../utilities/prisma'
import zoneManager from '../../../managers/zoneManager'
import logger from '../../../utilities/logger'
import CharacterManager from '../../../managers/characterManager'
import characterRepository from '../../../repositories/characterRepository'
interface IPayload {
zoneId: number
@ -34,16 +35,18 @@ interface IPayload {
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:zone_editor:zone:update', async (data: IPayload, callback: (response: Zone) => void) => {
const character = CharacterManager.getCharacterFromSocket(socket);
if (character?.role !== 'gm') {
logger.info(`User ${character?.id} tried to update zone but is not a game master.`)
const character = await characterRepository.getById(socket.characterId as number);
if (!character) return
if (character.role !== 'gm') {
logger.info(`User ${character.id} tried to update zone but is not a game master.`)
return
}
logger.info(`User ${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 ${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
}
@ -51,7 +54,7 @@ export default function (socket: TSocket, io: Server) {
let zone = await ZoneRepository.getById(data.zoneId)
if (!zone) {
logger.info(`User ${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
}
@ -105,7 +108,7 @@ export default function (socket: TSocket, io: Server) {
zone = await ZoneRepository.getById(data.zoneId)
if (!zone) {
logger.info(`User ${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
}