Merge

4 files changed, 172 insertions, 48 deletions

diff --git a/static/js/home.js b/static/js/home.js
index 59d4c3d..60b5d07 100755
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -5,7 +5,6 @@ function ifEnter(fn) {
 }
 
 function initLoginForm() {
-
   var nick = "#nickInput", nickFiller = "username"
   var pass = "#passwordInput", passLabel = "#passwordInputLabel", passFiller = "password"
   var submit = "#signin-submit"
@@ -152,6 +151,8 @@ function login() {
 
     var onSuccess = function(json) {
         location.href = location.href;
+	 if (typeof pageTracker !== 'undefined') {
+	   pageTracker._setCustomVar(1, "logged-in", nick, 
     };
 
     var onError = function(resp, textStatus, errorThrown) {
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 06c859d..566bd10 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -1,24 +1,47 @@
 var cache = {}
 var pendingMessages = {}
 
+var MaxImagePosts = 40
+
 function escapeHtml(txt) {
-    if (!txt) { return ""; }
-    else { return $("<span>").text(txt).html(); }
+  if (!txt) { return ""; }
+  else { return $("<span>").text(txt).html(); }
 }
 
 function linkify(text) {
-    var URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
-    return text.replace(URLRegex, linkReplace);
+  LastMsgContainsImage = false
+  var URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
+  return text.replace(URLRegex, linkReplace);
 }
 
-function linkReplace(match){
-    var PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i;
-    var matchWithoutParams = match.replace(/\?.*$/i, "")
-    if (PicRegex.test(matchWithoutParams)){
-        return "<a target='_blank' href='" + match + "'><img src='" + match + "'></a>"
-    } else {
-        return "<a target='_blank' href='" + match + "'>" + match + "</a>"
-    }
+// durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/
+var LastMsgContainsImage = false
+function linkReplace(url){
+  var PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i;
+  var urlWithoutParams = url.replace(/\?.*$/i, "");
+
+  linkUrl = url.indexOf('http://') == 0 ? url : 'http://' + url;
+
+  if (PicRegex.test(url)){
+    LastMsgContainsImage = true
+    return "<a target='_blank' href='" + linkUrl + "'><img src='" + linkUrl + "'></a>"
+  } else {
+    return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>"
+  }
+}
+
+var ImageMsgCount = 0
+function removeOldMessages(){
+  // don't count posts that are all text
+  if (LastMsgContainsImage) ImageMsgCount += 1;
+  while (ImageMsgCount > MaxImagePosts) {
+    var imgMsg = $(".contains-image:first")
+    if (imgMsg.length) {
+      imgMsg.prevAll().remove() // remove all text messages before the image message
+      imgMsg.remove()
+    } else break;
+    ImageMsgCount -= 1;
+  }
 }
 
 function buildMsgContent(content) {
@@ -26,16 +49,19 @@ function buildMsgContent(content) {
 }
 
 function buildMessageDiv(msg, isLoading) {
-    var nick = escapeHtml(msg.nick);
-    var msgId = !isLoading ? 'id="message-' + msg.msg_id + '"' : '';
-    var loadingClass = isLoading ? ' loading' : '';
-    return '<div class="msgDiv ' + loadingClass + '" ' + msgId  + '>'
-        + '<b><a href="/u/' + nick + ' ">' + nick + '</a>: </b>'
-        + buildMsgContent(msg.content)
-        + '</div>';
+  removeOldMessages()
+  var nick = escapeHtml(msg.nick);
+  var msgId = !isLoading ? 'id="message-' + msg.msg_id + '"' : '';
+  var loadingClass = isLoading ? ' loading' : '';
+  var containsImageClass = LastMsgContainsImage ? ' contains-image' : '';
+  return '<div class="msgDiv ' + loadingClass + containsImageClass + '" ' + msgId  + '>'
+    + '<b><a href="/u/' + nick + ' ">' + nick + '</a>: </b>'
+    + buildMsgContent(msg.content)
+    + '</div>';
 }
 
 function buildUserDiv(user) {
+    console.warn(user);
     if (user.avatar) {
         return '<div class="username">'
             + '<a href="/u/' + escapeHtml(user.nick) + '" target="_blank">'
@@ -80,6 +106,9 @@ function submitMessage() {
     var div = addNewMessage(msg, true);
 
     var onSuccess = function(json) {
+	 if (typeof pageTracker !== 'undefined') {
+          pageTracker._trackEvent('Message', 'Submit', typeof Room !== 'undefined' ? Room : 'UnknownRoom');
+        }
         div.attr('id', 'message-' + json)
             .removeClass('loading').addClass('loaded');
     };
@@ -106,30 +135,12 @@ function ifEnter(fn) {
     };
 }
 
-/*
-function isScrolledToBottom(div) {
-    return Math.abs(div.scrollTop - (div.scrollHeight - div.offsetHeight)) <= 3;
-}
-
-function scrollToBottom(div) {
-    div.scrollTop = div.scrollHeight;
-}
-
-// Give images time to start loading before scrolling.
-// Needed until server knows size of images.
-function delayedScrollToBottom(delay) {
-    setTimeout(scrollToBottom, delay, $('#messageList')[0]);
-}
-*/
-
 function addNewMessages(msgs) {
-    //var wasScrolledToBottom = isScrolledToBottom($('#messageList')[0]);
     var msgStr = $.map(msgs, buildMessageDiv).join('');
     $('#messageList').append(msgStr);
 }
 
 function addNewMessage(msg, isLoading) {
-    //var wasScrolledToBottom = isScrolledToBottom($('#messageList')[0]);
     var msgStr = buildMessageDiv(msg, isLoading);
     var div = $(msgStr).appendTo('#messageList');
     return div;
@@ -139,6 +150,14 @@ function setUserList(users) {
     $("#userList").html($.map(users, buildUserDiv).join(''));
 }
 
+function flattenUserJson(users) {
+    var s = "";
+    $.map(users.sort(), function(user) {
+        s += user.nick + user.avatar;
+    });
+    return s;
+}
+
 function updateUI(msgs, users) {
     if (window['growlize'] && msgs && msgs.length > 0) {
         $.map(msgs, buildGrowlDataAndPopDatShit)
@@ -146,7 +165,8 @@ function updateUI(msgs, users) {
         addNewMessages(msgs);
     }
     if (users !== null) {
-        var flattened = users.sort().join(",")
+        var flattened = flattenUserJson(users);
+        console.log(flattened);
         if (!('userlist' in cache) || flattened != cache.userlist) {
             $("#userList").html($.map(users, buildUserDiv).join(''));
         }
@@ -217,11 +237,17 @@ function initChat() {
     // see /static/webcam/webcam.js
     if ('webcam' in window) webcam.init()
     
-
     setTimeout(refresh, 1000);
 }
 
 function initProfile() {
+
+    jQuery(".linkify").each(function() {
+        var text = jQuery(this).text();
+        jQuery(this).html(linkify(text));
+    });
+
+
     $('.logged-dump .content').each(function() {
         var t = $(this);
         t.html(buildMsgContent(t.text()));
@@ -277,11 +303,24 @@ function initLog() {
 function favoriteImage() {};
 
 function setupUpload(elementId, roomKey) {
+    var onSubmit = function(file, ext) {
+	if (!(ext && /^(jpg|png|jpeg|gif)$/i.test(ext))) {
+		alert('Error: invalid file extension ' + ext);
+		return false;
+	}
+    };
+    var onComplete = function(file, response) {
+    	 if (typeof pageTracker !== 'undefined') {
+          pageTracker._trackEvent('Message', 'Upload', typeof Room !== 'undefined' ? Room : 'UnknownRoom');
+        }
+    }
     new AjaxUpload(elementId, {
         action: '/upload/message',
         autoSubmit: true,
         name: 'image',
-        data: { room: roomKey }
+        data: { room: roomKey },
+	 onSubmit: onSubmit,
+        onComplete: onComplete
     });
 }
 
@@ -329,7 +368,7 @@ function isScrolledToBottom(){
 }
 
 function scrollIfPossible(){
-  if (lastScriptedScrolledPosition == messageList.scrollTop || isScrolledToBottom())
+  if (lastScriptedScrolledPosition <= messageList.scrollTop || isScrolledToBottom())
     scrollToEnd()
 }
 
diff --git a/static/js/register.js b/static/js/register.js
index 682efcb..1739ed6 100755
--- a/static/js/register.js
+++ b/static/js/register.js
@@ -13,20 +13,25 @@ function submitRegistration() {
     var email = $('#emailInput').val();
     var password = $('#passwordInput').val() || "";
     var code = $('#codeInput').val();
-    if ($.inArray(code.toUpperCase(), ValidCodes) == -1) {
-	alert("Bad registration code! Try again dude...." );
-	return;
-    }
-    if (nick.length < 3) {
-	alert("Nicks must be at least 3 characters long.");
+
+    if (nick.length < 3 || nick.length > 12) {
+	alert("Nicks must be between 3 and 12 characters long.");
 	return;
     } else if (password.length < 5) {
 	alert("Password must be at least 5 characters long.");
 	return;
     }
 
+    if ($.inArray(code.toUpperCase(), ValidCodes) == -1) {
+	alert("Bad registration code! Try again dude...." );
+	return;
+    }
+
     var hash = hex_sha1(nick + '$' + password + '$dumpfm');
     var onSuccess = function() {
+	 if (typeof pageTracker !== 'undefined') {
+          pageTracker._trackEvent('User', 'Register', nick);
+        }
         location.href = "/";
     };
 
diff --git a/static/js/stats.js b/static/js/stats.js
new file mode 100755
index 0000000..00e00a0
--- /dev/null
+++ b/static/js/stats.js
@@ -0,0 +1,79 @@
+var CurrentStats = ['msgs', 'today'];
+
+function refreshStats() {
+    $('a.statname, a.timescale').addClass('disabled');
+    $('#statschart').empty().append('<img src="/static/spinner.gif">');
+
+    var onSuccess = function(json) {
+        var dataString = "Date,Count\n";
+        $.each(json, function(i, v) {
+            dataString += v.created_on + "," + v.count + "\n";
+        });
+        $('#statschart').empty();
+        new Dygraph($('#statschart')[0],
+                    dataString,
+                    { showRoller: false}
+                   );
+        
+        $('a.statname, a.timescale').removeClass('disabled');
+    };
+
+    var onError = function(resp, textStatus, errorThrown) {
+        $('a.statname, a.timescale').removeClass('disabled');
+    };
+
+    $.ajax({
+        type: 'GET',
+        timeout: 5000,
+        url: '/stats',
+        data: { 'stat': CurrentStats[0], 'ts': CurrentStats[1] },
+        cache: false,
+        dataType: 'json',
+        success: onSuccess,
+        error: onError
+    });   
+}
+
+function makeStatsWindow() {
+    var statBox= $('<div class="stats" align="center">');    
+    var choices = ['msgs', 'new users'];
+    $(choices).map(function(i, c) {
+        return link = $('<a>')
+            .text(c)
+            .attr('href', '#')
+            .addClass('statname') 
+            .addClass(i == 0 ? 'active' : 'inactive')
+            .click(function() {
+                if ($(this).hasClass('disabled') || 
+                    CurrentStats[0] == c) { return };
+                $('.statname').removeClass('active');
+                $(this).addClass('active');
+                CurrentStats[0] = c;
+                refreshStats();
+            });
+    }).appendTo(statBox);
+    $('<div id="statschart" style="width:375px; height:300px;">').appendTo(statBox);
+    var timescales = ['today', 'all time'];
+    $(timescales).map(function(i, c) {
+        return link = $('<a>')
+            .text(c)
+            .attr('href', '#')
+            .addClass('timescale') 
+            .addClass(i == 0 ? 'active' : 'inactive')            
+            .click(function() {
+                if ($(this).hasClass('disabled') || 
+                    CurrentStats[1] == c) { return };
+                $('.timescale').removeClass('active');
+                $(this).addClass('active');
+                CurrentStats[1] = c;
+                refreshStats();
+            });
+    })//.appendTo(statBox);
+    return statBox;
+}
+
+function initStats() {
+    makeStatsWindow().appendTo('body');
+    refreshStats();
+}
+