1 files changed, 67 insertions, 53 deletions
diff --git a/api/game/info.py b/api/game/info.py
index 76a3ef8..869a19c 100644
--- a/api/game/info.py
+++ b/api/game/info.py
@@ -5,69 +5,83 @@ from user.info import format_user
 from rating import outcome
 from ruleset import resolve_ruleset
 
-def format_game(game_id, user_id = None):
-    game = cursor.execute("select " + ", ".join([
-        "game_id",               # 0
-        "parent_game",           # 1
-        "moves",                 # 2
-        "player_1_id",           # 3
-        "player_2_id",           # 4
-        "outcome",               # 5
-        "created",               # 6
-        "started",               # 7
-        "duration",              # 8
-        "rating_delta_player_1", # 9
-        "rating_delta_player_2", # 10
-        "ruleset",               # 11
-        "status",                # 12
-        "private",               # 13
-        ]) + " from games where game_id = ?", [game_id]).fetchone()
-
-    is_player_1 = game[4] != user_id
-
-    # get opponent from perspective of `user_id`
-    opponent = game[4] if is_player_1 else game[3]
-
-    # parse moves into list and return empty list if moves string is empty
-    moves = [] if len(game[2]) == 0 else [int(move) for move in str(game[2] + "0").split(",")]
-
-    return {
-        "id": game[0],
-        "parent": game[1],
-        "moves": moves,
-        "opponent": None if not opponent else format_user(opponent),
-        "outcome": None if not game[5] else outcome(game[5], is_player_1),
-        "created": game[6],
-        "started": game[7],
-        "duration": game[8],
-        "rating": game[9] if is_player_1 else game[10],
-        "rating_opponent": game[10] if is_player_1 else game[9],
-        "ruleset": resolve_ruleset(game[11]),
-        "status": game[12],
-        "private": bool(game[13]),
-    }
+
+def format_game(game_id, user_id=None):
+	game = cursor.execute(
+	    "select " + ", ".join(
+	        [
+	            "game_id",  # 0
+	            "parent_game",  # 1
+	            "moves",  # 2
+	            "player_1_id",  # 3
+	            "player_2_id",  # 4
+	            "outcome",  # 5
+	            "created",  # 6
+	            "started",  # 7
+	            "duration",  # 8
+	            "rating_delta_player_1",  # 9
+	            "rating_delta_player_2",  # 10
+	            "ruleset",  # 11
+	            "status",  # 12
+	            "private",  # 13
+	        ]
+	    ) + " from games where game_id = ?",
+	    [game_id]
+	).fetchone()
+
+	is_player_1 = game[4] != user_id
+
+	# get opponent from perspective of `user_id`
+	opponent = game[4] if is_player_1 else game[3]
+
+	# parse moves into list and return empty list if moves string is empty
+	moves = [] if len(game[2]) == 0 else [
+	    int(move) for move in str(game[2] + "0").split(",")
+	]
+
+	return {
+	    "id": game[0],
+	    "parent": game[1],
+	    "moves": moves,
+	    "opponent": None if not opponent else format_user(opponent),
+	    "outcome": None if not game[5] else outcome(game[5], is_player_1),
+	    "created": game[6],
+	    "started": game[7],
+	    "duration": game[8],
+	    "rating": game[9] if is_player_1 else game[10],
+	    "rating_opponent": game[10] if is_player_1 else game[9],
+	    "ruleset": resolve_ruleset(game[11]),
+	    "status": game[12],
+	    "private": bool(game[13]),
+	}
+
 
 # check if game_id exists in database
 def valid_game_id(game_id):
-    query = cursor.execute("select game_id from games where game_id = ?", [game_id]).fetchone()
-    return bool(query)
+	query = cursor.execute(
+	    "select game_id from games where game_id = ?", [game_id]
+	).fetchone()
+	return bool(query)
+
 
 game_info = Blueprint('game_info', __name__)
 
-@game_info.route('/info', methods = ['POST'])
+
+@game_info.route('/info', methods=['POST'])
 def index():
-    data = request.get_json()
-    if not data: return "", 400
+	data = request.get_json()
+	if not data: return "", 400
+
+	game_id = data.get("id") or ""
+	if not game_id: return "", 400
 
-    game_id = data.get("id") or ""
-    if not game_id: return "", 400
+	user_id = None
+	token = request.cookies.get("token") or ""
+	if token: user_id = token_login(token)
 
-    user_id = None
-    token = request.cookies.get("token") or ""
-    if token: user_id = token_login(token)
+	if not valid_game_id(game_id): return "", 403
 
-    if not valid_game_id(game_id): return "", 403
+	return format_game(game_id, user_id), 200
 
-    return format_game(game_id, user_id), 200
 
 dynamic_route = ["/game", game_info]