utils: remove isNull

AlcaDesign · AlcaDesign · commit 76edfc85faf5 · 2021-03-11T23:39:55.000-06:00
diff --git a/lib/client.js b/lib/client.js
@@ -91,7 +91,7 @@ for(var methodName in commands) {
 
 // Handle parsed chat server message..
 client.prototype.handleMessage = function handleMessage(message) {
-	if(_.isNull(message)) {
+	if(!message) {
 		return;
 	}
 
@@ -120,7 +120,7 @@ client.prototype.handleMessage = function handleMessage(message) {
 	}
 
 	// Messages with no prefix..
-	if(_.isNull(message.prefix)) {
+	if(message.prefix === null) {
 		switch(message.command) {
 			// Received PING from server..
 			case "PING":
@@ -177,7 +177,7 @@ client.prototype.handleMessage = function handleMessage(message) {
 					}
 					this.latency = new Date();
 					this.pingTimeout = setTimeout(() => {
-						if(!_.isNull(this.ws)) {
+						if(this.ws !== null) {
 							this.wasCloseCalled = false;
 							this.log.error("Ping timeout.");
 							this.ws.close();
@@ -780,7 +780,7 @@ client.prototype.handleMessage = function handleMessage(message) {
 					// Duration returns null if it's a ban, otherwise it's a timeout..
 					var duration = _.get(message.tags["ban-duration"], null);
 
-					if(_.isNull(duration)) {
+					if(duration === null) {
 						this.log.info(`[${channel}] ${msg} has been banned.`);
 						this.emit("ban", channel, msg, null, message.tags);
 					}
@@ -1127,7 +1127,7 @@ client.prototype._openConnection = function _openConnection() {
 // Called when the WebSocket connection's readyState changes to OPEN.
 // Indicates that the connection is ready to send and receive data..
 client.prototype._onOpen = function _onOpen() {
-	if(_.isNull(this.ws) || this.ws.readyState !== 1) {
+	if(!this._isConnected()) {
 		return;
 	}
 
@@ -1195,7 +1195,7 @@ client.prototype._onError = function _onError() {
 	clearInterval(this.pingLoop);
 	clearTimeout(this.pingTimeout);
 
-	this.reason = !_.isNull(this.ws) ? "Unable to connect." : "Connection closed.";
+	this.reason = this.ws === null ? "Connection closed." : "Unable to connect.";
 
 	this.emits(["_promiseConnect", "disconnected"], [[this.reason]]);
 
@@ -1270,7 +1270,7 @@ client.prototype._sendCommand = function _sendCommand(delay, channel, command, f
 	// Race promise against delay..
 	return new Promise((resolve, reject) => {
 		// Make sure the socket is opened..
-		if(_.isNull(this.ws) || this.ws.readyState !== 1) {
+		if(!this._isConnected()) {
 			// Disconnected from server..
 			return reject("Not connected to server.");
 		}
@@ -1279,7 +1279,7 @@ client.prototype._sendCommand = function _sendCommand(delay, channel, command, f
 		}
 
 		// Executing a command on a channel..
-		if(!_.isNull(channel)) {
+		if(channel !== null) {
 			var chan = _.channel(channel);
 			this.log.info(`[${chan}] Executing command: ${command}`);
 			this.ws.send(`PRIVMSG ${chan} :${command}`);
@@ -1304,7 +1304,7 @@ client.prototype._sendMessage = function _sendMessage(delay, channel, message, f
 	// Promise a result..
 	return new Promise((resolve, reject) => {
 		// Make sure the socket is opened and not logged in as a justinfan user..
-		if(_.isNull(this.ws) || this.ws.readyState !== 1) {
+		if(!this._isConnected()) {
 			return reject("Not connected to server.");
 		}
 		else if(_.isJustinfan(this.getUsername())) {
@@ -1331,7 +1331,7 @@ client.prototype._sendMessage = function _sendMessage(delay, channel, message, f
 		Object.keys(this.emotesets).forEach(id =>
 			this.emotesets[id].forEach(emote => {
 				var emoteFunc = _.isRegex(emote.code) ? parse.emoteRegex : parse.emoteString;
-				return emoteFunc(message, emote.code, emote.id, emotes)
+				return emoteFunc(message, emote.code, emote.id, emotes);
 			})
 		);
 
@@ -1341,7 +1341,7 @@ client.prototype._sendMessage = function _sendMessage(delay, channel, message, f
 			parse.emotes({ emotes: parse.transformEmotes(emotes) || null })
 		);
 
-		var messagesLogLevel = _.get(this.opts.options.messagesLogLevel, "info")
+		var messagesLogLevel = _.get(this.opts.options.messagesLogLevel, "info");
 
 		// Message is an action (/me <message>)..
 		var actionMessage = _.actionMessage(message);
@@ -1418,20 +1418,19 @@ client.prototype.isMod = function isMod(channel, username) {
 
 // Get readyState..
 client.prototype.readyState = function readyState() {
-	if(_.isNull(this.ws)) { return "CLOSED"; }
+	if(this.ws === null) { return "CLOSED"; }
 	return ["CONNECTING", "OPEN", "CLOSING", "CLOSED"][this.ws.readyState];
 };
 
 // Determine if the client has a WebSocket and it's open..
 client.prototype._isConnected = function _isConnected() {
-	
 	return this.ws !== null && this.ws.readyState === 1;
 }
 
 // Disconnect from server..
 client.prototype.disconnect = function disconnect() {
 	return new Promise((resolve, reject) => {
-		if(!_.isNull(this.ws) && this.ws.readyState !== 3) {
+		if(this.ws !== null && this.ws.readyState !== 3) {
 			this.wasCloseCalled = true;
 			this.log.info("Disconnecting from server..");
 			this.ws.close();
diff --git a/lib/commands.js b/lib/commands.js
@@ -426,7 +426,7 @@ module.exports = {
 		channel = _.channel(channel);
 		username = _.username(username);
 
-		if(!_.isNull(seconds) && !_.isInteger(seconds)) {
+		if(seconds !== null && !_.isInteger(seconds)) {
 			reason = seconds;
 			seconds = 300;
 		}
diff --git a/lib/utils.js b/lib/utils.js
@@ -20,9 +20,6 @@ var self = module.exports = {
 	// Username is a justinfan username..
 	isJustinfan: username => justinFanRegex.test(username),
 
-	// Value is null..
-	isNull: obj => obj === null,
-
 	// Value is a regex..
 	isRegex: str => /[\|\\\^\$\*\+\?\:\#]/.test(str),
 

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ module.exports = {`
`426`	`426`	`channel = _.channel(channel);`
`427`	`427`	`username = _.username(username);`
`428`	`428`
`429`		`- if(!_.isNull(seconds) && !_.isInteger(seconds)) {`
	`429`	`+ if(seconds !== null && !_.isInteger(seconds)) {`
`430`	`430`	`reason = seconds;`
`431`	`431`	`seconds = 300;`
`432`	`432`	`}`