From 5f5b8457de52678b1f4bc68860928cabbc867725 Mon Sep 17 00:00:00 2001 From: Holly Date: Wed, 23 Feb 2022 03:22:35 +0000 Subject: [PATCH] Clean up the User class --- server/User.js | 86 +++++++++++++++++------------------------ server/loginHandler.js | 5 ++- server/serverHandler.js | 3 +- 3 files changed, 39 insertions(+), 55 deletions(-) diff --git a/server/User.js b/server/User.js index e27654c..8dcc8a9 100644 --- a/server/User.js +++ b/server/User.js @@ -1,11 +1,17 @@ const StatusUpdate = require("./Packets/StatusUpdate.js"); +const rankingModes = [ + "pp_raw", + "ranked_score", + "avg_accuracy" +]; + module.exports = class { - constructor(id, username, uuid, connectTime, isTourneyUser = false) { + constructor(id, username, uuid) { this.id = id; this.username = username; this.uuid = uuid; - this.connectTime = connectTime; + this.connectTime = Date.now(); this.queue = Buffer.alloc(0); // Binato specific @@ -38,7 +44,7 @@ module.exports = class { this.currentMatch = null; this.matchSlotId = -1; - this.isTourneyUser = isTourneyUser; + this.isTourneyUser = false; } // Adds new actions to the user's queue @@ -60,70 +66,48 @@ module.exports = class { // Gets the user's score information from the database and caches it async getNewUserInformationFromDatabase(forceUpdate = false) { const userScoreDB = await global.DatabaseHelper.query(`SELECT * FROM users_modes_info WHERE user_id = ${this.id} AND mode_id = ${this.playMode} LIMIT 1`); - let userRankDB = null; - switch (this.rankingMode) { - case 0: - userRankDB = await global.DatabaseHelper.query(`SELECT user_id, pp_raw FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY pp_raw DESC`); - break; - - case 1: - userRankDB = await global.DatabaseHelper.query(`SELECT user_id, ranked_score FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY ranked_score DESC`); - break; - - case 2: - userRankDB = await global.DatabaseHelper.query(`SELECT user_id, avg_accuracy FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY avg_accuracy DESC`); - break; - } + const mappedRankingMode = rankingModes[this.rankingMode]; + const userRankDB = await global.DatabaseHelper.query(`SELECT user_id, ${mappedRankingMode} FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY ${mappedRankingMode} DESC`); if (userScoreDB == null || userRankDB == null) throw "fuck"; + // Handle "if we should update" checks for each rankingMode let userScoreUpdate = false; - if (forceUpdate) { - userScoreUpdate = true; - } else { - switch (this.rankingMode) { - case 0: - if (this.pp != userScoreDB.pp_raw) { - userScoreUpdate = true; - } + switch (this.rankingMode) { + case 0: + if (this.pp != userScoreDB.pp_raw) + userScoreUpdate = true; break; - - case 1: - if (this.rankedScore != userScoreDB.ranked_score) { - userScoreUpdate = true; - } + + case 1: + if (this.rankedScore != userScoreDB.ranked_score) + userScoreUpdate = true; break; - - case 2: - if (this.accuracy != userScoreDB.avg_accuracy) { - userScoreUpdate = true; - } + + case 2: + if (this.accuracy != userScoreDB.avg_accuracy) + userScoreUpdate = true; break; - } } this.rankedScore = userScoreDB.ranked_score; this.totalScore = userScoreDB.total_score; this.accuracy = userScoreDB.avg_accuracy; this.playCount = userScoreDB.playcount; + + // Fetch rank for (let i = 0; i < userRankDB.length; i++) { - if (userRankDB[i]["user_id"] == this.id) this.rank = i + 1; - } - switch (this.rankingMode) { - case 0: - this.pp = userScoreDB.pp_raw; - break; - - case 1: - this.pp = 0; - break; - - case 2: - this.pp = 0; - break; + if (userRankDB[i]["user_id"] == this.id) { + this.rank = i + 1; + break; + } } - if (userScoreUpdate) { + // Set PP to none if ranking mode is not PP + if (this.rankingMode == 0) this.pp = userScoreDB.pp_raw; + else this.pp = 0; + + if (userScoreUpdate || forceUpdate) { StatusUpdate(this, this.id); } } diff --git a/server/loginHandler.js b/server/loginHandler.js index 3204725..2b37ff4 100644 --- a/server/loginHandler.js +++ b/server/loginHandler.js @@ -4,7 +4,6 @@ const osu = require("osu-packet"), ahttp = require("./util/AsyncHttpRequest.js"), RequestType = require("./util/RequestType.json"), consoleHelper = require("../consoleHelper.js"), - // Packets getUserByUsername = require("./util/getUserByUsername.js"), getUserByToken = require("./util/getUserByToken.js"), @@ -76,10 +75,12 @@ module.exports = async function(req, res, loginInfo) { } // Create user object - global.addUser(newClientToken, new User(userDB.id, loginInfo.username, newClientToken, Date.now(), isTourneyClient)); + global.addUser(newClientToken, new User(userDB.id, loginInfo.username, newClientToken)); // Retreive the newly created user const NewUser = getUserByToken(newClientToken); + // Set tourney client flag + NewUser.isTourneyUser = isTourneyClient; // Get user's data from the database NewUser.getNewUserInformationFromDatabase(); diff --git a/server/serverHandler.js b/server/serverHandler.js index daf2283..182138c 100644 --- a/server/serverHandler.js +++ b/server/serverHandler.js @@ -29,14 +29,13 @@ global.refreshUserKeys = function() { } // Add the bot user -global.addUser("bot", new User(3, "SillyBot", "bot", Date.now())); +global.addUser("bot", new User(3, "SillyBot", "bot")); // Set the bot's position on the map global.users["bot"].location[0] = 50; global.users["bot"].location[1] = -32; global.DatabaseHelper = new DatabaseHelperClass(config.databaseAddress, config.databasePort, config.databaseUsername, config.databasePassword, config.databaseName); - // Start a loop that gets new data for users from the database for use on the user panel // TODO: Some way of informing bancho that a user has set a score so details can be pulled down quickly // Possible solution, TCP socket between the score submit server and bancho? redis? (score submit is on a different server, redis probably wouldn't work)