Oliver/Phantom-Ink-Online
0
0
Fork 0
Code Issues Activity

Correct multiple issues (see detailed description)

Browse source 
1) Not including a status in the 200 response
2) Emitting errors on "Error" instead of "ChosenObject"
3) Using "data.object" instead of "data.choice"
This commit is contained in:
Oliver-Akins 2021-01-02 18:35:11 -07:00
parent 8ab9f558f6
commit 41faf15d24
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/src/events/SelectObject.ts
View file

@ -7,7 +7,7 @@ export default (io: Server, socket: Socket, data: SelectObject) => {
// Assert game exists
if (!games[data.game_code]) {
log.debug(`Can't choose an object for a game that doesn't exist: ${data.game_code}`);
socket.emit(`Error`, {
socket.emit(`ChosenObject`, {
status: 404,
message: `Game with code ${data.game_code} could not be found`,
source: `SelectObject`
@ -17,9 +17,9 @@ export default (io: Server, socket: Socket, data: SelectObject) => {
let game = games[data.game_code];
// Assert that the object is actually a valid choice
if (!game.objects.includes(data.object)) {
game.log.warn(`Someone tried selecting an object that doesn't exist: ${data.object}`);
socket.emit(`Error`, {
if (!game.objects.includes(data.choice)) {
game.log.warn(`Someone tried selecting an object that doesn't exist: ${data.choice}`);
socket.emit(`ChosenObject`, {
status: 409,
message: `That object isn't on the card.`,
source: `SelectObject`
@ -27,14 +27,15 @@ export default (io: Server, socket: Socket, data: SelectObject) => {
return;
};
game.log.debug(`Object has been chosen: ${data.object}`);
game.object = data.object;
game.log.debug(`Object has been chosen: ${data.choice}`);
game.object = data.choice;
io.to(`${game.id}:*:writer`).emit(`ChosenObject`, {
object: data.object
status: 200,
object: data.choice,
});
}
catch (err) {
socket.emit(`Error`, {
socket.emit(`ChosenObject`, {
status: 500,
message: `${err.name}: ${err.message}`,
source: `SelectObject`,