From b9926a154c8234e562a04ca1bc88061303066b55 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Sat, 4 Jan 2014 03:51:31 +0000
Subject: [PATCH] fix up the nick before action fix. this should be more
 efficient (plus it is prettier)

---
 jsbot                  |  2 +-
 modules/users/users.js | 24 +++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/jsbot b/jsbot
index d57af91..5a67080 160000
--- a/jsbot
+++ b/jsbot
@@ -1 +1 @@
-Subproject commit d57af91f9d623c66eedcaccc8c6f6632d5e36755
+Subproject commit 5a67080aedbf347252f0374fcfbae4992be80da2
diff --git a/modules/users/users.js b/modules/users/users.js
index e92e46a..a63e8e2 100644
--- a/modules/users/users.js
+++ b/modules/users/users.js
@@ -96,7 +96,6 @@ var users = function(dbot) {
 
     this.listener = function(event) {
         this.api.isKnownUser(event.server, event.newNick, function(isKnown) {
-            console.log(event.rUser);
             event.rUser.currentNick = event.newNick;
             dbot.api.event.emit('new_current_nick', [ event.rUser ]);
 
@@ -190,7 +189,7 @@ var users = function(dbot) {
                 }
             }.bind(this);
 
-            if(event.user && event.channel && _.include(['JOIN', 'MODE', 'PRIVMSG'], event.action)) {
+            if(event.user && event.channel && _.include(['JOIN', 'MODE', 'NICK', 'PRIVMSG'], event.action)) {
                 checkChannel(function(channel) {
                     event.rChannel = channel;
                     checkUser(function(user) {
@@ -202,24 +201,15 @@ var users = function(dbot) {
                             this.userCache[event.server][event.rUser.currentNick] = event.rUser.id;
                         }
 
-                        checkChannelUsers(function() {
+                        if(event.channel) {
+                            checkChannelUsers(function() {
+                                callback();
+                            });
+                        } else {
                             callback();
-                        });
+                        }
                     }.bind(this));
                 }.bind(this));
-            } else if(event.user) {
-                this.api.resolveUser(event.server, event.user, function(user) {
-                    if(user) event.rUser = user;
-
-                    if(event.channel) {
-                        this.api.resolveChannel(event.server, event.channel.name, function(channel) {
-                            if(channel) event.rChannel = channel;
-                            callback();
-                        });
-                    } else {
-                        callback();
-                    }
-                }.bind(this));
             } else {
                 callback();
             }