From 127184f9979986f21994502f878babbb7e39ca51 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Mon, 20 Nov 2017 16:59:52 -0500
Subject: [PATCH] Fix updateContext. Change the colors used to make chat names
 readable. Fix /me actions in chat. Fix socket.ping()

---
 changelog.html                                  |  6 ++++++
 src/sites/twitch-twilight/index.js              | 17 +++++++++++------
 src/sites/twitch-twilight/modules/chat/index.js |  3 ++-
 src/sites/twitch-twilight/modules/chat/line.js  |  2 +-
 src/socket.js                                   |  3 ---
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/changelog.html b/changelog.html
index acd8d304..78636eeb 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">4.0.0-beta1.3<span>@1ee69894e169e3173e19</span> <time datetime="2017-11-20">(2017-11-20)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Twitch removed the current route from the output of <code>store.getState()</code>, causing loading issues with FFZ enabled.</li>
+	<li>Changed: Use slightly brighter/darker colors for testing username readability, due to alternating rows having different background colors.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta1.3<span>@f93396a7a97f1a01b284</span> <time datetime="2017-11-17">(2017-11-17)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Chat Font Size and Family settings not being applied.</li>
diff --git a/src/sites/twitch-twilight/index.js b/src/sites/twitch-twilight/index.js
index 83d2d056..c224a841 100644
--- a/src/sites/twitch-twilight/index.js
+++ b/src/sites/twitch-twilight/index.js
@@ -62,13 +62,18 @@ export default class Twilight extends BaseSite {
 	}
 
 	updateContext() {
-		const state = this.store.getState();
-		this.settings.updateContext({
-			location: state.router.location,
+		try {
+			const state = this.store.getState(),
+				route = this.context.router && this.context.router.route;
 
-			ui: state.ui,
-			session: state.session
-		});
+			this.settings.updateContext({
+				location: route && route.location,
+				ui: state && state.ui,
+				session: state && state.session
+			});
+		} catch(err) {
+			this.log.error('Error updating context.', err);
+		}
 	}
 
 	getSession() {
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index 79630030..cc74fbc2 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -228,7 +228,8 @@ export default class ChatHook extends Module {
 			c = this.colors;
 
 		// TODO: Get the background color from the theme system.
-		c._base = is_dark ? '#0e0c13' : '#faf9fa';
+		// Updated: Use the lightest/darkest colors from alternating rows for better readibility.
+		c._base = is_dark ? '#191919' : '#e0e0e0'; //#0e0c13' : '#faf9fa';
 		c.mode = mode;
 		c.contrast = contrast;
 
diff --git a/src/sites/twitch-twilight/modules/chat/line.js b/src/sites/twitch-twilight/modules/chat/line.js
index 03fd1f7b..47c16d2e 100644
--- a/src/sites/twitch-twilight/modules/chat/line.js
+++ b/src/sites/twitch-twilight/modules/chat/line.js
@@ -53,7 +53,7 @@ export default class ChatLine extends Module {
 
 
 			cls.prototype.render = function() {
-				const types = t.chat.chatTypes || {},
+				const types = t.parent.chatTypes || {},
 
 					msg = this.props.message,
 					is_action = msg.type === types.Action,
diff --git a/src/socket.js b/src/socket.js
index d59edbba..1e16f626 100644
--- a/src/socket.js
+++ b/src/socket.js
@@ -387,9 +387,6 @@ export default class SocketClient extends Module {
 	// ========================================================================
 
 	_send(command, args, callback) {
-		if ( args.length === 1 )
-			args = args[0];
-
 		if ( ! this.connected )
 			return this.log.warn(`Tried sending command "${command}" while disconnected.`);