fix bug where personal mutes didnt affect .oldmsg divs

2 files changed, 19 insertions, 8 deletions

diff --git a/static/js/src/chat.js b/static/js/src/chat.js
index e59e948..b2816c7 100644
--- a/static/js/src/chat.js
+++ b/static/js/src/chat.js
@@ -2,6 +2,7 @@
 
 function initChat() {
   Search.initInpage()
+  initMutes()
 
   $('#textbutton input').attr('checked', TextEnabled).change(setTextEnable);
   $('#imgbutton input').attr('checked', ImgsEnabled).change(setImgsEnable);
@@ -19,10 +20,17 @@ function initChat() {
         MessageContentCache[dump.attr("id").substr(8)] = content.text()
         content.html(buildMsgContent(content.text(), Recips));
 
-        if ((ImgsEnabled && dump.hasClass('contains-image')) || (TextEnabled && !dump.hasClass('contains-image')))
-            dump.show();            
-        else
+        if ((ImgsEnabled && dump.hasClass('contains-image')) || (TextEnabled && !dump.hasClass('contains-image'))) {
+            if (dump.attr('nick') in MUTES) {
+                dump.hide();
+            }
+            else {
+                dump.show();
+            }
+	}
+        else {
             dump.hide();
+	}
     });
     Drag.bindImages();
 
diff --git a/static/js/src/userlist.js b/static/js/src/userlist.js
index 3ccb9b2..5ed34be 100644
--- a/static/js/src/userlist.js
+++ b/static/js/src/userlist.js
@@ -1,8 +1,11 @@
-try {
-	var MUTES = localStorage["mutes"] ? JSON.parse(localStorage["mutes"]) : {};
-}
-catch (e) {
-	delete localStorage["mutes"]
+function initMutes(){
+	try {
+		window.MUTES = localStorage["mutes"] ? JSON.parse(localStorage["mutes"]) : {};
+	}
+	catch (e) {
+		delete localStorage["mutes"]
+		window.MUTES = {}
+	}
 }
 $(".mute").live("click", function(){
     $(this).removeClass("mute");