esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merge pull request 'added error handling when requesting to join non existing room' (#41) from bugfix/unhandled-error-when-trying-to-join-non-existing-room into develop
All checks were successful
default-pipeline default-pipeline #187
Details

Browse Source 
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/41
Reviewed-by: Pőcze Bence <bence@pocze.ch>
This commit is contained in:
Balázs Vigh 2021-05-08 20:59:29 +02:00
commit 7f8c1eb291
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/static/js/game.js
View File

@ -410,6 +410,10 @@
MapGuesser.showModalWithContent('Error', 'This game is already started, you cannot join.'); MapGuesser.showModalWithContent('Error', 'This game is already started, you cannot join.');
break; break;
case 'game_not_found':
MapGuesser.showModalWithContent('Error', 'The game room was not found by this ID. Please check the link.');
break;
default: default:
MapGuesser.showModalWithContent('Error', 'Error code: \'' + error + '\''); MapGuesser.showModalWithContent('Error', 'Error code: \'' + error + '\'');
break break

5
src/Controller/GameController.php
View File

@ -114,6 +114,11 @@ class GameController
} }
$room = $this->multiRoomRepository->getByRoomId($roomId); $room = $this->multiRoomRepository->getByRoomId($roomId);
if(!isset($room)) {
return new JsonContent(['error' => 'game_not_found']);
}
$state = $room->getStateArray(); $state = $room->getStateArray();
$map = $this->mapRepository->getById($state['mapId']); $map = $this->mapRepository->getById($state['mapId']);
$token = $this->getMultiToken($roomId); $token = $this->getMultiToken($roomId);