From 547f50312e60b8dee557153a131c2470df111a91 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Mon, 16 Apr 2018 18:56:42 -0400
Subject: [PATCH] Rewrite stack traces for Sentry to include the proper, static
 path to the current build to ensure that the correct source map is read by
 Sentry for displaying the exception.

---
 changelog.html |  5 +++++
 src/main.js    |  2 +-
 src/raven.js   | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index d9b601a2..33df5731 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">4.0.0-beta2.18.2<span>@a1a7fb774d62948bacc5</span> <time datetime="2018-04-16">(2018-04-16)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Rewrite stacktraces for automatic error reporting to use the permanent URL for the current FrankerFaceZ build.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta2.18.1<span>@988ba86433ce4bfd636d</span> <time datetime="2018-04-15">(2018-04-15)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Changed: Add another filter for what sort of error logs we don't want from Apollo.</li>
diff --git a/src/main.js b/src/main.js
index f14b5408..49cac8c1 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: '-beta2.18.1',
+	major: 4, minor: 0, revision: 0, extra: '-beta2.18.2',
 	build: __webpack_hash__,
 	toString: () =>
 		`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`
diff --git a/src/raven.js b/src/raven.js
index f68ad579..805cbdd8 100644
--- a/src/raven.js
+++ b/src/raven.js
@@ -12,6 +12,8 @@ import Module from 'utilities/module';
 
 import Raven from 'raven-js';
 
+const AVALON_REG = /\/(?:script|static)\/((?:babel\/)?avalon)(\.js)(\?|#|$)/;
+
 const BAD_URLS = [
 	'hls.ttvnw.net',
 	'trowel.twitch.tv',
@@ -193,6 +195,9 @@ export default class RavenLogger extends Module {
 					return false;
 				}
 
+				if ( data.exception && Array.isArray(data.exception.values) )
+					data.exception.values = this.rewriteStack(data.exception.values, data);
+
 				return true;
 			}
 		}).install();
@@ -203,6 +208,19 @@ export default class RavenLogger extends Module {
 	}
 
 
+	rewriteStack(errors) { // eslint-disable-line class-methods-use-this
+		for(const err of errors) {
+			if ( ! err || ! err.stacktrace || ! err.stacktrace.frames )
+				continue;
+
+			for(const frame of err.stacktrace.frames)
+				frame.filename = frame.filename.replace(AVALON_REG, `/static/$1.${__webpack_hash__}$2$3`)
+		}
+
+		return errors;
+	}
+
+
 	buildExtra() {
 		const modules = {},
 			experiments = {},