Fix Matchmaker hotpatching

Matchmaker is now globally accessible under Ladders, rather than
needing to be manually required.

This fixes a crash when hotpatching certain things.

Author: Zarel

chat-commands.js

@@ -20,8 +20,6 @@
 const crypto = require('crypto');
 const FS = require('./fs');
 
-const Matchmaker = require('./ladders-matchmaker').matchmaker;
-
 const MAX_REASON_LENGTH = 300;
 const MUTE_LENGTH = 7 * 60 * 1000;
 const HOURMUTE_LENGTH = 60 * 60 * 1000;
@@ -2112,7 +2110,7 @@ exports.commands = {
 
 		let entry = targetUser.name + " was forced to choose a new name by " + user.name + (reason ? ": " + reason : "");
 		this.privateModCommand("(" + entry + ")");
-		Matchmaker.cancelSearch(targetUser);
+		Ladders.matchmaker.cancelSearch(targetUser);
 		targetUser.resetName(true);
 		targetUser.send("|nametaken||" + user.name + " considers your name inappropriate" + (reason ? ": " + reason : "."));
 		return true;
@@ -2142,7 +2140,7 @@ exports.commands = {
 		}
 
 		this.globalModlog("NAMELOCK", targetUser, ` by ${user.name}${reasonText}`);
-		Matchmaker.cancelSearch(targetUser);
+		Ladders.matchmaker.cancelSearch(targetUser);
 		Punishments.namelock(targetUser, null, null, reason);
 		targetUser.popup(`|modal|${user.name} has locked your name and you can't change names anymore${reasonText}`);
 		return true;
@@ -3301,9 +3299,9 @@ exports.commands = {
 					return false;
 				}
 			}
-			Matchmaker.searchBattle(user, target);
+			Ladders.matchmaker.searchBattle(user, target);
 		} else {
-			Matchmaker.cancelSearch(user, target);
+			Ladders.matchmaker.cancelSearch(user, target);
 		}
 	},
 

ladders-remote.js

@@ -15,6 +15,7 @@
 'use strict';
 
 let Ladders = module.exports = getLadder;
+Object.assign(Ladders, require('./ladders-matchmaker'));
 
 Ladders.get = Ladders;
 Ladders.formatsListPrefix = '';

ladders.js

@@ -18,6 +18,7 @@
 const FS = require('./fs');
 
 let Ladders = module.exports = getLadder;
+Object.assign(Ladders, require('./ladders-matchmaker'));
 
 Ladders.get = Ladders;
 

rooms.js

@@ -18,7 +18,6 @@ const REPORT_USER_STATS_INTERVAL = 10 * 60 * 1000;
 const CRASH_REPORT_THROTTLE = 60 * 60 * 1000;
 
 const FS = require('./fs');
-const Matchmaker = require('./ladders-matchmaker').matchmaker;
 
 let Rooms = module.exports = getRoom;
 
@@ -1455,8 +1454,8 @@ Rooms.createBattle = function (format, options) {
 	if (p1 === p2) throw new Error(`Players can't battle themselves`);
 	if (!p1) throw new Error(`p1 required`);
 	if (!p2) throw new Error(`p2 required`);
-	Matchmaker.cancelSearch(p1);
-	Matchmaker.cancelSearch(p2);
+	Ladders.matchmaker.cancelSearch(p1);
+	Ladders.matchmaker.cancelSearch(p2);
 
 	if (Rooms.global.lockdown === true) {
 		p1.popup("The server is restarting. Battles will be available again in a few minutes.");

test/application/rooms.js

@@ -2,7 +2,6 @@
 
 const assert = require('assert');
 
-const {matchmaker, Matchmaker} = require('../../ladders-matchmaker');
 const {User} = require('../../dev-tools/users-utils');
 
 describe('Rooms features', function () {
@@ -27,11 +26,6 @@ describe('Rooms features', function () {
 		const packedTeam = 'Weavile||lifeorb||swordsdance,knockoff,iceshard,iciclecrash|Jolly|,252,,,4,252|||||';
 
 		let room;
-		before(function () {
-			Rooms.global.ladderIpLog.end();
-			clearInterval(matchmaker.periodicMatchInterval);
-			matchmaker.periodicMatchInterval = null;
-		});
 		afterEach(function () {
 			Users.users.forEach(user => {
 				room.onLeave(user);
@@ -40,9 +34,6 @@ describe('Rooms features', function () {
 			});
 			if (room) room.destroy();
 		});
-		after(function () {
-			Object.assign(matchmaker, new Matchmaker());
-		});
 
 		it('should allow two users to join the battle', function () {
 			let p1 = new User();

users.js

@@ -34,8 +34,6 @@ const PERMALOCK_CACHE_TIME = 30 * 24 * 60 * 60 * 1000;
 
 const FS = require('./fs');
 
-const Matchmaker = require('./ladders-matchmaker').matchmaker;
-
 let Users = module.exports = getUser;
 
 /*********************************************************
@@ -1343,7 +1341,7 @@ class User {
 		}));
 	}
 	cancelSearch(format) {
-		return Matchmaker.cancelSearch(this, format);
+		return Ladders.matchmaker.cancelSearch(this, format);
 	}
 	makeChallenge(user, format, team/*, isPrivate*/) {
 		user = getUser(user);