Merge branch 'master' of https://github.com/reality/depressionbot into gitstatus

.gitignore

@@ -1,5 +1,10 @@
 # Ignore the user config files
-./config.json
+config.json
-
-# Ignore the user database
 db.json
+
+# ignore npm
+node_modules/
+
+# ignore assets
+public/bootstrap/
+public/d3/

modules/project/config.json

@@ -1,4 +1,3 @@
 {
-    "quotecat":"depressionbot",
     "dependencies": ["web", "quotes", "github"]
 }

modules/project/pages.js

@@ -2,12 +2,15 @@ var exec = require('child_process').exec,
     request = require('request');
 
 var pages = function(dbot) {
-    var depression = dbot.db.quoteArrs[dbot.config.project.quotecat];
+    var quoteCat = dbot.db.quoteArrs[dbot.config.name],
+        rev, diff;
 
-    var rev;
+    exec("git rev-list --all | wc -l", function(a, b, c) {
-    exec("git rev-list --all | wc -l", function(a,b,c){rev = b});
+        rev = b
-    var diff;
+    });
-    exec("git log -1", function(a, b, c){diff = b});
+    exec("git log -1", function(a, b, c) {
+        diff = b
+    });
     
     /* TODO: merge back into github module */
     var milestones;
@@ -18,6 +21,11 @@ var pages = function(dbot) {
 
     return {
         '/project': function(req, res) {
+            var quote = dbot.config.name;
+            if(quoteCat) {
+                quote = quoteCat[Math.floor(Math.random()*quoteCat.length)];
+            }
+
             res.render('project', {
                 "name": dbot.config.name,
                 "intro": dbot.t("dbotintro", {
@@ -47,7 +55,7 @@ var pages = function(dbot) {
                 "openmilestone": dbot.t("openmilestone"),
                 "closedmilestone": dbot.t("closedmilestone"),
                 "development": dbot.t("development"),
-                "dquote": depression[Math.floor(Math.random()*depression.length)],
+                "dquote": quote,
                 "diff": diff,
                 "pagetitle": dbot.t("pagetitle", {
                     "botname": dbot.config.name

modules/project/project.js

@@ -1,14 +1,13 @@
 /**
- * Module Name: imgur
+ * Module Name: Project
- * Description: Various imgur functionality
+ * Description: Web page which shows git status and other various stats about
+ * the dbot.
  */
 
-var _ = require('underscore')._,
-    request = require('request');
-
 var project = function(dbot) {
-    // nothing to see here go away love zuzak
+    // Nothing to see here go away love zuzak
 }
+
 exports.fetch = function(dbot) {
     return new project(dbot);
 }

views/imgur/imgurr.jade

@@ -10,8 +10,10 @@ html(lang='en')
       function giveMessage(msg) {
         $('<li>'+msg+'</li>').prependTo('#history').hide().slideDown();
       }
+      var lock = false
       function getNewImage() {
         count += 1;
+        lock = true;
         $('#loading').fadeIn();
         $('#loading').text('Loading image ' + count + '...');
         document.title = 'random imgur (' + count + ')';
@@ -19,6 +21,7 @@ html(lang='en')
         $('#image').load(function(){});
         $.get("/api/imgur/getRandomImage", function(d) {
           $('#image').attr('src', d.data[0]);
+          lock = false;
           $('#details').text("Fetching info...");
           giveMessage('<a href="' + d.data[0] + '">' + d.data[0] + '</a>');
           $.get("/api/imgur/getImageInfoString", { 'slug': d.data[1] }, function(info) {
@@ -37,7 +40,13 @@ html(lang='en')
         switch(e.which){
           case 13: // enter
           case 32: // space
+            if (lock) {
+              $('#loading').text(function(index, text){
+                return text.replace(/\.(?=[^.]*$)/, "!");
+              });
+            } else {
               getNewImage();
+            }
             break;
           case 83: // s
             $('body').toggleClass('crop');