From e773600a3e4812a491020b6d70f4ebafaaf73738 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Wed, 11 Apr 2018 17:49:31 -0400
Subject: [PATCH] More event filtering for Sentry error reporting.

---
 changelog.html                                        |  6 ++++++
 src/experiments.json                                  | 10 ++++++++++
 src/main.js                                           |  4 ++--
 src/modules/chat/rich_providers.js                    |  5 +++++
 .../twitch-twilight/modules/chat/rich_content.jsx     | 11 ++++++++++-
 src/utilities/compat/apollo.js                        |  2 +-
 6 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/experiments.json

diff --git a/changelog.html b/changelog.html
index aa993a40..c67c94f2 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">4.0.0-beta2.9<span>@665575cf426293ec11da</span> <time datetime="2018-04-11">(2018-04-11)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Changed: Allow clicking on a rich chat embed even if it fails to load.</li>
+	<li>Fixed: Clean up more errors for Sentry logging.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta2.6<span>@b85fa005ec1f3929cdd8</span> <time datetime="2018-04-11">(2018-04-11)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Changed: Filter a bunch of errors out from Sentry logging.</li>
diff --git a/src/experiments.json b/src/experiments.json
new file mode 100644
index 00000000..8dea498d
--- /dev/null
+++ b/src/experiments.json
@@ -0,0 +1,10 @@
+{
+	"api_load": {
+		"name": "New API Stress Testing",
+		"description": "Send duplicate requests to the new API server for load testing.",
+		"groups": [
+			{"value": true, "weight": 0},
+			{"value": false, "weight": 100}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index b357eb23..62f0c014 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,7 +30,7 @@ class FrankerFaceZ extends Module {
 		// Error Reporting and Logging
 		// ========================================================================
 
-		//if ( ! DEBUG )
+		if ( ! DEBUG )
 			this.inject('raven', RavenLogger);
 
 		this.log = new Logger(null, null, null, this.raven);
@@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-beta2.7',
+	major: 4, minor: 0, revision: 0, extra: '-beta2.9',
 	build: __webpack_hash__,
 	toString: () =>
 		`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`
diff --git a/src/modules/chat/rich_providers.js b/src/modules/chat/rich_providers.js
index 7dce4f70..4341dbfb 100644
--- a/src/modules/chat/rich_providers.js
+++ b/src/modules/chat/rich_providers.js
@@ -31,6 +31,8 @@ export const Clips = {
 			return;
 
 		return {
+			url: token.url,
+
 			getData: async () => {
 				const result = await apollo.client.query({
 					query: GET_CLIP,
@@ -39,6 +41,9 @@ export const Clips = {
 					}
 				});
 
+				if ( ! result || ! result.data || ! result.data.clip )
+					return null;
+
 				const clip = result.data.clip,
 					user = clip.broadcaster.displayName,
 					game = clip.game,
diff --git a/src/sites/twitch-twilight/modules/chat/rich_content.jsx b/src/sites/twitch-twilight/modules/chat/rich_content.jsx
index f6ba5e20..f6f32e2c 100644
--- a/src/sites/twitch-twilight/modules/chat/rich_content.jsx
+++ b/src/sites/twitch-twilight/modules/chat/rich_content.jsx
@@ -48,8 +48,16 @@ export default class RichContent extends Module {
 							data = await data;
 					}
 
+					if ( ! data )
+						data = {
+							error: true,
+							title: t.i18n.t('card.error', 'An error occured.'),
+							desc_1: t.i18n.t('card.empty', 'No data was returned.')
+						}
+
 					this.setState(Object.assign({
-						loaded: true
+						loaded: true,
+						url: this.props.url
 					}, data));
 
 				} catch(err) {
@@ -59,6 +67,7 @@ export default class RichContent extends Module {
 					this.setState({
 						loaded: true,
 						error: true,
+						url: this.props.url,
 						title: t.i18n.t('card.error', 'An error occured.'),
 						desc_1: String(err)
 					});
diff --git a/src/utilities/compat/apollo.js b/src/utilities/compat/apollo.js
index da46e582..b9808d45 100644
--- a/src/utilities/compat/apollo.js
+++ b/src/utilities/compat/apollo.js
@@ -117,7 +117,7 @@ export default class Apollo extends Module {
 							next: result => {
 								if ( result.errors ) {
 									const name = operation.operationName;
-									if ( name.includes('FFZ') || has(this.modifiers, name) || has(this.post_modifiers, name) ) {
+									if ( name && (name.includes('FFZ') || has(this.modifiers, name) || has(this.post_modifiers, name)) ) {
 										for(const err of result.errors) {
 											if ( skip_error(err) )
 												continue;