From 87e7a7fb2907bed32ca9735a0ab74d26d76d6a6b Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 3 Feb 2017 02:01:18 -0500
Subject: [PATCH] 3.5.425. Fix whisper button visibility on mod cards. Fix log
 message colors. Reduce logging when not running a development build. Fix ban
 notices rendering HTML.

---
 changelog.html               | 23 +++++++++++------------
 old_changes.html             | 12 ++++++++++++
 src/ember/moderation-card.js |  3 ++-
 src/ember/room.js            |  7 +++++--
 src/ember/wrapper.js         |  3 ++-
 src/main.js                  |  8 ++++----
 src/settings.js              |  2 +-
 src/socket.js                |  2 +-
 style.css                    |  1 +
 9 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/changelog.html b/changelog.html
index c2939a14..284c3e5f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,14 @@
+<div class="list-header">3.5.425 <time datetime="2017-02-03">(2017-02-03)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Whisper User button not rendering on moderation cards.</li>
+	<li>Fixed: Logging messages difficult to read with a developer console using a dark theme.</li>
+</ul>
+
+<div class="list-header">3.5.424 <time datetime="2017-01-30">(2017-01-30)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Ban notices in local history were rendering with HTML.</li>
+</ul>
+
 <div class="list-header">3.5.423 <time datetime="2017-01-30">(2017-01-30)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: Option to hide boxart when hovering streams and videos in the directory.</li>
@@ -52,17 +63,5 @@
 	<li>Fixed: An issue could prevent bits from rendering correctly in certain situations.</li>
 </ul>
 
-<div class="list-header">3.5.415 <time datetime="2017-01-10">(2017-01-10)</time></div>
-<ul class="chat-menu-content menu-side-padding">
-	<li>Fixed: Featured Channel follow buttons. FFZ would cache an incomplete user data object without a necessary authentication token.</li>
-</ul>
-
-<div class="list-header">3.5.414 <time datetime="2017-01-08">(2017-01-08)</time></div>
-<ul class="chat-menu-content menu-side-padding">
-	<li>Fixed: Schedule pop-up not rendering for Safari, Opera, and Edge users.</li>
-	<li>&nbsp;</li>
-	<li>This FFZ update brought to you by my AGDQ hotel room.</li>
-</ul>
-
 <div class="list-header" id="ffz-old-news-button"><a href="#">View Older</a></div>
 <div id="ffz-old-news"></div>
\ No newline at end of file
diff --git a/old_changes.html b/old_changes.html
index 7f1bd7c7..fa9418bd 100644
--- a/old_changes.html
+++ b/old_changes.html
@@ -1,3 +1,15 @@
+<div class="list-header">3.5.415 <time datetime="2017-01-10">(2017-01-10)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Featured Channel follow buttons. FFZ would cache an incomplete user data object without a necessary authentication token.</li>
+</ul>
+
+<div class="list-header">3.5.414 <time datetime="2017-01-08">(2017-01-08)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Schedule pop-up not rendering for Safari, Opera, and Edge users.</li>
+	<li>&nbsp;</li>
+	<li>This FFZ update brought to you by my AGDQ hotel room.</li>
+</ul>
+
 <div class="list-header">3.5.413 <time datetime="2017-01-05">(2017-01-05)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Schedule rendering could goof up if a category was very long, leading to horizontal scrolling.</li>
diff --git a/src/ember/moderation-card.js b/src/ember/moderation-card.js
index 35a0e823..863f62d2 100644
--- a/src/ember/moderation-card.js
+++ b/src/ember/moderation-card.js
@@ -1534,7 +1534,8 @@ FFZ.prototype._build_mod_card_history = function(msg, modcard, show_from, ts_cli
 		colored = '';
 	}
 
-	var tokens = this.tokenize_chat_line(msg, true, false, true),
+	// Use cached tokens on the off chance we have them, but don't count on them.
+	var tokens = msg.cachedTokens || this.tokenize_chat_line(msg, true, false, true),
 		message = '<span class="message' + colored + '" style="' + style + (colors ? '" data-color="' + raw_color : '') + '">' +
 			(msg.style === 'action' && ! show_from ? '*' + name + ' ' : '') + this.render_tokens(tokens, true, false, msg.tags && msg.tags.bits) + '</span>';
 
