ConsoleHelper.ts

@@ -6,7 +6,7 @@ enum LogType {
 	INFO,
 	WARN,
 	ERROR
-}
+};
 
 const LogTags = {
 	INFO: dyetty.bgGreen(dyetty.black("  INFO  ")),

LICENSE.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019-2023 Holly Stubbs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

osuTyping.ts

@@ -10,7 +10,7 @@ export default abstract class osu {
 	};
 
 	static Client = {
-		Reader: function(data:Buffer) {
+		Reader: function(data:any) : any {
 			return new nodeOsu.Client.Reader(data);
 		}
 	};

package-lock.json

@@ -20,11 +20,9 @@
 			"devDependencies": {
 				"@types/node": "^20.6.0",
 				"@types/node-fetch": "^2.6.4",
-				"@vercel/ncc": "^0.38.0",
 				"check-outdated": "^2.12.0",
 				"nodemon": "^3.0.1",
 				"npm-run-all": "^4.1.5",
-				"terser": "^5.21.0",
 				"ts-loader": "^9.4.4",
 				"ts-node": "^10.9.1",
 				"typescript": "^5.2.2"
@@ -47,6 +45,7 @@
 			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
 			"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
 			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@jridgewell/set-array": "^1.0.1",
 				"@jridgewell/sourcemap-codec": "^1.4.10",
@@ -70,6 +69,7 @@
 			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
 			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
 			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=6.0.0"
 			}
@@ -79,6 +79,7 @@
 			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
 			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
 			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@jridgewell/gen-mapping": "^0.3.0",
 				"@jridgewell/trace-mapping": "^0.3.9"
@@ -229,15 +230,6 @@
 				"form-data": "^3.0.0"
 			}
 		},
