Switch to using Array.isArray due to util.isArray being deprecated. F…

…ix null/undefined messages crashing sendChat
plugCubed · Aug 25, 2015 · 83a2889 · 83a2889
1 parent 3a26d81
commit 83a2889
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/bufferObject.js b/lib/bufferObject.js
@@ -1,7 +1,5 @@
 'use strict';
 
-var util = require('util');
-
 function BufferObject(data, getUpdate, maxAge) {
     if (typeof getUpdate !== 'function') {
         throw new Error('BufferObject requires an update function');
@@ -43,7 +41,7 @@ function BufferObject(data, getUpdate, maxAge) {
             // Be sure the data is loaded
             this.get();
 
-            if (util.isArray(this.data)) {
+            if (Array.isArray(this.data)) {
                 this.data.push(data);
             }
         },
@@ -62,7 +60,7 @@ function BufferObject(data, getUpdate, maxAge) {
             // Be sure the data is loaded
             this.get();
 
-            if (util.isArray(this.data) && index < this.data.length) {
+            if (Array.isArray(this.data) && index < this.data.length) {
                 this.data.splice(index, 1);
             }
         }

diff --git a/lib/client.js b/lib/client.js
@@ -696,7 +696,7 @@ function receivedChatMessage(messageData) {
         messageData.isFrom = function(ids, success, failure) {
             if (typeof ids === 'string')
                 ids = [ids];
-            if (ids == null || !util.isArray(ids)) {
+            if (ids == null || !Array.isArray(ids)) {
                 if (typeof failure === 'function') {
                     failure();
                 }
@@ -1424,6 +1424,9 @@ PlugAPI.prototype.leaveBooth = function(callback) {
  * @param {int} [timeout] If set, auto deletes the message after x seconds. (Needs to have modChat permission)
  */
 PlugAPI.prototype.sendChat = function(msg, timeout) {
+    if (msg == null) {
+        return;
+    }
     if (msg.length > 235 && this.multiLine) {
         var lines = msg.replace(/.{235}\S*\s+/g, '$&¤').split(/\s+¤/);
         for (var i = 0; i < lines.length; i++) {
@@ -1666,7 +1669,7 @@ PlugAPI.prototype.getLoggerSettings = function() {
 PlugAPI.prototype.setLogger = function(newLogger) {
     var requiredMethods = ['info', 'warn', 'warning', 'error'];
 
-    if (newLogger && typeof newLogger === 'object' && !util.isArray(newLogger)) {
+    if (newLogger && typeof newLogger === 'object' && !Array.isArray(newLogger)) {
         for (var i in requiredMethods) {
             if (!requiredMethods.hasOwnProperty(i)) continue;
             if (typeof newLogger[requiredMethods[i]] !== 'function')
@@ -2000,7 +2003,7 @@ PlugAPI.prototype.getPlaylistMedias = function(pid, callback) {
  * @returns {Boolean} If the REST request got queued
  */
 PlugAPI.prototype.playlistMoveMedia = function(pid, mid, beforeMid, callback) {
-    if (!room.getRoomMeta().slug || !pid || !mid || (!util.isArray(mid) || (util.isArray(mid) && mid.length > 0)) || !beforeMid) return false;
+    if (!room.getRoomMeta().slug || !pid || !mid || (!Array.isArray(mid) || (Array.isArray(mid) && mid.length > 0)) || !beforeMid) return false;
 
     this.getPlaylist(pid, function(playlist) {
         if (playlist == null) {
@@ -2010,7 +2013,7 @@ PlugAPI.prototype.playlistMoveMedia = function(pid, mid, beforeMid, callback) {
             return;
         }
 
-        if (!util.isArray(mid))
+        if (!Array.isArray(mid))
             mid = [mid];
 
         queueREST('PUT', endpoints.PLAYLIST + '/' + pid + '/media/move', {