From 380037d64ce4a51d1595edf4e84c93a5761a4743 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Mon, 27 Aug 2018 23:08:44 -0400
Subject: [PATCH] 4.0.0-rc12.16

* Fixed: Typo in chat code fixes causing message deletion setting to not work correctly.
* Fixed: Remove request causing following directory to crash, until such time as we can figure out why it's happening.
---
 src/main.js                                          |  2 +-
 .../twitch-twilight/modules/chat/emote_menu.jsx      |  3 ++-
 src/sites/twitch-twilight/modules/chat/index.js      |  5 +++--
 .../modules/directory/followed_hosts.gql             |  1 -
 .../modules/directory/followed_index.gql             | 12 ------------
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/main.js b/src/main.js
index 2738d8db..a77daaf0 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: '-rc12.15',
+	major: 4, minor: 0, revision: 0, extra: '-rc12.16',
 	commit: __git_commit__,
 	build: __webpack_hash__,
 	toString: () =>
diff --git a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
index 5dbd37bd..ccf0b487 100644
--- a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
+++ b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
@@ -781,7 +781,8 @@ export default class EmoteMenu extends Module {
 
 			observeSoon() {
 				requestAnimationFrame(() => {
-					this.handleObserve(this.observer.takeRecords());
+					if ( this.observer )
+						this.handleObserve(this.observer.takeRecords());
 				});
 			}
 
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index 8576d916..6e9cd147 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -603,7 +603,7 @@ export default class ChatHook extends Module {
 
 						} else if ( msg.type === types.Moderation ) {
 							const login = msg.userLogin;
-							if ( this.moderatedUsers.has(login) )
+							if ( inst.moderatedUsers.has(login) )
 								return;
 
 							const do_remove = t.chat.context.get('chat.filtering.remove-deleted') === 3,
@@ -644,11 +644,12 @@ export default class ChatHook extends Module {
 						}
 
 					} catch(err) {
+						t.log.error('Error processing chat event.', err);
 						t.log.capture(err, {extra: {msg}});
 					}
 				}
 
-				return old_handle.call(this, msg);
+				return old_handle.call(inst, msg);
 			}
 
 			inst.getMessages = function() {
diff --git a/src/sites/twitch-twilight/modules/directory/followed_hosts.gql b/src/sites/twitch-twilight/modules/directory/followed_hosts.gql
index 0bd303b1..e6c12ffd 100644
--- a/src/sites/twitch-twilight/modules/directory/followed_hosts.gql
+++ b/src/sites/twitch-twilight/modules/directory/followed_hosts.gql
@@ -4,7 +4,6 @@ query {
 			nodes {
 				profileImageURL(width: 50)
 				hosting {
-					profileImageURL(width: 50)
 					stream {
 						createdAt
 					}
diff --git a/src/sites/twitch-twilight/modules/directory/followed_index.gql b/src/sites/twitch-twilight/modules/directory/followed_index.gql
index ef13ca6b..0dd90430 100644
--- a/src/sites/twitch-twilight/modules/directory/followed_index.gql
+++ b/src/sites/twitch-twilight/modules/directory/followed_index.gql
@@ -7,17 +7,5 @@ query {
 				}
 			}
 		}
-		followedHosts {
-			nodes {
-				profileImageURL(width: 50)
-				hosting {
-					profileImageURL(width: 50)
-					stream {
-						createdAt
-						type
-					}
-				}
-			}
-		}
 	}
 }
\ No newline at end of file