-		"node_modules/@vercel/ncc": {
-			"version": "0.38.0",
-			"resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.38.0.tgz",
-			"integrity": "sha512-B4YKZMm/EqMptKSFyAq4q2SlgJe+VCmEH6Y8gf/E1pTlWbsUJpuH1ymik2Ex3aYO5mCWwV1kaSYHSQOT8+4vHA==",
-			"dev": true,
-			"bin": {
-				"ncc": "dist/ncc/cli.js"
-			}
-		},
 		"node_modules/@webassemblyjs/ast": {
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -643,7 +635,8 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
 			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/call-bind": {
 			"version": "1.0.2",
@@ -781,7 +774,8 @@
 			"version": "2.20.3",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
 			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
@@ -2382,6 +2376,7 @@
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -2391,6 +2386,7 @@
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
 			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
 			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
@@ -2549,10 +2545,11 @@
 			}
 		},
 		"node_modules/terser": {
-			"version": "5.21.0",
+			"version": "5.19.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-			"integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==",
+			"integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
 			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",

package.json

@@ -7,7 +7,8 @@
 		"dev:updateCheck": "check-outdated",
 		"dev:run": "nodemon --watch './**/*.ts' Binato.ts",
 		"build": "npm-run-all build:*",
-		"build:build": "ncc build Binato.ts -o build",
+		"build:smash": "ts-node ./tooling/fileSmasher.ts",
+		"build:build": "tsc --build",
 		"build:mangle": "ts-node ./tooling/mangle.ts",
 		"build:cleanup": "ts-node ./tooling/cleanup.ts",
 		"_clean": "tsc --build --clean"
@@ -27,11 +28,9 @@
 	"devDependencies": {
 		"@types/node": "^20.6.0",
 		"@types/node-fetch": "^2.6.4",
-		"@vercel/ncc": "^0.38.0",
 		"check-outdated": "^2.12.0",
 		"nodemon": "^3.0.1",
 		"npm-run-all": "^4.1.5",
-		"terser": "^5.21.0",
 		"ts-loader": "^9.4.4",
 		"ts-node": "^10.9.1",
 		"typescript": "^5.2.2"

server/BanchoServer.ts

@@ -5,15 +5,15 @@ import LoginProcess from "./LoginProcess";
 import { IncomingMessage, ServerResponse } from "http";
 import { Packets } from "./enums/Packets";
 import { RedisClientType, createClient } from "redis";
-import MessageData from "./interfaces/packetTypes/MessageData";
+import MessageData from "./interfaces/MessageData";
 import PrivateMessage from "./packets/PrivateMessage";
 import Shared from "./objects/Shared";
 import SpectatorManager from "./SpectatorManager";
 import osu from "../osuTyping";
 
 const shared:Shared = new Shared();
-shared.database.execute("UPDATE mp_matches SET close_time = UNIX_TIMESTAMP() WHERE close_time IS NULL");
+shared.database.query("UPDATE mp_matches SET close_time = UNIX_TIMESTAMP() WHERE close_time IS NULL");
-shared.database.execute("UPDATE osu_info SET value = 0 WHERE name = 'online_now'");
+shared.database.query("UPDATE osu_info SET value = 0 WHERE name = 'online_now'");
 
 // Server Setup
 const spectatorManager:SpectatorManager = new SpectatorManager(shared);
@@ -67,11 +67,10 @@ import AddFriend from "./packets/AddFriend";
 import RemoveFriend from "./packets/RemoveFriend";
 import PrivateChannel from "./objects/PrivateChannel";
 import MultiplayerInvite from "./packets/MultiplayerInvite";
-import SendPublicMessage from "./packets/SendPublicMessage";
 
 // User timeout interval
 setInterval(() => {
-	for (const User of shared.users.getIterableItems()) {
+	for (let User of shared.users.getIterableItems()) {
 		if (User.uuid == "bot") continue; // Ignore the bot
 
 		// Logout this user, they're clearly gone.
@@ -81,6 +80,8 @@ setInterval(() => {
 	}
 }, 10000);
 
+const EMPTY_BUFFER = Buffer.alloc(0);
+
 export default async function HandleRequest(req:IncomingMessage, res:ServerResponse, packet:Buffer) {
 	// Get the client's token string and request data
 	const requestTokenString = typeof(req.headers["osu-token"]) === "string" ? req.headers["osu-token"] : undefined;
@@ -90,149 +91,154 @@ export default async function HandleRequest(req:IncomingMessage, res:ServerRespo
 		// Client doesn't have a token yet, let's auth them!
 		
 		await LoginProcess(req, res, packet, shared);
-		shared.database.execute("UPDATE osu_info SET value = ? WHERE name = 'online_now'", [shared.users.getLength() - 1]);
+		shared.database.query("UPDATE osu_info SET value = ? WHERE name = 'online_now'", [shared.users.getLength() - 1]);
 	} else {
-		let responseData = Buffer.allocUnsafe(0);
+		let responseData = EMPTY_BUFFER;
 
 		// Client has a token, let's see what they want.
 		try {
 			// Get the current user
-			const user = shared.users.getByToken(requestTokenString);
+			const PacketUser = shared.users.getByToken(requestTokenString);
 
 			// Make sure the client's token isn't invalid
-			if (user != null) {
+			if (PacketUser != null) {
-				// Update the session timeout time for each request
+				// Update the session timeout time
-				user.timeoutTime = Date.now() + 60000;
+				PacketUser.timeoutTime = Date.now() + 60000;
 
-				// Parse bancho packets
+				// Create a new osu! packet reader
 				const osuPacketReader = osu.Client.Reader(packet);
-				const packets = osuPacketReader.Parse();
+				// Parse current bancho packet
+				const PacketData = osuPacketReader.Parse();
 
 				// Go through each packet sent by the client
-				for (const packet of packets) {
+				for (let CurrentPacket of PacketData) {
-					switch (packet.id) {
+					switch (CurrentPacket.id) {
 						case Packets.Client_ChangeAction:
-							ChangeAction(user, packet.data);
+							ChangeAction(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_SendPublicMessage:
-							SendPublicMessage(user, packet.data);
+							const message:MessageData = CurrentPacket.data;
+							let channel = shared.chatManager.GetChannelByName(message.target);
+							if (channel instanceof Channel) {
+								channel.SendMessage(PacketUser, CurrentPacket.data.message);
+							}
 							break;
 
 						case Packets.Client_Logout:
-							await Logout(user);
+							await Logout(PacketUser);
 							break;
 
 						case Packets.Client_RequestStatusUpdate:
-							UserPresenceBundle(user);
+							UserPresenceBundle(PacketUser);
 							break;
 
 						case Packets.Client_StartSpectating:
-							spectatorManager.startSpectating(user, packet.data);
+							spectatorManager.startSpectating(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_SpectateFrames:
-							spectatorManager.spectatorFrames(user, packet.data);
+							spectatorManager.spectatorFrames(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_StopSpectating:
-							spectatorManager.stopSpectating(user);
+							spectatorManager.stopSpectating(PacketUser);
 							break;
 
 						case Packets.Client_SendPrivateMessage:
-							PrivateMessage(user, packet.data);
+							PrivateMessage(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_JoinLobby:
-							shared.multiplayerManager.JoinLobby(user);
+							shared.multiplayerManager.JoinLobby(PacketUser);
 							break;
 
 						case Packets.Client_PartLobby:
-							shared.multiplayerManager.LeaveLobby(user);
+							shared.multiplayerManager.LeaveLobby(PacketUser);
 							break;
 
 						case Packets.Client_CreateMatch:
-							await shared.multiplayerManager.CreateMatch(user, packet.data);
+							await shared.multiplayerManager.CreateMatch(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_JoinMatch:
-							shared.multiplayerManager.JoinMatch(user, packet.data);
+							shared.multiplayerManager.JoinMatch(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_MatchChangeSlot:
-							user.match?.moveToSlot(user, packet.data);
+							PacketUser.match?.moveToSlot(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_MatchReady:
-							user.match?.setStateReady(user);
+							PacketUser.match?.setStateReady(PacketUser);
 							break;
 
 						case Packets.Client_MatchChangeSettings:
-							await user.match?.updateMatch(user, packet.data);
+							await PacketUser.match?.updateMatch(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_MatchNotReady:
-							user.match?.setStateNotReady(user);
+							PacketUser.match?.setStateNotReady(PacketUser);
 							break;
 
 						case Packets.Client_PartMatch:
-							await shared.multiplayerManager.LeaveMatch(user);
+							await shared.multiplayerManager.LeaveMatch(PacketUser);
 							break;
 
 						case Packets.Client_MatchLock:
-							user.match?.lockOrKick(user, packet.data);
+							PacketUser.match?.lockOrKick(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_MatchNoBeatmap:
-							user.match?.missingBeatmap(user);
+							PacketUser.match?.missingBeatmap(PacketUser);
 							break;
 
 						case Packets.Client_MatchSkipRequest:
-							user.match?.matchSkip(user);
+							PacketUser.match?.matchSkip(PacketUser);
 							break;
 						
 						case Packets.Client_MatchHasBeatmap:
-							user.match?.notMissingBeatmap(user);
+							PacketUser.match?.notMissingBeatmap(PacketUser);
 							break;
 
 						case Packets.Client_MatchTransferHost:
-							user.match?.transferHost(user, packet.data);
+							PacketUser.match?.transferHost(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_MatchChangeMods:
-							user.match?.updateMods(user, packet.data);
+							PacketUser.match?.updateMods(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_MatchStart:
-							user.match?.startMatch();
+							PacketUser.match?.startMatch();
 							break;
 
 						case Packets.Client_MatchLoadComplete:
-							user.match?.matchPlayerLoaded(user);
+							PacketUser.match?.matchPlayerLoaded(PacketUser);
 							break;
 
 						case Packets.Client_MatchComplete:
-							await user.match?.onPlayerFinishMatch(user);
+							await PacketUser.match?.onPlayerFinishMatch(PacketUser);
 							break;
 
 						case Packets.Client_MatchScoreUpdate:
-							user.match?.updatePlayerScore(user, packet.data);
+							PacketUser.match?.updatePlayerScore(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_MatchFailed:
-							user.match?.matchFailed(user);
+							PacketUser.match?.matchFailed(PacketUser);
 							break;
 
 						case Packets.Client_MatchChangeTeam:
-							user.match?.changeTeam(user);
+							PacketUser.match?.changeTeam(PacketUser);
 							break;
 
 						case Packets.Client_ChannelJoin:
-							user.joinChannel(packet.data);
+							PacketUser.joinChannel(CurrentPacket.data);
 							break;
 
 						case Packets.Client_ChannelPart:
-							user.leaveChannel(packet.data);
+							PacketUser.leaveChannel(CurrentPacket.data);
 							break;
 
 						case Packets.Client_SetAwayMessage:
@@ -240,35 +246,35 @@ export default async function HandleRequest(req:IncomingMessage, res:ServerRespo
 							break;
 
 						case Packets.Client_FriendAdd:
-							await AddFriend(user, packet.data);
+							AddFriend(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_FriendRemove:
-							await RemoveFriend(user, packet.data);
+							RemoveFriend(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_UserStatsRequest:
-							UserStatsRequest(user, packet.data);
+							UserStatsRequest(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_SpecialMatchInfoRequest:
-							TourneyMatchSpecialInfo(user, packet.data);
+							TourneyMatchSpecialInfo(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_SpecialJoinMatchChannel:
-							TourneyMatchJoinChannel(user, packet.data);
+							TourneyMatchJoinChannel(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_SpecialLeaveMatchChannel:
-							TourneyMatchLeaveChannel(user, packet.data);
+							TourneyMatchLeaveChannel(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_Invite:
-							MultiplayerInvite(user, packet.data);
+							MultiplayerInvite(PacketUser, CurrentPacket.data);
 							break;
 
 						case Packets.Client_UserPresenceRequest:
-							UserPresence(user, user.id);
+							UserPresence(PacketUser, PacketUser.id);
 							break;
 
 						// Ignored packets
@@ -280,13 +286,13 @@ export default async function HandleRequest(req:IncomingMessage, res:ServerRespo
 
 						default:
 							// Print out unimplemented packet
-							console.dir(packet);
+							console.dir(CurrentPacket);
 							break;
 					}
 				}
 
-				responseData = user.queue;
+				responseData = PacketUser.queue;
-				user.clearQueue();
+				PacketUser.clearQueue();
 			} else {
 				// User's token is invlid, force a reconnect
 				ConsoleHelper.printBancho(`Forced client re-connect (Token is invalid)`);

server/Bot.ts

@@ -5,7 +5,7 @@ import User from "./objects/User";
 
 // Commands
 import RankingCommand from "./commands/Ranking";
-import AdminCommand from "./commands/Admin";
+import LockCommand from "./commands/Lock";
 import MultiplayerCommands from "./commands/Multiplayer";
 import HelpCommand from "./commands/Help";
 import RollCommand from "./commands/Roll";
@@ -19,7 +19,7 @@ export default class Bot {
 		
 		this.commands["help"] = new HelpCommand(shared, this.commands);
 		this.commands["ranking"] = new RankingCommand(shared);
-		this.commands["admin"] = new AdminCommand(shared);
+		this.commands["lock"] = new LockCommand(shared);
 		this.commands["mp"] = new MultiplayerCommands(shared);
 		this.commands["roll"] = new RollCommand(shared);
 	}

server/ChatManager.ts

@@ -69,7 +69,7 @@ export default class ChatManager {
 	}
 
 	public ForceJoinChannels(user:User) {
-		for (const channel of this.forceJoinChannels.getIterableItems()) {
+		for (let channel of this.forceJoinChannels.getIterableItems()) {
 			channel.Join(user);
 		}
 	}
@@ -77,7 +77,7 @@ export default class ChatManager {
 
 	public SendChannelListing(user:User) {
 		const osuPacketWriter = osu.Bancho.Writer();
-		for (const channel of this.chatChannels.getIterableItems()) {
+		for (let channel of this.chatChannels.getIterableItems()) {
 			if (channel.isSpecial) {
 				continue;
 			}

server/Country.ts

@@ -1,261 +1,269 @@
-const countryCodes:{ [id: string]: number } = {
+enum CountryCodes {
-	"LV": 132,
+	LV = 132,
-	"AD":  3,
+	AD =  3,
-	"LT": 130,
+	LT = 130,
-	"KM": 116,
+	KM = 116,
-	"QA": 182,
+	QA = 182,
-	"VA": 0,
+	VA = 0,
-	"PK": 173,
+	PK = 173,
-	"KI": 115,
+	KI = 115,
-	"SS": 0,
+	SS = 0,
-	"KH": 114,
+	KH = 114,
-	"NZ": 166,
+	NZ = 166,
-	"TO": 215,
+	TO = 215,
-	"KZ": 122,
+	KZ = 122,
-	"BW": 35,
+	BW = 35,
-	"GA": 76,
+	GA = 76,
-	"AX": 247,
+	AX = 247,
-	"GE": 79,
+	GE = 79,
-	"UA": 222,
+	UA = 222,
-	"CR": 50,
+	CR = 50,
-	"AE": 0,
+	AE = 0,
-	"NE": 157,
+	NE = 157,
-	"ZA": 240,
+	ZA = 240,
-	"SK": 196,
+	SK = 196,
-	"BV": 34,
+	BV = 34,
-	"SH": 0,
+	SH = 0,
-	"PT": 179,
+	PT = 179,
-	"SC": 189,
+	SC = 189,
-	"CO": 49,
+	CO = 49,
-	"GP": 86,
+	GP = 86,
-	"GY": 93,
+	GY = 93,
-	"CM": 47,
+	CM = 47,
-	"TJ": 211,
+	TJ = 211,
-	"AF": 5,
+	AF = 5,
-	"IE": 101,
+	IE = 101,
-	"AL": 8,
+	AL = 8,
-	"BG": 24,
+	BG = 24,
-	"JO": 110,
+	JO = 110,
-	"MU": 149,
+	MU = 149,
-	"PM": 0,
+	PM = 0,
-	"LA": 0,
+	LA = 0,
-	"IO": 104,
+	IO = 104,
-	"KY": 121,
+	KY = 121,
-	"SA": 187,
+	SA = 187,
-	"KN": 0,
+	KN = 0,
-	"OM": 167,
+	OM = 167,
-	"CY": 54,
+	CY = 54,
-	"BQ": 0,
+	BQ = 0,
-	"BT": 33,
+	BT = 33,
-	"WS": 236,
+	WS = 236,
-	"ES": 67,
+	ES = 67,
-	"LR": 128,
+	LR = 128,
-	"RW": 186,
+	RW = 186,
-	"AQ": 12,
+	AQ = 12,
-	"PW": 180,
+	PW = 180,
-	"JE": 250,
+	JE = 250,
-	"TN": 214,
+	TN = 214,
-	"ZW": 243,
+	ZW = 243,
-	"JP": 111,
+	JP = 111,
-	"BB": 20,
+	BB = 20,
-	"VN": 233,
+	VN = 233,
-	"HN": 96,
+	HN = 96,
-	"KP": 0,
+	KP = 0,
-	"WF": 235,
+	WF = 235,
-	"EC": 62,
+	EC = 62,
-	"HU": 99,
+	HU = 99,
-	"GF": 80,
+	GF = 80,
-	"GQ": 87,
+	GQ = 87,
-	"TW": 220,
+	TW = 220,
-	"MC": 135,
+	MC = 135,
-	"BE": 22,
+	BE = 22,
-	"PN": 176,
+	PN = 176,
-	"SZ": 205,
+	SZ = 205,
-	"CZ": 55,
+	CZ = 55,
-	"LY": 0,
+	LY = 0,
-	"IN": 103,
+	IN = 103,
-	"FM": 0,
+	FM = 0,
-	"PY": 181,
+	PY = 181,
-	"PH": 172,
+	PH = 172,
-	"MN": 142,
+	MN = 142,
-	"GG": 248,
+	GG = 248,
-	"CC": 39,
+	CC = 39,
-	"ME": 242,
+	ME = 242,
-	"DO": 60,
+	DO = 60,
-	"KR": 0,
+	KR = 0,
-	"PL": 174,
+	PL = 174,
-	"MT": 148,
+	MT = 148,
-	"MM": 141,
+	MM = 141,
-	"AW": 17,
+	AW = 17,
-	"MV": 150,
+	MV = 150,
-	"BD": 21,
+	BD = 21,
-	"NR": 164,
+	NR = 164,
-	"AT": 15,
+	AT = 15,
-	"GW": 92,
+	GW = 92,
-	"FR": 74,
+	FR = 74,
-	"LI": 126,
+	LI = 126,
-	"CF": 41,
+	CF = 41,
-	"DZ": 61,
+	DZ = 61,
-	"MA": 134,
+	MA = 134,
-	"VG": 0,
+	VG = 0,
-	"NC": 156,
+	NC = 156,
-	"IQ": 105,
+	IQ = 105,
-	"BN": 0,
+	BN = 0,
-	"BF": 23,
+	BF = 23,
-	"BO": 30,
+	BO = 30,
-	"GB": 77,
+	GB = 77,
-	"CU": 51,
+	CU = 51,
-	"LU": 131,
+	LU = 131,
-	"YT": 238,
+	YT = 238,
-	"NO": 162,
+	NO = 162,
-	"SM": 198,
+	SM = 198,
-	"GL": 83,
+	GL = 83,
-	"IS": 107,
+	IS = 107,
-	"AO": 11,
+	AO = 11,
-	"MH": 138,
+	MH = 138,
-	"SE": 191,
+	SE = 191,
-	"ZM": 241,
+	ZM = 241,
-	"FJ": 70,
+	FJ = 70,
-	"SL": 197,
+	SL = 197,
-	"CH": 43,
+	CH = 43,
-	"RU": 0,
+	RU = 0,
-	"CW": 0,
+	CW = 0,
-	"CX": 53,
+	CX = 53,
-	"TF": 208,
+	TF = 208,
-	"NL": 161,
+	NL = 161,
-	"AU": 16,
+	AU = 16,
-	"FI": 69,
+	FI = 69,
-	"MS": 147,
+	MS = 147,
-	"GH": 81,
+	GH = 81,
-	"BY": 36,
+	BY = 36,
-	"IL": 102,
+	IL = 102,
-	"VC": 0,
+	VC = 0,
-	"NG": 159,
+	NG = 159,
-	"HT": 98,
+	HT = 98,
-	"LS": 129,
+	LS = 129,
-	"MR": 146,
+	MR = 146,
-	"YE": 237,
+	YE = 237,
-	"MP": 144,
+	MP = 144,
-	"SX": 0,
+	SX = 0,
-	"RE": 183,
+	RE = 183,
-	"RO": 184,
+	RO = 184,
-	"NP": 163,
+	NP = 163,
-	"CG": 0,
+	CG = 0,
-	"FO": 73,
+	FO = 73,
-	"CI": 0,
+	CI = 0,
-	"TH": 210,
+	TH = 210,
-	"HK": 94,
+	HK = 94,
-	"TK": 212,
+	TK = 212,
-	"XK": 0,
+	XK = 0,
-	"DM": 59,
+	DM = 59,
-	"LC": 0,
+	LC = 0,
-	"ID": 100,
+	ID = 100,
-	"MG": 137,
+	MG = 137,
-	"JM": 109,
+	JM = 109,
-	"IT": 108,
+	IT = 108,
-	"CA": 38,
+	CA = 38,
-	"TZ": 221,
+	TZ = 221,
-	"GI": 82,
+	GI = 82,
-	"KG": 113,
+	KG = 113,
-	"NU": 165,
+	NU = 165,
-	"TV": 219,
+	TV = 219,
-	"LB": 124,
+	LB = 124,
-	"SY": 0,
+	SY = 0,
-	"PR": 177,
+	PR = 177,
-	"NI": 160,
+	NI = 160,
-	"KE": 112,
+	KE = 112,
-	"MO": 0,
+	MO = 0,
-	"SR": 201,
+	SR = 201,
-	"VI": 0,
+	VI = 0,
-	"SV": 203,
+	SV = 203,
-	"HM": 0,
+	HM = 0,
-	"CD": 0,
+	CD = 0,
-	"BI": 26,
+	BI = 26,
-	"BM": 28,
+	BM = 28,
-	"MW": 151,
+	MW = 151,
-	"TM": 213,
+	TM = 213,
-	"GT": 90,
+	GT = 90,
-	"AG": 0,
+	AG = 0,
-	"UM": 0,
+	UM = 0,
-	"US": 225,
+	US = 225,
-	"AR": 13,
+	AR = 13,
-	"DJ": 57,
+	DJ = 57,
-	"KW": 120,
+	KW = 120,
-	"MY": 153,
+	MY = 153,
-	"FK": 71,
+	FK = 71,
-	"EG": 64,
+	EG = 64,
-	"BA": 0,
+	BA = 0,
-	"CN": 48,
+	CN = 48,
-	"GN": 85,
+	GN = 85,
-	"PS": 178,
+	PS = 178,
-	"SO": 200,
+	SO = 200,
-	"IM": 249,
+	IM = 249,
-	"GS": 0,
+	GS = 0,
-	"BR": 31,
+	BR = 31,
-	"GM": 84,
+	GM = 84,
-	"PF": 170,
+	PF = 170,
-	"PA": 168,
+	PA = 168,
-	"PG": 171,
+	PG = 171,
-	"BH": 25,
+	BH = 25,
-	"TG": 209,
+	TG = 209,
-	"GU": 91,
+	GU = 91,
-	"CK": 45,
+	CK = 45,
-	"MF": 252,
+	MF = 252,
-	"VE": 230,
+	VE = 230,
-	"CL": 46,
+	CL = 46,
-	"TR": 217,
+	TR = 217,
-	"UG": 223,
+	UG = 223,
-	"GD": 78,
+	GD = 78,
-	"TT": 218,
+	TT = 218,
-	"TL": 0,
+	TL = 0,
-	"MD": 0,
+	MD = 0,
-	"MK": 0,
+	MK = 0,
-	"ST": 202,
+	ST = 202,
-	"CV": 52,
+	CV = 52,
-	"MQ": 145,
+	MQ = 145,
-	"GR": 88,
+	GR = 88,
-	"HR": 97,
+	HR = 97,
-	"BZ": 37,
+	BZ = 37,
-	"UZ": 227,
+	UZ = 227,
-	"DK": 58,
+	DK = 58,
-	"SN": 199,
+	SN = 199,
-	"ET": 68,
+	ET = 68,
-	"VU": 234,
+	VU = 234,
-	"ER": 66,
+	ER = 66,
-	"BJ": 27,
+	BJ = 27,
-	"LK": 127,
+	LK = 127,
-	"NA": 155,
+	NA = 155,
-	"AS": 14,
+	AS = 14,
-	"SG": 192,
+	SG = 192,
-	"PE": 169,
+	PE = 169,
-	"IR": 0,
+	IR = 0,
-	"MX": 152,
+	MX = 152,
-	"TD": 207,
+	TD = 207,
-	"AZ": 18,
+	AZ = 18,
-	"AM": 9,
+	AM = 9,
-	"BL": 0,
+	BL = 0,
-	"SJ": 195,
+	SJ = 195,
-	"SB": 188,
+	SB = 188,
-	"NF": 158,
+	NF = 158,
-	"RS": 239,
+	RS = 239,
-	"DE": 56,
+	DE = 56,
-	"EH": 65,
+	EH = 65,
-	"EE": 63,
+	EE = 63,
-	"SD": 190,
+	SD = 190,
-	"ML": 140,
+	ML = 140,
-	"TC": 206,
+	TC = 206,
-	"MZ": 154,
+	MZ = 154,
-	"BS": 32,
+	BS = 32,
-	"UY": 226,
+	UY = 226,
-	"SI": 194,
+	SI = 194,
-	"AI": 7
+	AI = 7
 };
 
-// Get id of a country from a 2 char code
+const keys = Object.keys(CountryCodes);
-export function getCountryID(code:string) : number {
+const values = Object.values(CountryCodes);
-	const upperCode = code.toUpperCase();
+
-	if (upperCode in countryCodes) {
+export default function getCountryID(code:string) : number {
-		return countryCodes[upperCode];
+	// Get id of a country from a 2 char code
+	const upperCode:string = code.toUpperCase();
+	if (upperCode in CountryCodes) {
+		const code = values[keys.indexOf(upperCode)];
+		if (typeof(code) === "string") {
+			return 0;
+		}
+
+		return code;
 	}
 	
 	return 0;

server/LoginProcess.ts

@@ -1,6 +1,6 @@
 import { ConsoleHelper } from "../ConsoleHelper";
 import fetch from "node-fetch";
-import { getCountryID } from "./Country";
+import getCountryID from "./Country";
 import { generateSession } from "./Util";
 import LatLng from "./objects/LatLng";
 import LoginInfo from "./objects/LoginInfo";
@@ -14,7 +14,6 @@ import Shared from "./objects/Shared";
 import osu from "../osuTyping";
 import IpZxqResponse from "./interfaces/IpZxqResponse";
 import { IncomingMessage, ServerResponse } from "http";
-import UserInfo from "./objects/database/UserInfo";
 const { decrypt: aesDecrypt } = require("aes256");
 
 const incorrectLoginResponse:Buffer = osu.Bancho.Writer().LoginReply(-1).toBuffer;
@@ -37,7 +36,7 @@ enum LoginResult {
 
 function TestLogin(loginInfo:LoginInfo, shared:Shared) {
 	return new Promise<LoginResult>(async (resolve, reject) => {
-		const userDBData = await shared.userInfoRepository.selectByUsername(loginInfo.username);
+		const userDBData:any = await shared.database.query("SELECT * FROM users_info WHERE username = ? LIMIT 1", [loginInfo.username]);
 
 		// Make sure a user was found in the database
 		if (userDBData == null) return resolve(LoginResult.INCORRECT);
@@ -82,7 +81,7 @@ export default async function LoginProcess(req:IncomingMessage, res:ServerRespon
 	}
 
 	const loginResult:LoginResult = await TestLogin(loginInfo, shared);
-	const osuPacketWriter = osu.Bancho.Writer();
+	let osuPacketWriter = osu.Bancho.Writer();
 	let newUser:User | undefined;
 	let friendsPresence:Buffer = Buffer.alloc(0);
 
@@ -123,10 +122,7 @@ export default async function LoginProcess(req:IncomingMessage, res:ServerRespon
 		}
 
 		// Get information about the user from the database
-		const userInfo = await shared.userInfoRepository.selectByUsername(loginInfo.username);
+		const userDB = await shared.database.query("SELECT id FROM users_info WHERE username = ? LIMIT 1", [loginInfo.username]);
-		if (userInfo == null) {
-			return;
-		}
 
 		// Create a token for the client
 		const newClientToken:string = await generateSession();
@@ -139,7 +135,7 @@ export default async function LoginProcess(req:IncomingMessage, res:ServerRespon
 		}
 
 		// Retreive the newly created user
-		newUser = shared.users.add(newClientToken, new User(userInfo.id, loginInfo.username, newClientToken, userInfo.tags, shared));
+		newUser = shared.users.add(newClientToken, new User(userDB.id, loginInfo.username, newClientToken, shared));
 		// Set tourney client flag
 		newUser.isTourneyUser = isTourneyClient;
 		newUser.location = userLocation;
@@ -173,31 +169,24 @@ export default async function LoginProcess(req:IncomingMessage, res:ServerRespon
 			shared.chatManager.SendChannelListing(newUser);
 
 			// Construct & send user's friends list
-			const friends = await shared.database.query("SELECT friendsWith FROM friends WHERE user = ?", [newUser.id]);
+			const userFriends = await shared.database.query("SELECT friendsWith FROM friends WHERE user = ?", [newUser.id]);
 			const friendsArray:Array<number> = new Array<number>();
-			for (const friend of friends) {
+			for (let useFriend of userFriends) {
-				const friendId:number = friend.friendsWith;
+				const friendId:number = useFriend.friendsWith;
 				friendsArray.push(friendId);
 
 				// Also fetch presence for friend if they are online
 				if (shared.users.getById(friendId) === undefined) { continue; }
 
 				const friendPresence = UserPresence(shared, friendId);
-				if (friendPresence === undefined) {
+				if (friendPresence === undefined) { continue; }
-					continue;
-				}
 
 				friendsPresence = Buffer.concat([
 					friendsPresence,
 					friendPresence
 				], friendsPresence.length + friendPresence.length);
 			}
-			// Write this to the user's queue rather than just sending it back so we
+			osuPacketWriter.FriendsList(friendsArray);
-			// don't get the weird `Loading..., Loading...` etc on friends after login.
-			const friendsPacketWriter = osu.Bancho.Writer();
-			friendsPacketWriter.FriendsList(friendsArray);
-			const friendData = friendsPacketWriter.toBuffer;
-			newUser.addActionToQueue(Buffer.concat([friendData, friendsPresence], friendData.length + friendsPresence.length));
 
 			// After sending the user their friends list send them the online users
 			UserPresenceBundle(newUser);
@@ -214,7 +203,7 @@ export default async function LoginProcess(req:IncomingMessage, res:ServerRespon
 	const writerBuffer:Buffer = osuPacketWriter.toBuffer;
 	if (newUser === undefined) {
 		res.writeHead(200, {
-			"cho-token": "no", // NOTE: You have to specify a token even if it's an incorrect login for some reason.
+			"cho-token": "no",
 			"Connection": "keep-alive",
 			"Keep-Alive": "timeout=5, max=100"
 		});

server/MultiplayerManager.ts

@@ -8,8 +8,8 @@ import StatusUpdate from "./packets/StatusUpdate";
 import UserPresence from "./packets/UserPresence";
 import UserPresenceBundle from "./packets/UserPresenceBundle";
 import MatchArray from "./objects/MatchArray";
-import MatchJoinData from "./interfaces/packetTypes/MatchJoinData";
+import MatchJoinData from "./interfaces/MatchJoinData";
-import MatchData from "./interfaces/packetTypes/MatchData";
+import MatchData from "./interfaces/MatchData";
 import osu from "../osuTyping";
 import TourneyMatchSpecialInfo from "./packets/TourneyMatchSpecialInfo";
 
@@ -62,7 +62,7 @@ export default class MultiplayerManager {
 			}
 
 			let matchFull = true;
-			for (const slot of match.slots) {
+			for (let slot of match.slots) {
 				if (slot.player instanceof User || slot.status === SlotStatus.Locked) {
 					continue;
 				}
@@ -111,8 +111,8 @@ export default class MultiplayerManager {
 		const osuPacketWriter = osu.Bancho.Writer();
 		let bufferToSend = UserPresenceBundle(this.shared);
 
-		for (const match of this.matches.getIterableItems()) {
+		for (let match of this.matches.getIterableItems()) {
-			for (const slot of match.slots) {
+			for (let slot of match.slots) {
 				if (!(slot.player instanceof User) || slot.status === SlotStatus.Locked) {
 					continue;
 				}

server/SpectatorManager.ts

@@ -2,7 +2,6 @@ import DataStream from "./objects/DataStream";
 import Shared from "./objects/Shared";
 import User from "./objects/User";
 import osu from "../osuTyping";
-import SpectateFramesData from "./interfaces/packetTypes/SpectateFramesData";
 
 export default class SpectatorManager {
 	private shared:Shared;
@@ -42,13 +41,14 @@ export default class SpectatorManager {
 		spectateStream.Send(osuPacketWriter.toBuffer);
 	}
 
-	public spectatorFrames(user:User, spectateFramesData:SpectateFramesData) {
+	// TODO: Interface for spectateFrameData
+	public spectatorFrames(user:User, spectateFrameData:any) {
 		if (user.spectatorStream === undefined) {
 			return;
 		}
 
 		const osuPacketWriter = osu.Bancho.Writer();
-		osuPacketWriter.SpectateFrames(spectateFramesData);
+		osuPacketWriter.SpectateFrames(spectateFrameData);
 
 		user.spectatorStream.Send(osuPacketWriter.toBuffer);
 	}

server/Util.ts

@@ -32,8 +32,4 @@ export function isNullOrEmpty(str:string | undefined | null) {
 	}
 
 	return false;
-}
-
-export function enumHasFlag(value:number, flag:number) : boolean {
-	return (value & flag) === flag;
 }

server/commands/Admin.ts

@@ -1,35 +0,0 @@
-import { enumHasFlag } from "../Util";
-import { Permissions } from "../enums/Permissions";
-import Channel from "../objects/Channel";
-import User from "../objects/User";
-import BaseCommand from "./BaseCommand";
-
-export default class AdminCommand extends BaseCommand {
-	public readonly adminOnly:boolean = true;
-	public readonly helpDescription:string = "Locks/Unlocks a channel and limits conversation to mods and above.";
-
-	public exec(channel:Channel, sender:User, args:Array<string>) {
-		if (!enumHasFlag(sender.permissions, Permissions.Admin) || !enumHasFlag(sender.permissions, Permissions.Peppy)) {
-			channel.SendBotMessage("You don't have permission to execute that command.");
-			return;
-		}
-
-		const subCommand = args[0].toLowerCase();
-		args.shift();
-
-		switch (subCommand) {
-			case "lock":
-				return adminLock(channel);
-		}
-	}
-}
-
-function adminLock(channel:Channel) {
-	if (channel.isSpecial) {
-		channel.SendBotMessage("Multiplayer channels cannot be locked");
-		return;
-	}
-	
-	channel.isLocked = !channel.isLocked;
-	channel.SendBotMessage(`Channel is now ${channel.isLocked ? "locked" : "unlocked"}`);
-}

server/commands/BaseCommand.ts

@@ -5,7 +5,6 @@ import User from "../objects/User";
 
 export default class BaseCommand implements ICommand {
 	public shared:Shared;
-	public readonly adminOnly:boolean = false;
 	public readonly helpText:string = "No help page was found for that command";
 	public readonly helpDescription:string = "Command has no description set";
 	public readonly helpArguments:Array<string> = new Array<string>();
@@ -15,6 +14,6 @@ export default class BaseCommand implements ICommand {
 	}
 
 	public exec(channel:Channel, sender:User, args:Array<string>) {
-		channel.SendBotMessage(`Sorry ${sender.username}! This command has no functionality yet. Args: ["${args.join('", "')}"]`);
+
 	}
 }

server/commands/Help.ts

@@ -23,7 +23,7 @@ export default class HelpCommand extends BaseCommand {
 		// All commands
 		if (args.length === 0) {
 			let constructedHelp = "Help:\n";
-			for (const key of this.commandKeys) {
+			for (let key of this.commandKeys) {
 				constructedHelp += ` !${key} - ${this.commandList[key].helpDescription}\n`;
 			}
 			channel.SendBotMessage(constructedHelp.slice(0, constructedHelp.length - 1));

server/commands/Lock.ts

@@ -0,0 +1,17 @@
+import Channel from "../objects/Channel";
+import User from "../objects/User";
+import BaseCommand from "./BaseCommand";
+
+export default class LockCommand extends BaseCommand {
+	public readonly helpDescription:string = "Locks/Unlocks a channel and limits conversation to mods and above.";
+
+	public exec(channel:Channel, sender:User, args:Array<string>) {
+		if (channel.isSpecial) {
+			channel.SendBotMessage("Multiplayer channels cannot be locked");
+			return;
+		}
+
+		channel.isLocked = !channel.isLocked;
+		channel.SendBotMessage(`Channel is now ${channel.isLocked ? "locked" : "unlocked"}`);
+	}
+}

server/commands/Multiplayer.ts

@@ -6,7 +6,8 @@ import BaseCommand from "./BaseCommand";
 export default class MultiplayerCommands extends BaseCommand {
 	public readonly helpText:string = `Multiplayer Subcommands:
 !mp start - Starts a multiplayer match with a delay (optional)
-!mp abort - Aborts the currently running round / countdown`;
+!mp abort - Aborts the currently running round / countdown
+!mp obr - Toggles Battle Royale mode`;
 	public readonly helpDescription:string = "Command for use in multiplayer matches.";
 	public readonly helpArguments:Array<string> = ["subCommand"];
 
@@ -35,6 +36,9 @@ export default class MultiplayerCommands extends BaseCommand {
 
 			case "abort":
 				return mpAbort(channel, sender.match);
+
+			case "obr":
+				return mpOBR(channel, sender.match);
 		}
 	}
 }
@@ -85,4 +89,8 @@ function mpAbort(channel:Channel, match:Match) {
 		match.finishMatch();
 		channel.SendBotMessage("Aborted current round");
 	}
+}
+
+function mpOBR(channel:Channel, match:Match) {
+
 }

server/commands/Ranking.ts

@@ -1,6 +1,6 @@
 import Channel from "../objects/Channel";
 import User from "../objects/User";
-import { RankingMode } from "../enums/RankingMode";
+import { RankingModes } from "../enums/RankingModes";
 import BaseCommand from "./BaseCommand";
 
 export default class RankingCommand extends BaseCommand {
@@ -18,15 +18,15 @@ export default class RankingCommand extends BaseCommand {
 
 		switch (args[0].toLowerCase()) {
 			case "pp":
-				sender.rankingMode = RankingMode.PP;
+				sender.rankingMode = RankingModes.PP;
 				channel.SendBotMessage("Set ranking mode to pp.");
 				break;
 			case "score":
-				sender.rankingMode = RankingMode.RANKED_SCORE;
+				sender.rankingMode = RankingModes.RANKED_SCORE;
 				channel.SendBotMessage("Set ranking mode to score.");
 				break;
 			case "acc":
-				sender.rankingMode = RankingMode.AVG_ACCURACY;
+				sender.rankingMode = RankingModes.AVG_ACCURACY;
 				channel.SendBotMessage("Set ranking mode to accuracy.");
 				break;
 		}

server/enums/Mode.ts

@@ -1,7 +0,0 @@
-export enum Mode {
-	Unknown = -1,
-	Osu,
-	Taiko,
-	Catch,
-	Mania
-}

server/enums/Mods.ts

@@ -1,33 +1,4 @@
-// TODO: Complete mods enum.
+// TODO: Mods enum
 export enum Mods {
-	None,
+	None
-	NoFail = 1 << 0,
-	Easy = 1 << 1,
-	// 2 was used for the "No Video" mod but that's gone now.
-	Hidden = 1 << 3,
-	HardRock = 1 << 4,
-	SuddenDeath = 1 << 5,
-	DoubleTime = 1 << 6,
-	Relax = 1 << 7,
-	HalfTime = 1 << 8,
-	Nightcore = 1 << 9,
-	Flashlight = 1 << 10,
-	Autoplay = 1 << 11,
-	SpunOut = 1 << 12,
-	Autopilot = 1 << 13, // I think this is autopilot???
-	Perfect = 1 << 14,
-	Mania4K = 1 << 15,
-	Mania5K = 1 << 16,
-	Mania6K = 1 << 17,
-	Mania7K = 1 << 18,
-	Mania8K = 1 << 19,
-	FadeIn = 1 << 20,
-	Random = 1 << 21,
-	Cinema = 1 << 22,
-	Target = 1 << 23,
-	Mania9K = 1 << 24,
-	ManiaCoop = 1 << 25,
-	Mania1K = 1 << 26,
-	Mania3K = 1 << 27,
-	Mania2K = 1 << 28
 }

server/enums/Permissions.ts

@@ -1,5 +1,4 @@
 export enum Permissions {
-	None = 0,
 	BAT = 2,
 	Supporter = 4,
 	Friend = 8,

server/enums/RankingModes.ts

@@ -1,5 +1,5 @@
-export enum RankingMode {
+export enum RankingModes {
 	PP,
 	RANKED_SCORE,
 	AVG_ACCURACY
-}
+};

server/interfaces/ICommand.ts

@@ -4,7 +4,6 @@ import User from "../objects/User";
 
 export default interface ICommand {
 	shared:Shared,
-	adminOnly:boolean,
 	helpText:string,
 	helpDescription:string,
 	exec: (channel:Channel, sender:User, args:Array<string>) => void

server/interfaces/MatchScoreData.ts

@@ -0,0 +1,19 @@
+export default interface MatchScoreData {
+	time:number,
+	id:number,
+	count300:number,
+	count100:number,
+	count50:number,
+	countGeki:number,
+	countKatu:number,
+	countMiss:number,
+	totalScore:number,
+	maxCombo:number,
+	currentCombo:number,
+	perfect:boolean,
+	currentHp:number,
+	tagByte:number,
+	usingScoreV2:boolean,
+	comboPortion:number,
+	bonusPortion:number
+}

server/interfaces/OsuPacketWriter.ts

@@ -1,11 +1,5 @@
-import ChannelData from "./packetTypes/ChannelData"
+import MatchData from "./MatchData"
-import MatchData from "./packetTypes/MatchData"
+import MessageData from "./MessageData"
-import MessageData from "./packetTypes/MessageData"
-import ScoreFrameData from "./packetTypes/ScoreFrameData"
-import SpectateFramesData from "./packetTypes/SpectateFramesData"
-import StatusUpdateData from "./packetTypes/StatusUpdateData"
-import UserPresenceData from "./packetTypes/UserPresenceData"
-import UserQuitData from "./packetTypes/UserQuitData"
 
 export default interface OsuPacketWriter {
 	// Functions
@@ -13,59 +7,59 @@ export default interface OsuPacketWriter {
 	CommandError() : OsuPacketWriter,
 	SendMessage(data:MessageData) : OsuPacketWriter,
 	Ping() : OsuPacketWriter,
-	HandleIrcChangeUsername(data:string) : OsuPacketWriter,
+	HandleIrcChangeUsername(data:any) : OsuPacketWriter,
 	HandleIrcQuit() : OsuPacketWriter,
-	HandleOsuUpdate(data:StatusUpdateData) : OsuPacketWriter,
+	HandleOsuUpdate(data:any) : OsuPacketWriter,
-	HandleUserQuit(data:UserQuitData) : OsuPacketWriter,
+	HandleUserQuit(data:any) : OsuPacketWriter,
-	SpectatorJoined(data:number) : OsuPacketWriter,
+	SpectatorJoined(data:any) : OsuPacketWriter,
-	SpectatorLeft(data:number) : OsuPacketWriter,
+	SpectatorLeft(data:any) : OsuPacketWriter,
-	SpectateFrames(data:SpectateFramesData) : OsuPacketWriter,
+	SpectateFrames(data:any) : OsuPacketWriter,
 	VersionUpdate() : OsuPacketWriter,
-	SpectatorCantSpectate(data:number) : OsuPacketWriter,
+	SpectatorCantSpectate(data:any) : OsuPacketWriter,
 	GetAttention() : OsuPacketWriter,
 	Announce(data:string) : OsuPacketWriter,
 	MatchUpdate(data:MatchData) : OsuPacketWriter,
-	MatchNew(data:MatchData) : OsuPacketWriter,
+	MatchNew(data:any) : OsuPacketWriter,
-	MatchDisband(data:number) : OsuPacketWriter,
+	MatchDisband(data:any) : OsuPacketWriter,
-	MatchJoinSuccess(data:MatchData) : OsuPacketWriter,
+	MatchJoinSuccess(data:any) : OsuPacketWriter,
 	MatchJoinFail() : OsuPacketWriter,
-	FellowSpectatorJoined(data:number) : OsuPacketWriter,
+	FellowSpectatorJoined(data:any) : OsuPacketWriter,
-	FellowSpectatorLeft(data:number) : OsuPacketWriter,
+	FellowSpectatorLeft(data:any) : OsuPacketWriter,
-	MatchStart(data:MatchData) : OsuPacketWriter,
+	MatchStart(data:any) : OsuPacketWriter,
-	MatchScoreUpdate(data:ScoreFrameData) : OsuPacketWriter,
+	MatchScoreUpdate(data:any) : OsuPacketWriter,
-	MatchTransferHost() : OsuPacketWriter,
+	MatchTransferHost(data:any) : OsuPacketWriter,
 	MatchAllPlayersLoaded() : OsuPacketWriter,
-	MatchPlayerFailed(data:number) : OsuPacketWriter,
+	MatchPlayerFailed(data:any) : OsuPacketWriter,
 	MatchComplete() : OsuPacketWriter,
 	MatchSkip() : OsuPacketWriter,
 	Unauthorised() : OsuPacketWriter,
-	ChannelJoinSuccess(data:string) : OsuPacketWriter,
+	ChannelJoinSuccess(data:any) : OsuPacketWriter,
-	ChannelAvailable(data:ChannelData) : OsuPacketWriter,
+	ChannelAvailable(data:any) : OsuPacketWriter,
-	ChannelRevoked(data:string) : OsuPacketWriter,
+	ChannelRevoked(data:any) : OsuPacketWriter,
-	ChannelAvailableAutojoin(data:ChannelData) : OsuPacketWriter,
+	ChannelAvailableAutojoin(data:any) : OsuPacketWriter,
 	BeatmapInfoReply() : OsuPacketWriter,
 	LoginPermissions(data:number) : OsuPacketWriter,
 	FriendsList(data:Array<number>) : OsuPacketWriter,
 	ProtocolNegotiation(data:number) : OsuPacketWriter,
 	TitleUpdate(data:string) : OsuPacketWriter,
 	Monitor() : OsuPacketWriter,
-	MatchPlayerSkipped(data:number) : OsuPacketWriter,
+	MatchPlayerSkipped(data:any) : OsuPacketWriter,
-	UserPresence(data:UserPresenceData) : OsuPacketWriter,
+	UserPresence(data:any) : OsuPacketWriter,
-	Restart(data:number) : OsuPacketWriter,
+	Restart(data:any) : OsuPacketWriter,
-	Invite(data:MessageData) : OsuPacketWriter,
+	Invite(data:any) : OsuPacketWriter,
 	ChannelListingComplete() : OsuPacketWriter,
-	MatchChangePassword(data:string) : OsuPacketWriter,
+	MatchChangePassword(data:any) : OsuPacketWriter,
-	BanInfo(data:number) : OsuPacketWriter,
+	BanInfo(data:any) : OsuPacketWriter,
-	UserSilenced(data:number) : OsuPacketWriter,
+	UserSilenced(data:any) : OsuPacketWriter,
-	UserPresenceSingle(data:number) : OsuPacketWriter,
+	UserPresenceSingle(data:any) : OsuPacketWriter,
-	UserPresenceBundle(data:Array<number>) : OsuPacketWriter,
+	UserPresenceBundle(data:any) : OsuPacketWriter,
-	UserPMBlocked(data:MessageData) : OsuPacketWriter,
+	UserPMBlocked(data:any) : OsuPacketWriter,
-	TargetIsSilenced(data:MessageData) : OsuPacketWriter,
+	TargetIsSilenced(data:any) : OsuPacketWriter,
 	VersionUpdateForced() : OsuPacketWriter,
-	SwitchServer(data:number) : OsuPacketWriter,
+	SwitchServer(data:any) : OsuPacketWriter,
 	AccountRestricted() : OsuPacketWriter,
-	RTX(data:string) : OsuPacketWriter,
+	RTX(data:any) : OsuPacketWriter,
-	SwitchTourneyServer(data:string) : OsuPacketWriter
+	SwitchTourneyServer(data:any) : OsuPacketWriter
 
 	toBuffer : Buffer
 }

server/interfaces/PlayerScore.ts

@@ -1,12 +1,12 @@
 import Slot from "../objects/Slot";
 import User from "../objects/User";
-import ScoreFrameData from "./packetTypes/ScoreFrameData";
+import MatchScoreData from "./MatchScoreData";
 
 export default interface PlayerScore {
-	player: User,
+	player:User,
-	slot: Slot,
+	slot:Slot,
-	score: number,
+	score:number,
-	isCurrentlyFailed: boolean,
+	isCurrentlyFailed:boolean,
-	hasFailed: boolean,
+	hasFailed:boolean,
-	_raw?: ScoreFrameData
+	_raw?:MatchScoreData
 }

server/interfaces/packetTypes/ChannelData.ts

@@ -1,5 +0,0 @@
-export default interface ChannelData {
-	channelName: string,
-	channelTopic: string,
-	channelUserCount: number
-}

server/interfaces/packetTypes/PresenceData.ts

@@ -1,8 +0,0 @@
-export default interface PresenceData {
-	status: number,
-	statusText: string,
-	beatmapId: number,
-	beatmapChecksum: string,
-	currentMods: number,
-	playMode: number,
-}

server/interfaces/packetTypes/ReplayFrameData.ts

@@ -1,7 +0,0 @@
-export default interface ReplayFrameData {
-	buttonState: number,
-	bt: number,
-	mouseX: number,
-	mouseY: number,
-	time: number
-}

server/interfaces/packetTypes/ScoreFrameData.ts

@@ -1,20 +0,0 @@
-export default interface ScoreFrameData {
-	time: number,
-	id: number,
-	count300: number,
-	count100: number,
-	count50: number,
-	countGeki: number,
-	countKatu: number,
-	countMiss: number,
-	totalScore: number,
-	maxCombo: number,
-	currentCombo: number,
-	perfect: boolean,
-	currentHp: number,
-	tagByte: number,
-	usingScoreV2: boolean,
-	// Only exists if usingScoreV2 = true
-	comboPortion?: number,
-	bonusPortion?: number
-}

server/interfaces/packetTypes/SpectateFramesData.ts

@@ -1,9 +0,0 @@
-import ReplayFrameData from "./ReplayFrameData";
-import ScoreFrameData from "./ScoreFrameData";
-
-export default interface SpectateFramesData {
-	extra: number,
-	replayFrames: Array<ReplayFrameData>,
-	action: number,
-	scoreFrame: ScoreFrameData
-}

server/interfaces/packetTypes/StatusUpdateData.ts

@@ -1,15 +0,0 @@
-export default interface StatusUpdateData {
-	userId: number,
-	status: number,
-	statusText: string,
-	beatmapChecksum: string,
-	currentMods: number,
-	playMode: number,
-	beatmapId: number,
-	rankedScore: number,
-	accuracy: number,
-	playCount: number,
-	totalScore: number,
-	rank: number,
-	performance: number
-}

server/interfaces/packetTypes/UserPresenceData.ts

@@ -1,12 +0,0 @@
-import { Permissions } from "../../enums/Permissions";
-
-export default interface UserPresenceData {
-	userId: number,
-	username: string,
-	timezone: number,
-	countryId: number,
-	permissions: Permissions,
-	longitude: number,
-	latitude: number,
-	rank: number
-}

server/interfaces/packetTypes/UserQuitData.ts

@@ -1,4 +0,0 @@
-export default interface UserQuitData {
-	userId: number,
-	state: number
-}

server/objects/DataStream.ts

@@ -74,7 +74,7 @@ export default class DataStream {
 	public Send(data:Buffer) {
 		this.checkInactive();
 
-		for (const user of this.users.getIterableItems()) {
+		for (let user of this.users.getIterableItems()) {
 			user.addActionToQueue(data);
 		}
 		if (Constants.DEBUG) {
@@ -85,7 +85,7 @@ export default class DataStream {
 	public SendWithExclusion(data:Buffer, exclude:User) {
 		this.checkInactive();
 
-		for (const user of this.users.getIterableItems()) {
+		for (let user of this.users.getIterableItems()) {
 			if (user.uuid !== exclude.uuid) {
 				user.addActionToQueue(data);
 			}

server/objects/DataStreamArray.ts

@@ -26,7 +26,7 @@ export default class DataStreamArray extends FunkyArray<DataStream> {
 	}
 
 	public RemoveUserFromAllStreams(user:User) {
-		for (const stream of this.getIterableItems()) {
+		for (let stream of this.getIterableItems()) {
 			stream.RemoveUser(user);
 		}
 	}

server/objects/Database.ts

@@ -1,6 +1,5 @@
 import { ConsoleHelper } from "../../ConsoleHelper";
-import { createPool, Pool, RowDataPacket } from "mysql2";
+import { createPool, Pool } from "mysql2";
-import { DBInDataType } from "../types/DBTypes";
 
 export default class Database {
 	private connectionPool:Pool;
@@ -21,77 +20,50 @@ export default class Database {
 		ConsoleHelper.printInfo(`Connected DB connection pool. MAX_CONNECTIONS = ${Database.CONNECTION_LIMIT}`);
 	}
 
-	public execute(query:string, data?:Array<DBInDataType>) {
+	public query(query = "", data?:Array<any>) {
-		return new Promise<boolean>((resolve, reject) => {
+		const limited = query.includes("LIMIT 1");
+
+		return new Promise<any>((resolve, reject) => {
 			this.connectionPool.getConnection((err, connection) => {
 				if (err) {
-					return reject(err);
+					reject(err);
-				}
+					try {
-
+						connection.release();
-				if (data == null) {
+					} catch (e) {
-					connection.execute(query, (err, result) => {
+						ConsoleHelper.printError("Failed to release mysql connection\n" + err);
-						if (err) {
+					}
-							connection.release();
-							return reject(err);
-						}
-	
-						resolve(result !== undefined);
-					});
-				} else {
-					connection.execute(query, data, (err, result) => {
-						if (err) {
-							connection.release();
-							return reject(err);
-						}
-	
-						resolve(result !== undefined);
-					});
-				}
-			});
-		});
-	}
-
-	public query(query:string, data?:Array<DBInDataType>) {
-		return new Promise<RowDataPacket[]>((resolve, reject) => {
-			this.connectionPool.getConnection((err, connection) => {
-				if (err) {
-					return reject(err);
 				} else {
 					// Use old query
 					if (data == null) {
-						connection.query<RowDataPacket[]>(query, (err, rows) => {
+						connection.query(query, (err, data) => {
-							connection.release();
 							if (err) {
-								return reject(err);
+								reject(err);
+								connection.release();
+							} else {
+								dataReceived(resolve, data, limited);
+								connection.release();
 							}
-
-							resolve(rows);
-							connection.release();
 						});
 					}
 					// Use new prepared statements w/ placeholders
 					else {
-						connection.execute<RowDataPacket[]>(query, data, (err, rows) => {
+						connection.execute(query, data, (err, data) => {
-							connection.release();
 							if (err) {
-								return reject(err);
+								reject(err);
+								connection.release();
+							} else {
+								dataReceived(resolve, data, limited);
+								connection.release();
 							}
-
-							resolve(rows);
-							connection.release();
 						});
 					}
 				}
 			});
 		});
 	}
+}
 
-	public async querySingle(query:string, data?:Array<DBInDataType>) {
+function dataReceived(resolveCallback:(value:unknown) => void, data:any, limited:boolean = false) : void {
-		const dbData = await this.query(query, data);
+	if (limited) resolveCallback(data[0]);
-		if (dbData != null && dbData.length > 0) {
+	else resolveCallback(data);
-			return dbData[0];
-		}
-
-		return null;
-	}
 }

server/objects/FunkyArray.ts

@@ -1,5 +1,5 @@
 export default class FunkyArray<T> {
-	private items:{ [id: string]: T } = {};
+	private items:any = {};
 	private itemKeys:Array<string> = Object.keys(this.items);
 	private iterableArray:Array<T> = new Array<T>();
 
@@ -29,8 +29,8 @@ export default class FunkyArray<T> {
 	}
 
 	public regenerateIterableArray() : void {
-		this.iterableArray = new Array<T>();
+		this.iterableArray = new Array();
-		for (const itemKey of this.itemKeys) {
+		for (let itemKey of this.itemKeys) {
 			this.iterableArray.push(this.items[itemKey]);
 		}
 		this.itemKeys = Object.keys(this.items);
@@ -64,7 +64,7 @@ export default class FunkyArray<T> {
 		return this.itemKeys;
 	}
 
-	public getItems() : { [id: string]: T } {
+	public getItems() : any {
 		return this.items;
 	}
 

server/objects/Match.ts

@@ -5,19 +5,13 @@ import Slot from "./Slot";
 import User from "./User";
 import StatusUpdate from "../packets/StatusUpdate";
 import { SlotStatus } from "../enums/SlotStatus";
-import MatchData from "../interfaces/packetTypes/MatchData";
+import MatchData from "../interfaces/MatchData";
 import { Team } from "../enums/Team";
-import MatchStartSkipData from "../interfaces/packetTypes/MatchStartSkipData";
+import MatchStartSkipData from "../interfaces/MatchStartSkipData";
 import { Mods } from "../enums/Mods";
 import PlayerScore from "../interfaces/PlayerScore";
-import { enumHasFlag } from "../Util";
+import MatchScoreData from "../interfaces/MatchScoreData";
 import osu from "../../osuTyping";
-import ScoreFrameData from "../interfaces/packetTypes/ScoreFrameData";
-
-// Mods which need to be applied to the match during freemod.
-const matchFreemodGlobalMods:Array<Mods> = [
-	Mods.DoubleTime, Mods.Nightcore, Mods.HalfTime
-]
 
 export default class Match {
 	// osu! Data
@@ -242,7 +236,7 @@ export default class Match {
 			}
 			queryData.push(this.matchId);
 
-			await this.shared.database.execute(
+			await this.shared.database.query(
 				`UPDATE mp_matches SET ${gameNameChanged ? `name = ?${gameSeedChanged ? ", " : ""}` : ""}${gameSeedChanged ? `seed = ?` : ""} WHERE id = ?`,
 				queryData
 			);
@@ -397,16 +391,11 @@ export default class Match {
 			allSkipped = false;
 		}
 
-		const slotId = user.matchSlot?.slotId ?? Number.MIN_VALUE;
-		if (slotId === Number.MIN_VALUE) {
-			return;
-		}
-
 		// All players have finished playing, finish the match
 		if (allSkipped) {
 			const osuPacketWriter = osu.Bancho.Writer();
 
-			osuPacketWriter.MatchPlayerSkipped(slotId);
+			osuPacketWriter.MatchPlayerSkipped(user.id);
 			osuPacketWriter.MatchSkip();
 
 			this.matchStream.Send(osuPacketWriter.toBuffer);
@@ -415,7 +404,7 @@ export default class Match {
 		} else {
 			const osuPacketWriter = osu.Bancho.Writer();
 			
-			osuPacketWriter.MatchPlayerSkipped(slotId);
+			osuPacketWriter.MatchPlayerSkipped(user.id);
 
 			this.matchStream.Send(osuPacketWriter.toBuffer);
 		}
@@ -431,6 +420,7 @@ export default class Match {
 		}
 	}
 
+	// TODO: Fix not being able to add DT when freemod is active
 	public updateMods(user:User, mods:Mods) {
 		const slot = user.matchSlot;
 		if (!(slot instanceof Slot)) {
@@ -441,19 +431,6 @@ export default class Match {
 		if (this.specialModes === 1) {
 			slot.mods = mods;
 
-			// Extra check for host during freemod
-			if (User.Equals(this.host, user)) {
-				let generatedMatchModList = 0;
-				for (const mod of matchFreemodGlobalMods) {
-					if (enumHasFlag(slot.mods, mod)) {
-						slot.mods -= mod;
-						generatedMatchModList += mod;
-					}
-				}
-
-				this.activeMods = generatedMatchModList;
-			}
-
 			this.sendMatchUpdate();
 		} else {
 			if (!User.Equals(this.host, user)) {
@@ -526,7 +503,7 @@ export default class Match {
 
 		// All players have loaded the beatmap, start playing.
 		if (allLoaded) {
-			const osuPacketWriter = osu.Bancho.Writer();
+			let osuPacketWriter = osu.Bancho.Writer();
 			osuPacketWriter.MatchAllPlayersLoaded();
 			this.matchStream.Send(osuPacketWriter.toBuffer);
 
@@ -595,9 +572,9 @@ export default class Match {
 		this.matchLoadSlots = undefined;
 		this.inProgress = false;
 
-		const osuPacketWriter = osu.Bancho.Writer();
+		let osuPacketWriter = osu.Bancho.Writer();
 
-		const queryData:Array<string | number | null> = [
+		let queryData:Array<any> = [
 			this.matchId,
 			this.roundId++,
 			this.playMode,
@@ -631,7 +608,7 @@ export default class Match {
 			slot.status = SlotStatus.NotReady;
 		}
 
-		await this.shared.database.execute("INSERT INTO mp_match_rounds (id, match_id, round_id, round_mode, match_type, round_scoring_type, round_team_type, round_mods, beatmap_md5, freemod, player0, player1, player2, player3, player4, player5, player6, player7, player8, player9, player10, player11, player12, player13, player14, player15) VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", queryData);
+		await this.shared.database.query("INSERT INTO mp_match_rounds (id, match_id, round_id, round_mode, match_type, round_scoring_type, round_team_type, round_mods, beatmap_md5, freemod, player0, player1, player2, player3, player4, player5, player6, player7, player8, player9, player10, player11, player12, player13, player14, player15) VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", queryData);
 
 		osuPacketWriter.MatchComplete();
 
@@ -648,31 +625,31 @@ export default class Match {
 		this.playerScores = undefined;
 	}
 
-	updatePlayerScore(user:User, scoreFrameData:ScoreFrameData) {
+	updatePlayerScore(user:User, matchScoreData:MatchScoreData) {
 		const osuPacketWriter = osu.Bancho.Writer();
 
 		if (user.matchSlot === undefined || user.matchSlot.player === undefined || this.playerScores === undefined) {
 			return;
 		}
 
-		scoreFrameData.id = user.matchSlot.slotId;
+		matchScoreData.id = user.id;
 
 		// Update playerScores
 		for (const playerScore of this.playerScores) {
 			if (playerScore.player?.id === user.id) {
-				playerScore.score = scoreFrameData.totalScore;
+				playerScore.score = matchScoreData.totalScore;
-				const isCurrentlyFailed = scoreFrameData.currentHp == 254;
+				const isCurrentlyFailed = matchScoreData.currentHp == 254;
 				playerScore.isCurrentlyFailed = isCurrentlyFailed;
 				if (!playerScore.hasFailed && isCurrentlyFailed) {
 					playerScore.hasFailed = true;
 				}
-				playerScore._raw = scoreFrameData;
+				playerScore._raw = matchScoreData;
 
 				break;
 			}
 		}
 		
-		osuPacketWriter.MatchScoreUpdate(scoreFrameData);
+		osuPacketWriter.MatchScoreUpdate(matchScoreData);
 
 		// Send the newly updated score to all users in the match
 		this.matchStream.Send(osuPacketWriter.toBuffer);

server/objects/MatchArray.ts

@@ -3,7 +3,7 @@ import Match from "./Match";
 
 export default class MatchArray extends FunkyArray<Match> {
     public getById(id:number) : Match | undefined {
-		for (const match of this.getIterableItems()) {
+		for (let match of this.getIterableItems()) {
 			if (match.matchId === id) {
                 return match;
             }

server/objects/Shared.ts

@@ -10,9 +10,6 @@ import User from "./User";
 import LatLng from "./LatLng";
 import Bot from "../Bot";
 import { ConsoleHelper } from "../../ConsoleHelper";
-import UserInfoRepository from "../repos/UserInfoRepository";
-import { Permissions } from "../enums/Permissions";
-import UserModesInfoRepository from "../repos/UserModesInfoRepository";
 
 export default class Shared {
 	public readonly chatManager:ChatManager;
@@ -24,9 +21,6 @@ export default class Shared {
 	public readonly users:UserArray;
 	public readonly bot:Bot;
 
-	public readonly userInfoRepository:UserInfoRepository;
-	public readonly userModesInfoRepository:UserModesInfoRepository;
-
 	public constructor() {
 		if (!existsSync("./config.json")) {
 			ConsoleHelper.printError("Config file missing!");
@@ -39,7 +33,7 @@ export default class Shared {
 
 		// Add the bot user
 		this.users = new UserArray();
-		const botUser = this.users.add("bot", new User(3, "SillyBot", "bot", Permissions.None, this));
+		const botUser = this.users.add("bot", new User(3, "SillyBot", "bot", this));
 		botUser.location = new LatLng(50, -32);
 		this.bot = new Bot(this, botUser);
 
@@ -52,9 +46,5 @@ export default class Shared {
 
 		this.multiplayerManager = new MultiplayerManager(this);
 		this.privateChatManager = new PrivateChatManager(this);
-
-		// DB Repos
-		this.userInfoRepository = new UserInfoRepository(this);
-		this.userModesInfoRepository = new UserModesInfoRepository(this);
 	}
 }

server/objects/User.ts

@@ -1,15 +1,21 @@
 import LatLng from "./LatLng";
-import { RankingMode } from "../enums/RankingMode";
+import { RankingModes } from "../enums/RankingModes";
 import Match from "./Match";
 import DataStream from "./DataStream";
 import StatusUpdate from "../packets/StatusUpdate";
 import Shared from "../objects/Shared";
 import Slot from "./Slot";
 import Channel from "./Channel";
-import PresenceData from "../interfaces/packetTypes/PresenceData";
+
-import { Permissions } from "../enums/Permissions";
+const rankingModes = [
+	"pp_raw",
+	"ranked_score",
+	"avg_accuracy"
+];
 
 export default class User {
+	private static readonly EMPTY_BUFFER = Buffer.alloc(0);
+
 	public shared:Shared;
 
 	public id:number;
@@ -17,13 +23,12 @@ export default class User {
 	public uuid:string;
 	public readonly connectTime:number = Date.now();
 	public timeoutTime:number = Date.now() + 30000;
-	public queue:Buffer = Buffer.allocUnsafe(0);
+	public queue:Buffer = User.EMPTY_BUFFER;
 	
 	// Binato data
-	public rankingMode:RankingMode = RankingMode.PP;
+	public rankingMode:RankingModes = RankingModes.PP;
 	public spectatorStream?:DataStream;
 	public spectatingUser?:User;
-	public permissions:Permissions;
 
 	// osu! data
 	public playMode:number = 0;
@@ -61,11 +66,10 @@ export default class User {
 		return user0.uuid === user1.uuid;
 	}
 
-	public constructor(id:number, username:string, uuid:string, permissions:Permissions, shared:Shared) {
+	public constructor(id:number, username:string, uuid:string, shared:Shared) {
 		this.id = id;
 		this.username = username;
 		this.uuid = uuid;
-		this.permissions = permissions;
 
 		this.shared = shared;
 	}
@@ -76,11 +80,11 @@ export default class User {
 	}
 
 	clearQueue() {
-		this.queue = Buffer.allocUnsafe(0);
+		this.queue = User.EMPTY_BUFFER;
 	}
 
 	// Updates the user's current action
-	updatePresence(action:PresenceData) {
+	updatePresence(action:any) {
 		this.actionID = action.status;
 		this.actionText = action.statusText;
 		this.beatmapChecksum = action.beatmapChecksum;
@@ -95,27 +99,26 @@ export default class User {
 
 	// Gets the user's score information from the database and caches it
 	async updateUserInfo(forceUpdate:boolean = false) {
-		const userScoreDB = await this.shared.userModesInfoRepository.selectByUserIdModeId(this.id, this.playMode);
+		const userScoreDB = await this.shared.database.query("SELECT * FROM users_modes_info WHERE user_id = ? AND mode_id = ? LIMIT 1", [this.id, this.playMode]);
-		const userRank = await this.shared.userModesInfoRepository.selectRankByIdModeIdRankingMode(this.id, this.playMode, this.rankingMode);
+		const mappedRankingMode = rankingModes[this.rankingMode];
+		const userRankDB = await this.shared.database.query(`SELECT user_id, ${mappedRankingMode} FROM users_modes_info WHERE mode_id = ? ORDER BY ${mappedRankingMode} DESC`, [this.playMode]);
 
-		if (userScoreDB == null || userRank == null) throw "fuck";
+		if (userScoreDB == null || userRankDB == null) throw "fuck";
-
-		this.rank = userRank;
 
 		// Handle "if we should update" checks for each rankingMode
 		let userScoreUpdate = false;
 		switch (this.rankingMode) {
-			case RankingMode.PP:
+			case RankingModes.PP:
 				if (this.pp != userScoreDB.pp_raw)
 					userScoreUpdate = true;
 				break;
 
-			case RankingMode.RANKED_SCORE:
+			case RankingModes.RANKED_SCORE:
 				if (this.rankedScore != userScoreDB.ranked_score)
 					userScoreUpdate = true;
 				break;
 
-			case RankingMode.AVG_ACCURACY:
+			case RankingModes.AVG_ACCURACY:
 				if (this.accuracy != userScoreDB.avg_accuracy)
 					userScoreUpdate = true;
 				break;
@@ -126,6 +129,14 @@ export default class User {
 		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;
+				break;
+			}
+		}
+
 		// Set PP to none if ranking mode is not PP
 		if (this.rankingMode == 0) this.pp = userScoreDB.pp_raw;
 		else this.pp = 0;

server/objects/UserArray.ts

@@ -3,7 +3,7 @@ import User from "./User";
 
 export default class UserArray extends FunkyArray<User> {
 	public getById(id:number) : User | undefined {
-		for (const user of this.getIterableItems()) {
+		for (let user of this.getIterableItems()) {
 			if (user.id == id) 
 				return user;
 		}
@@ -12,7 +12,7 @@ export default class UserArray extends FunkyArray<User> {
 	}
 
 	public getByUsername(username:string) : User | undefined {
-		for (const user of this.getIterableItems()) {
+		for (let user of this.getIterableItems()) {
 			if (user.username === username)
 				return user;
 		}

server/objects/database/UserInfo.ts

@@ -1,5 +1,3 @@
-import { Permissions } from "../../enums/Permissions";
-
 export default class UserInfo {
 	id:number = Number.MIN_VALUE;
 	username:string = "";
@@ -12,7 +10,7 @@ export default class UserInfo {
 	last_login_date:Date = new Date(0);
 	last_played_mode:number = Number.MIN_VALUE;
 	online_now:boolean = false;
-	tags:Permissions = Permissions.None;
+	tags:number = Number.MIN_VALUE;
 	supporter:boolean = false;
 	web_session:string = "";
 	verification_needed:boolean = false;

server/objects/database/UserModeInfo.ts

@@ -1,24 +0,0 @@
-import { Mode } from "../../enums/Mode";
-
-export default class UserModeInfo {
-	n:number = Number.MIN_VALUE;
-	user_id:number = Number.MIN_VALUE;
-	mode_id:Mode = Mode.Unknown;
-	count300:number = Number.MIN_VALUE;
-	count100:number = Number.MIN_VALUE;
-	count50:number = Number.MIN_VALUE;
-	countmiss:number = Number.MIN_VALUE;
-	playcount:number = Number.MIN_VALUE;
-	total_score:number = Number.MIN_VALUE;
-	ranked_score:number = Number.MIN_VALUE;
-	pp_rank:number = Number.MIN_VALUE;
-	pp_raw:number = Number.MIN_VALUE;
-	count_rank_ss:number = Number.MIN_VALUE;
-	count_rank_s:number = Number.MIN_VALUE;
-	count_rank_a:number = Number.MIN_VALUE;
-	pp_country_rank:number = Number.MIN_VALUE;
-	playtime:number = Number.MIN_VALUE;
-	avg_accuracy:number = Number.MIN_VALUE;
-	level:number = Number.MIN_VALUE;
-	is_deleted:boolean = false;
-}

server/packets/AddFriend.ts

@@ -1,7 +1,7 @@
 import User from "../objects/User";
 
-export default async function AddFriend(user:User, friendId:number) {
+export default function AddFriend(user:User, friendId:number) {
-	await user.shared.database.execute("INSERT INTO friends (user, friendsWith) VALUES (?, ?)", [
+	user.shared.database.query("INSERT INTO friends (user, friendsWith) VALUES (?, ?)", [
 		user.id, friendId
 	]);
 }

server/packets/ChangeAction.ts

@@ -1,8 +1,7 @@
-import PresenceData from "../interfaces/packetTypes/PresenceData";
 import User from "../objects/User";
 import StatusUpdate from "./StatusUpdate";
 
-export default function ChangeAction(user:User, data:PresenceData) {
+export default function ChangeAction(user:User, data:any) {
 	user.updatePresence(data);
 
 	if (user.spectatorStream != null) {

server/packets/Logout.ts

@@ -13,7 +13,7 @@ export default async function Logout(user:User) {
 	// Remove user from user list
 	user.shared.users.remove(user.uuid);
 
-	await user.shared.database.execute("UPDATE osu_info SET value = ? WHERE name = 'online_now'", [user.shared.users.getLength() - 1]);
+	await user.shared.database.query("UPDATE osu_info SET value = ? WHERE name = 'online_now'", [user.shared.users.getLength() - 1]);
 
 	ConsoleHelper.printBancho(`User logged out, took ${Date.now() - logoutStartTime}ms. [User: ${user.username}]`);
 }

server/packets/PrivateMessage.ts

@@ -1,4 +1,4 @@
-import MessageData from "../interfaces/packetTypes/MessageData";
+import MessageData from "../interfaces/MessageData";
 import Shared from "../objects/Shared";
 import PrivateChannel from "../objects/PrivateChannel";
 import User from "../objects/User";

server/packets/RemoveFriend.ts

@@ -1,7 +1,7 @@
 import User from "../objects/User";
 
-export default async function RemoveFriend(user:User, friendId:number) {
+export default function RemoveFriend(user:User, friendId:number) {
-	await user.shared.database.execute("DELETE FROM friends WHERE user = ? AND friendsWith = ? LIMIT 1", [
+	user.shared.database.query("DELETE FROM friends WHERE user = ? AND friendsWith = ? LIMIT 1", [
 		user.id, friendId
 	]);
 }

server/packets/SendPublicMessage.ts

@@ -1,10 +0,0 @@
-import { Channel } from "diagnostics_channel";
-import MessageData from "../interfaces/packetTypes/MessageData";
-import User from "../objects/User";
-
-export default function SendPublicMessage(user:User, message:MessageData) {
-	const channel = user.shared.chatManager.GetChannelByName(message.target);
-	if (channel instanceof Channel) {
-		channel.SendMessage(user, message.message);
-	}
-}

server/packets/StatusUpdate.ts

@@ -1,13 +1,10 @@
 import Shared from "../objects/Shared";
-import { RankingMode } from "../enums/RankingMode";
+import { RankingModes } from "../enums/RankingModes";
 import User from "../objects/User";
 import osu from "../../osuTyping";
 
 export default function StatusUpdate(arg0:User | Shared, id:number) {
-	// Ignore Bot
+	if (id == 3) return; // Ignore Bot
-	if (id == 3) {
-		return Buffer.allocUnsafe(0);
-	}
 
 	// Create new osu packet writer
 	const osuPacketWriter = osu.Bancho.Writer();
@@ -21,11 +18,9 @@ export default function StatusUpdate(arg0:User | Shared, id:number) {
 	// Get user's class
 	const userData = shared.users.getById(id);
 
-	if (userData == null) {
+	if (userData == null) return;
-		return Buffer.allocUnsafe(0);
-	}
 
-	osuPacketWriter.HandleOsuUpdate({
+	let UserStatusObject = {
 		userId: userData.id,
 		status: userData.actionID,
 		statusText: userData.actionText,
@@ -38,8 +33,10 @@ export default function StatusUpdate(arg0:User | Shared, id:number) {
 		playCount: userData.playCount,
 		totalScore: userData.totalScore,
 		rank: userData.rank, 
-		performance: (userData.rankingMode == RankingMode.PP ? userData.pp : 0)
+		performance: (userData.rankingMode == RankingModes.PP ? userData.pp : 0)
-	});
+	};
+
+	osuPacketWriter.HandleOsuUpdate(UserStatusObject);
 
 	// Send data to user's queue
 	if (arg0 instanceof User) {

server/packets/UserPresenceBundle.ts

@@ -11,9 +11,9 @@ export default function UserPresenceBundle(arg0:User | Shared) : Buffer {
 		shared = arg0;
 	}
 
-	const userIds:Array<number> = new Array<number>();
+	let userIds:Array<number> = new Array<number>();
 
-	for (const userData of shared.users.getIterableItems()) {
+	for (let userData of shared.users.getIterableItems()) {
 		userIds.push(userData.id);
 	}
 

server/packets/UserStatsRequest.ts

@@ -6,7 +6,7 @@ import UserPresenceBundle from "./UserPresenceBundle";
 export default function UserStatsRequest(user:User, data:Array<number>) {
 	UserPresenceBundle(user);
 
-	for (const id of data) {
+	for (let id of data) {
 		UserPresence(user, id);
 		StatusUpdate(user, id);
 	}

server/repos/UserInfoRepository.ts

@@ -1,59 +0,0 @@
-import { RowDataPacket } from "mysql2";
-import Database from "../objects/Database";
-import Shared from "../objects/Shared";
-import UserInfo from "../objects/database/UserInfo";
-
-export default class UserInfoRepository {
-	private database:Database;
-	public constructor(shared:Shared) {
-		this.database = shared.database;
-	}
-
-	public async selectById(id:number) {
-		const query = await this.database.query("CALL SelectUserInfoById(?)", [id]);
-		if (query != null) {
-			const userInfo = new UserInfo();
-			populateUserInfoFromRowDataPacket(userInfo, query[0][0]);
-
-			return userInfo;
-		}
-
-		return null;
-	}
-
-	public async selectByUsername(username:string) {
-		const query = await this.database.query("CALL SelectUserInfoByUsername(?)", [username]);
-		if (query != null) {
-			const userInfo = new UserInfo();
-			populateUserInfoFromRowDataPacket(userInfo, query[0][0]);
-
-			return userInfo;
-		}
-
-		return null;
-	}
-}
-
-function populateUserInfoFromRowDataPacket(userInfo:UserInfo, rowDataPacket:RowDataPacket) {
-	userInfo.id = rowDataPacket["id"];
-	userInfo.username = rowDataPacket["username"];
-	userInfo.username_safe = rowDataPacket["username_safe"];
-	userInfo.password_hash = rowDataPacket["password_hash"];
-	userInfo.password_salt = rowDataPacket["password_salt"];
-	userInfo.email = rowDataPacket["email"];
-	userInfo.country = rowDataPacket["country"];
-	userInfo.reg_date = rowDataPacket["reg_date"];
-	userInfo.last_login_date = rowDataPacket["last_login_date"];
-	userInfo.last_played_mode = rowDataPacket["last_played_mode"];
-	userInfo.online_now = rowDataPacket["online_now"];
-	userInfo.tags = rowDataPacket["tags"];
-	userInfo.supporter = rowDataPacket["supporter"];
-	userInfo.web_session = rowDataPacket["web_session"];
-	userInfo.verification_needed = rowDataPacket["verification_needed"];
-	userInfo.password_change_required = rowDataPacket["password_change_required"];
-	userInfo.has_old_password = rowDataPacket["has_old_password"];
-	userInfo.password_reset_key = rowDataPacket["password_reset_key"];
-	userInfo.away_message = rowDataPacket["away_message"];
-	userInfo.last_modified_time = rowDataPacket["last_modified_time"];
-	userInfo.is_deleted = rowDataPacket["is_deleted"];
-}

server/repos/UserModesInfoRepository.ts

@@ -1,72 +0,0 @@
-import { RowDataPacket } from "mysql2";
-import Database from "../objects/Database";
-import Shared from "../objects/Shared";
-import UserModeInfo from "../objects/database/UserModeInfo";
-import { Mode } from "fs";
-import { RankingMode } from "../enums/RankingMode";
-
-export default class UserModesInfoRepository {
-	private database:Database;
-	public constructor(shared:Shared) {
-		this.database = shared.database;
-	}
-
-	public async selectByUserIdModeId(id:number, mode:Mode) {
-		const query = await this.database.query("CALL SelectUserModesInfoByUserIdModeId(?,?)", [id, mode]);
-		if (query != null) {
-			const userModeInfo = new UserModeInfo();
-			populateUserModeInfoFromRowDataPacket(userModeInfo, query[0][0]);
-
-			return userModeInfo;
-		}
-
-		return null;
-	}
-
-	public async selectRankByIdModeIdRankingMode(id:number, mode:Mode, rankingMode:RankingMode) : Promise<number | null> {
-		let query:RowDataPacket[] | undefined;
-		switch (rankingMode) {
-			case RankingMode.RANKED_SCORE:
-				query = await this.database.query("CALL SelectUserScoreRankByIdModeId(?,?)", [id, mode]);
-				break;
-
-			case RankingMode.AVG_ACCURACY:
-				query = await this.database.query("CALL SelectUserAccRankByIdModeId(?,?)", [id, mode]);
-				break;
-
-			case RankingMode.PP:
-			default:
-				query = await this.database.query("CALL SelectUserPPRankByIdModeId(?,?)", [id, mode]);
-				break;
-		}
-
-		if (query != null && query.length != 0) {
-			return query[0][0].rank;
-		}
-
-		return null;
-	}
-}
-
-function populateUserModeInfoFromRowDataPacket(userModeInfo:UserModeInfo, rowDataPacket:RowDataPacket) {
-	userModeInfo.n = rowDataPacket["n"];
-	userModeInfo.user_id = rowDataPacket["user_id"];
-	userModeInfo.mode_id = rowDataPacket["mode_id"];
-	userModeInfo.count300 = rowDataPacket["count300"];
-	userModeInfo.count100 = rowDataPacket["count100"];
-	userModeInfo.count50 = rowDataPacket["count50"];
-	userModeInfo.countmiss = rowDataPacket["countmiss"];
-	userModeInfo.playcount = rowDataPacket["playcount"];
-	userModeInfo.total_score = rowDataPacket["total_score"];
-	userModeInfo.ranked_score = rowDataPacket["ranked_score"];
-	userModeInfo.pp_rank = rowDataPacket["pp_rank"];
-	userModeInfo.pp_raw = rowDataPacket["pp_raw"];
-	userModeInfo.count_rank_ss = rowDataPacket["count_rank_ss"];
-	userModeInfo.count_rank_s = rowDataPacket["count_rank_s"];
-	userModeInfo.count_rank_a = rowDataPacket["count_rank_a"];
-	userModeInfo.pp_country_rank = rowDataPacket["pp_country_rank"];
-	userModeInfo.playtime = rowDataPacket["playtime"];
-	userModeInfo.avg_accuracy = rowDataPacket["avg_accuracy"];
-	userModeInfo.level = rowDataPacket["level"];
-	userModeInfo.is_deleted = rowDataPacket["is_deleted"];
-}

server/types/DBTypes.ts

@@ -1 +0,0 @@
-export type DBInDataType = string | number | null | undefined;

tooling/cleanup.ts

@@ -1,11 +1,12 @@
-import { readdirSync, rmSync, readFileSync } from "fs";
+import { readdirSync, rmSync, renameSync } from "fs";
 
 const libFiles = readdirSync("./build");
 
-const mangled = readFileSync("./build/.MANGLED").toString() === "false";
-
 for (const file of libFiles) {
-	if (!file.startsWith(mangled ? "Binato.min.js" : "Binato.js")) {
+	if (!file.startsWith("Binato.min.js")) {
 		rmSync(`./build/${file}`, { recursive: true });
 	}
-}
+}
+
+//renameSync("./build/combined.js", "./build/index.js");
+//renameSync("./build/combined.d.ts", "./build/index.d.ts");

tooling/fileSmasher.ts

@@ -5,7 +5,6 @@
 import { readdirSync, lstatSync, readFileSync, writeFileSync } from "fs";
 
 let tsFileData:Array<string> = new Array<string>();
-const tsHighPriorityData:Array<string> = new Array<string>();
 const tsEvenFirsterData:Array<string> = new Array<string>();
 const tsVeryFirstData:Array<string> = new Array<string>();
 const tsFirstFileData:Array<string> = new Array<string>();
@@ -26,11 +25,9 @@ function readDir(nam:string) {
 		} else if (file.endsWith(".ts")) {
 			if (file == "Binato.ts") {
 				tsLastFileData.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
-			} else if (file.includes("BaseCommand")) {
-				tsHighPriorityData.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
 			} else if (nam.includes("commands") || file.includes("ConsoleHelper")) {
 				tsEvenFirsterData.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
-			} else if (file.includes("FunkyArray") || file.includes("ChatManager") || file.includes("MultiplayerManager") || file === "BaseCommand.ts" || file.includes("Bot.ts")) {
+			} else if (file.includes("FunkyArray") || file.includes("ChatManager") || file.includes("MultiplayerManager") || file === "Bot.ts") {
 				tsVeryFirstData.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
 			} else if (nam.includes("enum") || nam.includes("packets") || (nam.includes("objects") && !file.includes("FunkyArray") ) || file.includes("SpectatorManager")) {
 				tsFirstFileData.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
@@ -43,7 +40,7 @@ function readDir(nam:string) {
 
 readDir("./");
 
-tsFileData = tsFileData.concat(tsHighPriorityData).concat(tsEvenFirsterData).concat(tsVeryFirstData).concat(tsFirstFileData).concat(tsEverythingElse).concat(tsLastFileData);
+tsFileData = tsFileData.concat(tsEvenFirsterData).concat(tsVeryFirstData).concat(tsFirstFileData).concat(tsEverythingElse).concat(tsLastFileData);
 
 const combinedFiles = tsFileData.join("\n");
 
@@ -56,7 +53,7 @@ import { Registry, collectDefaultMetrics } from "prom-client";
 import { RedisClientType, createClient } from "redis";
 import { readFileSync, existsSync } from "fs";
 import { randomBytes, pbkdf2 } from "crypto";
-import { createPool, Pool, RowDataPacket } from "mysql2";
+import { createPool, Pool } from "mysql2";
 import * as dyetty from "dyetty";
 import fetch from "node-fetch";
 import http from "http";`);

tooling/mangle.ts

@@ -2,14 +2,13 @@ import { readFileSync, writeFileSync } from "fs";
 import { minify } from "terser";
 
 const DISABLE = false;
-writeFileSync("./build/.MANGLED", `${DISABLE}`);
 
 if (DISABLE) {
-	writeFileSync("./build/Binato.js", readFileSync("./build/index.js"));
+	writeFileSync("./build/Binato.min.js", readFileSync("./build/combined.js"));
 	console.warn("[WARNING] mangle.ts is disabled!");
 } else {
 	(async () => {
-		const mangled = await minify(readFileSync("./build/index.js").toString(), {
+		const mangled = await minify(readFileSync("./build/combined.js").toString(), {
 			mangle: true,
 			toplevel: true,
 		});