From acdae93ac3cb9bd80dd9ac3a3725321144cbe11c Mon Sep 17 00:00:00 2001 From: SIMAILA Djalim Date: Fri, 13 Jan 2023 15:06:46 +0100 Subject: [PATCH] fix bug in image related requests --- truthseeker/logic/game_logic.py | 2 +- truthseeker/routes/routes_api.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/truthseeker/logic/game_logic.py b/truthseeker/logic/game_logic.py index 9e6f2f8..b1730ba 100644 --- a/truthseeker/logic/game_logic.py +++ b/truthseeker/logic/game_logic.py @@ -120,7 +120,7 @@ class Game: """ if npc_id not in self.reaction_table.keys(): return 0 - reaction_id = self.reaction_table[npc_id][int(reaction)] + reaction_id = self.reaction_table[npc_id] return read_image(f"./truthseeker/static/images/npc/{npc_id}/{reaction_id}.png") def get_player_results(self, responses: dict) -> None: diff --git a/truthseeker/routes/routes_api.py b/truthseeker/routes/routes_api.py index 96167a4..f054f75 100644 --- a/truthseeker/routes/routes_api.py +++ b/truthseeker/routes/routes_api.py @@ -120,8 +120,11 @@ def get_data(): @routes_api.route("/getNpcImage", methods=["GET", "POST"]) def getNpcImage(): npc_id = flask.request.values.get("npcid") + if npc_id is None: + return {"error": 1, "msg": "no npc was given"} image = game_logic.get_npc_image(npc_id) - + if image is None: + return {"error": 1, "msg": "npc not found"} response = flask.make_response(image) response.headers.set('Content-Type', 'image/png') response.headers.set( @@ -194,6 +197,7 @@ def checkAnwser(): if game.has_finished(): jsonGameResults = game.generate_game_results() APP.socketio_app.emit("gamefinshed",jsonGameResults,room="game."+game.game_id) + #TODO desctruct game response = {"error": 0} return response