diff --git a/src/ember/room.js b/src/ember/room.js
index c7de3458..fdef66da 100644
--- a/src/ember/room.js
+++ b/src/ember/room.js
@@ -1479,11 +1479,11 @@ FFZ.prototype._modify_room = function(room) {
 				if ( show_notice )
 					this.addMessage(message);
 
-				this.addUserHistory(message);
+				this.addUserHistory(message, true);
 			}
 		},
 
-		addUserHistory: function(message) {
+		addUserHistory: function(message, dont_copy) {
 			var room_id = this.get('id'),
 				is_group = this.get('isGroupRoom'),
 				setting = f.settings.mod_card_history,
@@ -1514,6 +1514,9 @@ FFZ.prototype._modify_room = function(room) {
 					}
 				};
 
+			if ( dont_copy )
+				cache_object = message;
+
 			if ( historical ) {
 				if ( user_history.length >= 20 )
 					return;
diff --git a/src/ember/wrapper.js b/src/ember/wrapper.js
index afe82ec5..805b77e6 100644
--- a/src/ember/wrapper.js
+++ b/src/ember/wrapper.js
@@ -63,7 +63,8 @@ FFZ.prototype._update_views = function(klasses) {
 		try {
 			klasses[i][1].create().destroy()
 		} catch(err) {
-			this.log("There was an error creating and destroying an instance of the Ember class \"" + klasses[i][0] + "\" to clear its cache.", err);
+			if ( constants.DEBUG )
+				this.log("There was an error creating and destroying an instance of the Ember class \"" + klasses[i][0] + "\" to clear its cache.", err);
 		}
 	}
 
diff --git a/src/main.js b/src/main.js
index 3d1dc933..4a419a32 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 423,
+	major: 3, minor: 5, revision: 425,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
@@ -77,15 +77,15 @@ FFZ.prototype.log = function(msg, data, to_json, log_json) {
 	this._log_data.push(msg + ((!to_json && log_json) ? " -- " + JSON.stringify(data) : ""));
 
 	if ( data !== undefined && console.groupCollapsed && console.dir ) {
-		console.groupCollapsed("%cFFZ:%c " + msg, "color:#755000; font-weight: bold", "color:black; font-weight: normal");
+		console.groupCollapsed("%cFFZ:%c " + msg, "color:#755000; font-weight: bold", "color:auto; font-weight: normal");
 		if ( typeof data === "string" || navigator.userAgent.indexOf("Firefox/") !== -1 )
 			console.log(data);
 		else
 			console.dir(data);
 
-		console.groupEnd("%cFFZ:%c " + msg, "color:#755000; font-weight: bold", "color:black; font-weight: normal");
+		console.groupEnd("%cFFZ:%c " + msg, "color:#755000; font-weight: bold", "color:auto; font-weight: normal");
 	} else
-		console.log("%cFFZ:%c " + msg, "color:#755000; font-weight: bold", "color:black; font-weight: normal");
+		console.log("%cFFZ:%c " + msg, "color:#755000; font-weight: bold", "color:auto; font-weight: normal");
 }
 
 
diff --git a/src/settings.js b/src/settings.js
index 57e4efaf..b957c65e 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -362,7 +362,7 @@ var is_android = navigator.userAgent.indexOf('Android') !== -1,
 							if ( e.target.classList.contains('heading') ) {
 								t.classList.add('collapsed');
 								if ( collapsed_key )
-								   f[collapsed_key] = true;
+									f[collapsed_key] = true;
 							} else
 								return;
 
diff --git a/src/socket.js b/src/socket.js
index 4fa4ec4a..93d69244 100644
--- a/src/socket.js
+++ b/src/socket.js
@@ -307,7 +307,7 @@ FFZ.prototype.ws_create = function() {
 			var success = cmd === 'ok',
 				has_callback = typeof f._ws_callbacks[request] === "function";
 
-			if ( ! has_callback )
+			if ( ! has_callback && (!success || constants.DEBUG) )
 				f.log("Socket Reply to " + request + " - " + (success ? "SUCCESS" : "FAIL"), data, false, true);
 
 			else {
diff --git a/style.css b/style.css
index f1378574..ca14beeb 100644
--- a/style.css
+++ b/style.css
@@ -1346,6 +1346,7 @@ body:not(.ffz-hide-friends) .ffz-moderation-card .follow-button {
 
 .ffz-moderation-card button.message {
 	height: 30px;
+	font-size: 1.2em;
 }
 
 .ffz-moderation-card.ffz-is-mod .button.ban,