diff options
Diffstat (limited to 'api/game/new.py')
| -rw-r--r-- | api/game/new.py | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/api/game/new.py b/api/game/new.py index 8c936de..edc7f52 100644 --- a/api/game/new.py +++ b/api/game/new.py @@ -8,46 +8,46 @@ from hierarchy import auth_required def create_game(user_1_id, private=False, user_2_id=None): - timestamp = int(time.time() * 1000) + timestamp = int(time.time() * 1000) - game_id = new_uuid("games") + game_id = new_uuid("games") - cursor.execute( - "insert into games values (?, NULL, \"\", ?, ?, NULL, ?, NULL, ?, NULL, NULL, NULL, \"wait_for_opponent\", \"default\", ?, FALSE) ", - (game_id, user_1_id, user_2_id, timestamp, timestamp, private) - ) - connection.commit() + cursor.execute( + "insert into games values (?, NULL, \"\", ?, ?, NULL, ?, NULL, ?, NULL, NULL, NULL, \"wait_for_opponent\", \"default\", ?, FALSE) ", + (game_id, user_1_id, user_2_id, timestamp, timestamp, private) + ) + connection.commit() - return game_id + return game_id def start_game(game_id, user_2_id): - timestamp = int(time.time() * 1000) - - db_game = cursor.execute( - "select player_2_id, status, private from games where game_id = ?", - [game_id] - ).fetchone() - if db_game[1] != "wait_for_opponent": return False - - if db_game[0] == None: - cursor.execute( - "update games set player_2_id = ? where game_id = ?", - (user_2_id, game_id) - ) - cursor.execute( - "update games set status = \"in_progress\", started = ?, last_activity = ? where game_id = ?", - (timestamp, timestamp, game_id) - ) - connection.commit() - - players = cursor.execute( - "select player_1_id, player_2_id from games where game_id = ?", - [game_id] - ).fetchone() - games[game_id] = game(game_id, io, players[0], players[1]) - - io.emit("gameStart", room=games[game_id].room) + timestamp = int(time.time() * 1000) + + db_game = cursor.execute( + "select player_2_id, status, private from games where game_id = ?", + [game_id] + ).fetchone() + if db_game[1] != "wait_for_opponent": return False + + if db_game[0] == None: + cursor.execute( + "update games set player_2_id = ? where game_id = ?", + (user_2_id, game_id) + ) + cursor.execute( + "update games set status = \"in_progress\", started = ?, last_activity = ? where game_id = ?", + (timestamp, timestamp, game_id) + ) + connection.commit() + + players = cursor.execute( + "select player_1_id, player_2_id from games where game_id = ?", + [game_id] + ).fetchone() + games[game_id] = game(game_id, io, players[0], players[1]) + + io.emit("gameStart", room=games[game_id].room) new_game = Blueprint('new_game', __name__) @@ -56,10 +56,10 @@ new_game = Blueprint('new_game', __name__) @new_game.route('/new', methods=["GET", "POST"]) @auth_required("user") def index(user_id): - # create a new private game (join by link) - #TODO: friend invites + notifications - game_id = create_game(user_id, True) - return {"id": game_id}, 200 + # create a new private game (join by link) + #TODO: friend invites + notifications + game_id = create_game(user_id, True) + return {"id": game_id}, 200 dynamic_route = ["/game", new_game] |