From 84589231c8e5153b0028c77b14119d3e4ebc08a6 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 13 Jul 2018 20:39:01 -0400
Subject: [PATCH] 4.0.0-rc4.7

* Fixed: Action messages in chat.
---
 changelog.html                                |  5 +++++
 src/main.js                                   |  2 +-
 .../twitch-twilight/modules/chat/index.js     | 21 ++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/changelog.html b/changelog.html
index f932f7d3..69b7755d 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">4.0.0-rc4.7<span>@f9f030a275798072a22e</span> <time datetime="2018-07-13">(2018-07-13)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Handling of action messages in chat.</li>
+</ul>
+
 <div class="list-header">4.0.0-rc4.6<span>@88d18379ce08c403e3f0</span> <time datetime="2018-07-13">(2018-07-13)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Add support for Twitch's new emote data structure format.</li>
diff --git a/src/main.js b/src/main.js
index c1d130bb..c8f52955 100644
--- a/src/main.js
+++ b/src/main.js
@@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc4.6',
+	major: 4, minor: 0, revision: 0, extra: '-rc4.7',
 	build: __webpack_hash__,
 	toString: () =>
 		`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index 889ae2b1..4a1bf685 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -359,28 +359,25 @@ export default class ChatHook extends Module {
 		const ct = await this.web_munch.findModule('chat-types'),
 			changes = [];
 
+		this.automod_types = ct && ct.a || AUTOMOD_TYPES;
+		this.chat_types = ct && ct.b || CHAT_TYPES;
+		this.message_types = ct && ct.c || MESSAGE_TYPES;
+		this.mod_types = ct && ct.e || MOD_TYPES;
+
 		if ( ! ct )
 			return;
 
-		if ( ct.a && ! shallow_object_equals(ct.a, AUTOMOD_TYPES) ) {
+		if ( ct.a && ! shallow_object_equals(ct.a, AUTOMOD_TYPES) )
 			changes.push('AUTOMOD_TYPES');
-			this.automod_types = ct.a;
-		}
 
-		if ( ct.b && ! shallow_object_equals(ct.b, CHAT_TYPES) ) {
+		if ( ct.b && ! shallow_object_equals(ct.b, CHAT_TYPES) )
 			changes.push('CHAT_TYPES');
-			this.chat_types = ct.b;
-		}
 
-		if ( ct.c && ! shallow_object_equals(ct.c, MESSAGE_TYPES) ) {
+		if ( ct.c && ! shallow_object_equals(ct.c, MESSAGE_TYPES) )
 			changes.push('MESSAGE_TYPES');
-			this.message_types = ct.c;
-		}
 
-		if ( ct.e && ! shallow_object_equals(ct.e, MOD_TYPES) ) {
+		if ( ct.e && ! shallow_object_equals(ct.e, MOD_TYPES) )
 			changes.push('MOD_TYPES');
-			this.mod_types = ct.e;
-		}
 
 		if ( changes.length )
 			this.log.info('Chat Types have changed from static mappings for categories:', changes.join(' '));