client: pass null for default delay

Author: AlcaDesign

lib/client.js

@@ -1318,7 +1318,10 @@ client.prototype._sendCommand = function _sendCommand(delay, channel, command, f
 			// Disconnected from server..
 			return reject('Not connected to server.');
 		}
-		else if(typeof delay === 'number') {
+		else if(delay === null || typeof delay === 'number') {
+			if(delay === null) {
+				delay = this._getPromiseDelay();
+			}
 			_.promiseDelay(delay).then(() => reject('No response from Twitch.'));
 		}
 
@@ -1328,8 +1331,6 @@ client.prototype._sendCommand = function _sendCommand(delay, channel, command, f
 			this.log.info(`[${chan}] Executing command: ${command}`);
 			this.ws.send(`PRIVMSG ${chan} :${command}`);
 		}
-
-
 		// Executing a raw command..
 		else {
 			this.log.info(`Executing command: ${command}`);

lib/commands.js

@@ -5,7 +5,7 @@ function followersonly(channel, minutes) {
 	channel = _.channel(channel);
 	minutes = _.get(minutes, 30);
 	// Send the command to the server and race the Promise against a delay..
-	return this._sendCommand(this._getPromiseDelay(), channel, `/followers ${minutes}`, (resolve, reject) => {
+	return this._sendCommand(null, channel, `/followers ${minutes}`, (resolve, reject) => {
 		// Received _promiseFollowers event, resolve or reject..
 		this.once('_promiseFollowers', err => {
 			if(!err) { resolve([ channel, ~~minutes ]); }
@@ -18,7 +18,7 @@ function followersonly(channel, minutes) {
 function followersonlyoff(channel) {
 	channel = _.channel(channel);
 	// Send the command to the server and race the Promise against a delay..
-	return this._sendCommand(this._getPromiseDelay(), channel, '/followersoff', (resolve, reject) => {
+	return this._sendCommand(null, channel, '/followersoff', (resolve, reject) => {
 		// Received _promiseFollowersoff event, resolve or reject..
 		this.once('_promiseFollowersoff', err => {
 			if(!err) { resolve([ channel ]); }
@@ -31,7 +31,7 @@ function followersonlyoff(channel) {
 function part(channel) {
 	channel = _.channel(channel);
 	// Send the command to the server and race the Promise against a delay..
-	return this._sendCommand(this._getPromiseDelay(), null, `PART ${channel}`, (resolve, reject) => {
+	return this._sendCommand(null, null, `PART ${channel}`, (resolve, reject) => {
 		// Received _promisePart event, resolve or reject..
 		this.once('_promisePart', err => {
 			if(!err) { resolve([ channel ]); }
@@ -44,7 +44,7 @@ function part(channel) {
 function r9kbeta(channel) {
 	channel = _.channel(channel);
 	// Send the command to the server and race the Promise against a delay..
-	return this._sendCommand(this._getPromiseDelay(), channel, '/r9kbeta', (resolve, reject) => {
+	return this._sendCommand(null, channel, '/r9kbeta', (resolve, reject) => {
 		// Received _promiseR9kbeta event, resolve or reject..
 		this.once('_promiseR9kbeta', err => {
 			if(!err) { resolve([ channel ]); }
@@ -57,7 +57,7 @@ function r9kbeta(channel) {
 function r9kbetaoff(channel) {
 	channel = _.channel(channel);
 	// Send the command to the server and race the Promise against a delay..
-	return this._sendCommand(this._getPromiseDelay(), channel, '/r9kbetaoff', (resolve, reject) => {
+	return this._sendCommand(null, channel, '/r9kbetaoff', (resolve, reject) => {
 		// Received _promiseR9kbetaoff event, resolve or reject..
 		this.once('_promiseR9kbetaoff', err => {
 			if(!err) { resolve([ channel ]); }
@@ -71,7 +71,7 @@ function slow(channel, seconds) {
 	channel = _.channel(channel);
 	seconds = _.get(seconds, 300);
 	// Send the command to the server and race the Promise against a delay..
-	return this._sendCommand(this._getPromiseDelay(), channel, `/slow ${seconds}`, (resolve, reject) => {
+	return this._sendCommand(null, channel, `/slow ${seconds}`, (resolve, reject) => {
 		// Received _promiseSlow event, resolve or reject..
 		this.once('_promiseSlow', err => {
 			if(!err) { resolve([ channel, ~~seconds ]); }
@@ -84,7 +84,7 @@ function slow(channel, seconds) {
 function slowoff(channel) {
 	channel = _.channel(channel);
 	// Send the command to the server and race the Promise against a delay..
-	return this._sendCommand(this._getPromiseDelay(), channel, '/slowoff', (resolve, reject) => {
+	return this._sendCommand(null, channel, '/slowoff', (resolve, reject) => {
 		// Received _promiseSlowoff event, resolve or reject..
 		this.once('_promiseSlowoff', err => {
 			if(!err) { resolve([ channel ]); }
@@ -112,7 +112,7 @@ module.exports = {
 		username = _.username(username);
 		reason = _.get(reason, '');
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/ban ${username} ${reason}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/ban ${username} ${reason}`, (resolve, reject) => {
 			// Received _promiseBan event, resolve or reject..
 			this.once('_promiseBan', err => {
 				if(!err) { resolve([ channel, username, reason ]); }
@@ -125,7 +125,7 @@ module.exports = {
 	clear(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, '/clear', (resolve, reject) => {
+		return this._sendCommand(null, channel, '/clear', (resolve, reject) => {
 			// Received _promiseClear event, resolve or reject..
 			this.once('_promiseClear', err => {
 				if(!err) { resolve([ channel ]); }
@@ -138,7 +138,7 @@ module.exports = {
 	color(channel, newColor) {
 		newColor = _.get(newColor, channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), '#tmijs', `/color ${newColor}`, (resolve, reject) => {
+		return this._sendCommand(null, '#tmijs', `/color ${newColor}`, (resolve, reject) => {
 			// Received _promiseColor event, resolve or reject..
 			this.once('_promiseColor', err => {
 				if(!err) { resolve([ newColor ]); }
@@ -152,7 +152,7 @@ module.exports = {
 		channel = _.channel(channel);
 		seconds = _.get(seconds, 30);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/commercial ${seconds}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/commercial ${seconds}`, (resolve, reject) => {
 			// Received _promiseCommercial event, resolve or reject..
 			this.once('_promiseCommercial', err => {
 				if(!err) { resolve([ channel, ~~seconds ]); }
@@ -165,7 +165,7 @@ module.exports = {
 	deletemessage(channel, messageUUID) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/delete ${messageUUID}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/delete ${messageUUID}`, (resolve, reject) => {
 			// Received _promiseDeletemessage event, resolve or reject..
 			this.once('_promiseDeletemessage', err => {
 				if(!err) { resolve([ channel ]); }
@@ -178,7 +178,7 @@ module.exports = {
 	emoteonly(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, '/emoteonly', (resolve, reject) => {
+		return this._sendCommand(null, channel, '/emoteonly', (resolve, reject) => {
 			// Received _promiseEmoteonly event, resolve or reject..
 			this.once('_promiseEmoteonly', err => {
 				if(!err) { resolve([ channel ]); }
@@ -191,7 +191,7 @@ module.exports = {
 	emoteonlyoff(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, '/emoteonlyoff', (resolve, reject) => {
+		return this._sendCommand(null, channel, '/emoteonlyoff', (resolve, reject) => {
 			// Received _promiseEmoteonlyoff event, resolve or reject..
 			this.once('_promiseEmoteonlyoff', err => {
 				if(!err) { resolve([ channel ]); }
@@ -201,13 +201,13 @@ module.exports = {
 	},
 
 	// Enable followers-only mode on a channel..
-	followersonly: followersonly,
+	followersonly,
 
 	// Alias for followersonly()..
 	followersmode: followersonly,
 
 	// Disable followers-only mode on a channel..
-	followersonlyoff: followersonlyoff,
+	followersonlyoff,
 
 	// Alias for followersonlyoff()..
 	followersmodeoff: followersonlyoff,
@@ -230,7 +230,7 @@ module.exports = {
 	join(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server ..
-		return this._sendCommand(null, null, `JOIN ${channel}`, (resolve, reject) => {
+		return this._sendCommand(undefined, null, `JOIN ${channel}`, (resolve, reject) => {
 			const eventName = '_promiseJoin';
 			let hasFulfilled = false;
 			const listener = (err, joinedChannel) => {
@@ -258,7 +258,7 @@ module.exports = {
 		channel = _.channel(channel);
 		username = _.username(username);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/mod ${username}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/mod ${username}`, (resolve, reject) => {
 			// Received _promiseMod event, resolve or reject..
 			this.once('_promiseMod', err => {
 				if(!err) { resolve([ channel, username ]); }
@@ -271,7 +271,7 @@ module.exports = {
 	mods(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, '/mods', (resolve, reject) => {
+		return this._sendCommand(null, channel, '/mods', (resolve, reject) => {
 			// Received _promiseMods event, resolve or reject..
 			this.once('_promiseMods', (err, mods) => {
 				if(!err) {
@@ -288,15 +288,15 @@ module.exports = {
 	},
 
 	// Leave a channel..
-	part: part,
+	part,
 
 	// Alias for part()..
 	leave: part,
 
 	// Send a ping to the server..
 	ping() {
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), null, 'PING', (resolve, _reject) => {
+		return this._sendCommand(null, null, 'PING', (resolve, _reject) => {
 			// Update the internal ping timeout check interval..
 			this.latency = new Date();
 			this.pingTimeout = setTimeout(() => {
@@ -316,21 +316,21 @@ module.exports = {
 	},
 
 	// Enable R9KBeta mode on a channel..
-	r9kbeta: r9kbeta,
+	r9kbeta,
 
 	// Alias for r9kbeta()..
 	r9kmode: r9kbeta,
 
 	// Disable R9KBeta mode on a channel..
-	r9kbetaoff: r9kbetaoff,
+	r9kbetaoff,
 
 	// Alias for r9kbetaoff()..
 	r9kmodeoff: r9kbetaoff,
 
 	// Send a raw message to the server..
 	raw(message) {
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), null, message, (resolve, _reject) => {
+		return this._sendCommand(null, null, message, (resolve, _reject) => {
 			resolve([ message ]);
 		});
 	},
@@ -346,7 +346,7 @@ module.exports = {
 			}
 			else {
 				// Send the command to the server and race the Promise against a delay..
-				return this._sendCommand(this._getPromiseDelay(), channel, message, (resolve, _reject) => {
+				return this._sendCommand(null, channel, message, (resolve, _reject) => {
 					// At this time, there is no possible way to detect if a message has been sent has been eaten
 					// by the server, so we can only resolve the Promise.
 					resolve([ channel, message ]);
@@ -362,13 +362,13 @@ module.exports = {
 	},
 
 	// Enable slow mode on a channel..
-	slow: slow,
+	slow,
 
 	// Alias for slow()..
 	slowmode: slow,
 
 	// Disable slow mode on a channel..
-	slowoff: slowoff,
+	slowoff,
 
 	// Alias for slowoff()..
 	slowmodeoff: slowoff,
@@ -377,7 +377,7 @@ module.exports = {
 	subscribers(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, '/subscribers', (resolve, reject) => {
+		return this._sendCommand(null, channel, '/subscribers', (resolve, reject) => {
 			// Received _promiseSubscribers event, resolve or reject..
 			this.once('_promiseSubscribers', err => {
 				if(!err) { resolve([ channel ]); }
@@ -390,7 +390,7 @@ module.exports = {
 	subscribersoff(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, '/subscribersoff', (resolve, reject) => {
+		return this._sendCommand(null, channel, '/subscribersoff', (resolve, reject) => {
 			// Received _promiseSubscribersoff event, resolve or reject..
 			this.once('_promiseSubscribersoff', err => {
 				if(!err) { resolve([ channel ]); }
@@ -412,7 +412,7 @@ module.exports = {
 		seconds = _.get(seconds, 300);
 		reason = _.get(reason, '');
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/timeout ${username} ${seconds} ${reason}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/timeout ${username} ${seconds} ${reason}`, (resolve, reject) => {
 			// Received _promiseTimeout event, resolve or reject..
 			this.once('_promiseTimeout', err => {
 				if(!err) { resolve([ channel, username, ~~seconds, reason ]); }
@@ -426,7 +426,7 @@ module.exports = {
 		channel = _.channel(channel);
 		username = _.username(username);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/unban ${username}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/unban ${username}`, (resolve, reject) => {
 			// Received _promiseUnban event, resolve or reject..
 			this.once('_promiseUnban', err => {
 				if(!err) { resolve([ channel, username ]); }
@@ -453,7 +453,7 @@ module.exports = {
 		channel = _.channel(channel);
 		username = _.username(username);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/unmod ${username}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/unmod ${username}`, (resolve, reject) => {
 			// Received _promiseUnmod event, resolve or reject..
 			this.once('_promiseUnmod', err => {
 				if(!err) { resolve([ channel, username ]); }
@@ -467,7 +467,7 @@ module.exports = {
 		channel = _.channel(channel);
 		username = _.username(username);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/unvip ${username}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/unvip ${username}`, (resolve, reject) => {
 			// Received _promiseUnvip event, resolve or reject..
 			this.once('_promiseUnvip', err => {
 				if(!err) { resolve([ channel, username ]); }
@@ -481,7 +481,7 @@ module.exports = {
 		channel = _.channel(channel);
 		username = _.username(username);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, `/vip ${username}`, (resolve, reject) => {
+		return this._sendCommand(null, channel, `/vip ${username}`, (resolve, reject) => {
 			// Received _promiseVip event, resolve or reject..
 			this.once('_promiseVip', err => {
 				if(!err) { resolve([ channel, username ]); }
@@ -494,7 +494,7 @@ module.exports = {
 	vips(channel) {
 		channel = _.channel(channel);
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), channel, '/vips', (resolve, reject) => {
+		return this._sendCommand(null, channel, '/vips', (resolve, reject) => {
 			// Received _promiseVips event, resolve or reject..
 			this.once('_promiseVips', (err, vips) => {
 				if(!err) { resolve(vips); }
@@ -512,7 +512,7 @@ module.exports = {
 			return Promise.reject('Cannot send a whisper to the same account.');
 		}
 		// Send the command to the server and race the Promise against a delay..
-		return this._sendCommand(this._getPromiseDelay(), '#tmijs', `/w ${username} ${message}`, (_resolve, reject) => {
+		return this._sendCommand(null, '#tmijs', `/w ${username} ${message}`, (_resolve, reject) => {
 			this.once('_promiseWhisper', err => {
 				if (err) { reject(err); }
 			});