1 files changed, 41 insertions, 20 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index 6b9c3e8..33788e2 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -1,24 +1,44 @@
 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);
 }
 
+// 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(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>"
-    }
+  var PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i;
+  var matchWithoutParams = match.replace(/\?.*$/i, "")
+  if (PicRegex.test(matchWithoutParams)){
+    LastMsgContainsImage = true
+    return "<a target='_blank' href='" + match + "'><img src='" + match + "'></a>"
+  } else {
+    return "<a target='_blank' href='" + match + "'>" + match + "</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,13 +46,15 @@ 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) {
@@ -199,7 +221,6 @@ function initChat() {
     // see /static/webcam/webcam.js
     if ('webcam' in window) webcam.init()
     
-
     setTimeout(refresh, 1000);
 }
 
@@ -279,7 +300,7 @@ function isScrolledToBottom(){
 }
 
 function scrollIfPossible(){
-  if (lastScriptedScrolledPosition == messageList.scrollTop || isScrolledToBottom())
+  if (lastScriptedScrolledPosition <= messageList.scrollTop || isScrolledToBottom())
     scrollToEnd()
 }