From d0175eec70debe3fbabf1869f420e92c7313c2ad Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Sat, 10 Jul 2021 00:53:29 +0200 Subject: Fix yellow "your turn" coloring in join and profile pages. --- server.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server.js') diff --git a/server.js b/server.js index 65aacae..56e9ce7 100644 --- a/server.js +++ b/server.js @@ -554,7 +554,7 @@ for (let title_id of db.prepare("SELECT * FROM titles").pluck().all()) { const QUERY_GAME = db.prepare("SELECT * FROM game_view WHERE game_id = ?"); const QUERY_LIST_GAMES_OF_TITLE = db.prepare(` - SELECT *, ( active_id = ? OR active_role = 'Both' OR active_role = 'All' ) AS is_your_turn FROM game_view + SELECT * FROM game_view WHERE title_id = ? AND private = 0 ORDER BY status ASC, mtime DESC `); @@ -644,7 +644,7 @@ app.get('/info/:title_id', function (req, res) { return res.redirect('/'); } if (req.isAuthenticated()) { - let games = QUERY_LIST_GAMES_OF_TITLE.all(req.user.user_id, title_id); + let games = QUERY_LIST_GAMES_OF_TITLE.all(title_id); humanize(games); let open_games = games.filter(game => game.status === 0); let active_games = games.filter(game => game.status === 1); @@ -1375,11 +1375,11 @@ app.get('/users', function (req, res) { res.render('users.ejs', { user: req.user, message: req.flash('message'), userList: rows }); }); -const QUERY_LIST_GAMES = db.prepare("SELECT *, ( active_id = ? OR active_role = 'Both' OR active_role = 'All' ) AS is_your_turn FROM game_view WHERE private = 0 AND status < 2"); +const QUERY_LIST_GAMES = db.prepare("SELECT * FROM game_view WHERE private = 0 AND status < 2"); app.get('/games', must_be_logged_in, function (req, res) { LOG(req, "GET /join"); - let games = QUERY_LIST_GAMES.all(req.user.user_id); + let games = QUERY_LIST_GAMES.all(); humanize(games); let open_games = games.filter(game => game.status === 0); let active_games = games.filter(game => game.status === 1); -- cgit v1.2.3