From c28047efc191c1bcd0808aa3a1a2b6585b3c1c64 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Wed, 9 Jan 2013 05:53:45 +0000
Subject: [PATCH] Activity indicator [#111]

---
 modules/users/users.js |  1 -
 modules/users/web.js   | 30 ++++++++++++++++++++----------
 views/users/users.jade |  5 ++++-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/modules/users/users.js b/modules/users/users.js
index d08c91f..6037f2a 100644
--- a/modules/users/users.js
+++ b/modules/users/users.js
@@ -38,7 +38,6 @@ var users = function(dbot) {
         var knownUsers = getServerUsers(event.server);
         if(!knownUsers.channelUsers.hasOwnProperty(event.channel.name)) {
             knownUsers.channelUsers[event.channel.name] = [];
-            event.reply('creating new chanusers')
         }
         var channelUsers = knownUsers.channelUsers[event.channel.name];
 
diff --git a/modules/users/web.js b/modules/users/web.js
index ff7754b..6c4f516 100644
--- a/modules/users/web.js
+++ b/modules/users/web.js
@@ -1,4 +1,6 @@
 var pages = function(dbot) {
+    var connections = dbot.instance.connections;
+
     return {
         '/connections': function(req, res) {
             var connections = Object.keys(dbot.instance.connections);
@@ -23,23 +25,31 @@ var pages = function(dbot) {
             if(connections.hasOwnProperty(connection) && 
                 connections[connection].channels.hasOwnProperty(channel)) {
 
-                var nicks = dbot.db.knownUsers[connection].channelUsers[channel];
-                var channelUsers = {};
-                for(var i=0;i<nicks.length;i++) {
-                    channelUsers[nicks[i]] = { 'name': nicks[i], 'online': false }; 
-                    console.log(nicks[i]);
+                var channelUsers = dbot.db.knownUsers[connection].channelUsers[channel];
+                var usersData = {};
+                for(var i=0;i<channelUsers.length;i++) {
+                    usersData[channelUsers[i]] = { 
+                        'name': channelUsers[i], 
+                        'online': false, 
+                        'active': false 
+                    }; 
                 }
 
-                var channelOnline = dbot.instance.connections[connection].channels[channel].nicks;
-                channelOnline.each(function(nick) {
+                var onlineNicks = connections[connection].channels[channel].nicks;
+                onlineNicks.each(function(nick) {
                     var nick = dbot.api.users.resolveUser(connection, nick); 
-                    if(channelUsers.hasOwnProperty(nick)) {
-                        channelUsers[nick].online = true;
+                    if(onlineNicks.hasOwnProperty(nick)) {
+                        usersData[nick].online = true;
                     }
+                    /*usersData[nick].active = dbot.api.stats.isActive({
+                        'server': connection,
+                        'user': nick,
+                        'channel': channel
+                    });*/
                 }.bind(this));
 
                 res.render('users', { 'name': dbot.config.name, 'connection': connection,
-                    'channel': channel, 'nicks': channelUsers });
+                    'channel': channel, 'nicks': usersData });
             } else {
                 res.render_core('error', { 'name': dbot.config.name, 'message': 'No such connection or channel.' });
             }
diff --git a/views/users/users.jade b/views/users/users.jade
index e8f5ca1..67b005e 100644
--- a/views/users/users.jade
+++ b/views/users/users.jade
@@ -9,6 +9,9 @@ block content
         if nicks.hasOwnProperty(nick.name)
           a(href='/user/'+connection+'/'+channel.substr(1,channel.length)+'/'+nick)
             if nick.online
-              li.quotes #{nick.name} (Online) 
+              if nick.active
+                li.quotes #{nick.name} (Online, Active) 
+              else
+                li.quotes #{nick.name} (Online, Inactive)
             else
               li.quotes #{nick.name} (Offline)