Update from bot

lib/bot.js

@@ -93,9 +93,10 @@ var Bot = function (config) {
 Bot.prototype._handleErrors = function () {
     var self = this;
     this.client.addListener('error', function (message) {
+        self.logger.error(message);
         var channel = message.args[1];
-        var error_message = mapPronouns(message.args[2]);
-        self.ircSpeak(channel, 'I don\'t feel so well because ' + error_message);
+        // var error_message = mapPronouns(message.args[2]);
+        self.ircSpeak(channel, 'I don\'t feel so well because ' + message);
     });
 
     // TODO: deal with slack-side errors
@@ -184,6 +185,9 @@ Bot.prototype.listen = function () {
         if (message.user === self.config.username) {
             return;
         }
+	if(message.user === self.config.blacklist) {
+            return;
+        }
         if(message.getChannelType() === 'DM') {
             return;
         }
@@ -217,6 +221,11 @@ Bot.prototype.listen = function () {
         if(self.config.users){
             from = self._usermap.nicks[from] || from
         }
+        if(self.config.blacklist){
+           if(from === self.config.blacklist){
+              return;
+           }
+        }
         to = self.channels.irc[to.toLowerCase()]
         if(to){
             self.slackSpeak(to, message, from)
@@ -232,6 +241,11 @@ Bot.prototype.listen = function () {
         if(self.config.users){
             from = self._usermap.nicks[from] || from
         }
+        if(self.config.blacklist){
+           if(from === self.config.blacklist){
+              return;
+           }
+        }
         to = self.channels.irc[to.toLowerCase()]
         if(to){
             self.slackSpeak(to, message, from)
@@ -249,7 +263,7 @@ Bot.prototype.ircSpeak = function (channel, message, username) {
     var self = this
 
     // insert a zero-width non-joiner character to prevent name-highlighting on IRC
-    if(!self.config.highlight) {
+    if(username && !self.config.highlight) {
         username = username.replace(/^(.)/, '$1\u200C')
     }
     username = "<" + username + "> "

package.json

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "underscore": "^1.7.0",
-    "irc": "~0.3.6",
+    "irc": "~0.5",
     "slack-client": "~1.3.1",
     "log": "~1.4.0",
     "html-entities": "~1.1.2"