From 05d22a0ce8eea2b5f85aa3ec89561aa81e4cf2c6 Mon Sep 17 00:00:00 2001 From: Ceda EI Date: Sat, 16 Mar 2019 14:46:47 +0530 Subject: [PATCH] Add "bad values" error --- errors.py | 1 + server.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/errors.py b/errors.py index 0826a60..a0ae6d8 100644 --- a/errors.py +++ b/errors.py @@ -1,3 +1,4 @@ _400 = {"error": "insufficient parameters"} +_400_bv = {"error": "bad values"} _401 = {"error": "invalid token"} _404 = {"error": "The quest/side quest doesn't exist"} diff --git a/server.py b/server.py index 1a630fd..e310954 100644 --- a/server.py +++ b/server.py @@ -149,10 +149,10 @@ def add_quest(db): except (KeyError): return jsonify(errors._400), 400 except (ValueError): - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 if imp not in [1, 2, 3] or diff not in [1, 2, 3]: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 quest = questable.add_quest(db, player.CHAT_ID, qid, name, imp, diff, 0) return jsonify(dictify_quest(quest)) @@ -182,10 +182,10 @@ def add_side_quest(db): except (KeyError): return jsonify(errors._400), 400 except (ValueError): - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 if imp not in [1, 2, 3] or diff not in [1, 2, 3]: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 quest = questable.add_side_quest(db, player.CHAT_ID, qid, name, imp, diff, 0) @@ -227,13 +227,13 @@ def update_quest(db): if diff in [1, 2, 3]: quest.diff = diff else: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 elif i == "priority": imp = int(request.values["priority"]) if imp in [1, 2, 3]: quest.imp = imp else: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 elif i == "state": state = bool(request.values["state"]) if state is True: @@ -241,9 +241,9 @@ def update_quest(db): points = 55 + 10*quest.imp + 15*quest.diff player.add_points(points) else: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 except (ValueError): - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 quest.update_db() return jsonify(dictify_quest(quest)) @@ -284,13 +284,13 @@ def update_side_quest(db): if diff in [1, 2, 3]: quest.diff = diff else: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 elif i == "priority": imp = int(request.values["priority"]) if imp in [1, 2, 3]: quest.imp = imp else: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 elif i == "state": state = bool(request.values["state"]) if state is True: @@ -298,9 +298,9 @@ def update_side_quest(db): points = 10*quest.imp + 15*quest.diff player.add_points(points) else: - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 except (ValueError): - return jsonify(errors._400), 400 + return jsonify(errors._400_bv), 400 quest.update_db() return jsonify(dictify_quest(quest))