From f88f859dcf6ab4a5ef46505338c5bc745e9a85cb Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Wed, 6 Sep 2023 17:20:05 -0400
Subject: [PATCH] 4.51.1

* Fixed: Pages on domains other than `www.twitch.tv` failing to load due to a bug with the settings bridge introduced in the last update.
* Fixed: The standalone player's latency metadata not displaying the buffer length.
* Fixed: Replies appearing with colored usernames with the setting to have colored mentioned disabled.
---
 package.json                                   |  2 +-
 src/bridge.js                                  |  2 +-
 src/modules/chat/index.js                      |  4 +++-
 src/modules/metadata.jsx                       |  5 ++---
 src/sites/player/metadata.jsx                  | 12 ++++++++++++
 src/sites/twitch-twilight/modules/chat/line.js |  3 +++
 webpack.config.js                              | 10 +++++++---
 7 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index dcb6e203..f68f80eb 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frankerfacez",
   "author": "Dan Salvato LLC",
-  "version": "4.51.0",
+  "version": "4.51.1",
   "description": "FrankerFaceZ is a Twitch enhancement suite.",
   "private": true,
   "license": "Apache-2.0",
diff --git a/src/bridge.js b/src/bridge.js
index 2ba5181c..7b36cac5 100644
--- a/src/bridge.js
+++ b/src/bridge.js
@@ -208,7 +208,7 @@ class FFZBridge extends Module {
 
 FFZBridge.Logger = Logger;
 
-const VER = FrankerFaceZ.version_info = Object.freeze({
+const VER = FFZBridge.version_info = Object.freeze({
 	major: __version_major__,
 	minor: __version_minor__,
 	revision: __version_patch__,
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index fcaec38e..9f05befa 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -1625,7 +1625,9 @@ export default class Chat extends Module {
 			{
 				type: 'reply',
 				text: reply.parentDisplayName,
-				color: this.color_cache ? this.color_cache.get(reply.parentUserLogin) : null,
+				color: (this.context.get('chat.filtering.color-mentions') && this.color_cache)
+					? this.color_cache.get(reply.parentUserLogin)
+					: null,
 				recipient: reply.parentUserLogin
 			},
 			{
diff --git a/src/modules/metadata.jsx b/src/modules/metadata.jsx
index 62753d3e..37ef8473 100644
--- a/src/modules/metadata.jsx
+++ b/src/modules/metadata.jsx
@@ -351,7 +351,6 @@ export default class Metadata extends Module {
 						videoWidth,
 						displayHeight,
 						displayWidth,
-						buffered: maybe_call(player.getBufferDuration, player) || -1,
 						rate: maybe_call(player.getPlaybackRate, player),
 						fps: Math.floor(maybe_call(player.getVideoFrameRate, player) || 0),
 						hlsLatencyBroadcaster: maybe_call(player.getLiveLatency, player) || 0,
@@ -508,12 +507,12 @@ export default class Metadata extends Module {
 						)}</div>)
 						:*/ null;
 
-				const buffer = stats.buffered > 0
+				const buffer = stats.bufferSize > 0
 						? (<div>{this.i18n.t(
 							'metadata.player-stats.buffered',
 							'Buffered: {buffered} seconds',
 							{
-								buffered: stats.buffered.toFixed(2)
+								buffered: stats.bufferSize.toFixed(2)
 							}
 						)}</div>)
 						: null;
diff --git a/src/sites/player/metadata.jsx b/src/sites/player/metadata.jsx
index 4cb76760..a8ed6042 100644
--- a/src/sites/player/metadata.jsx
+++ b/src/sites/player/metadata.jsx
@@ -317,6 +317,16 @@ export default class Metadata extends Module {
 						stats
 					);
 
+				const buffer = stats.bufferSize > 0
+					? (<div>{this.i18n.t(
+						'metadata.player-stats.buffered',
+						'Buffered: {buffered} seconds',
+						{
+							buffered: stats.bufferSize.toFixed(2)
+						}
+					)}</div>)
+					: null;
+
 				if ( data.old )
 					return [
 						delayed,
@@ -334,6 +344,7 @@ export default class Metadata extends Module {
 						<div class="tw-pd-t-05">
 							{video_info}
 						</div>,
+						buffer,
 						tampered
 					];
 
@@ -346,6 +357,7 @@ export default class Metadata extends Module {
 					<div class="tw-pd-t-05">
 						{video_info}
 					</div>,
+					buffer,
 					tampered
 				];
 			}
diff --git a/src/sites/twitch-twilight/modules/chat/line.js b/src/sites/twitch-twilight/modules/chat/line.js
index 5901b34a..55b97758 100644
--- a/src/sites/twitch-twilight/modules/chat/line.js
+++ b/src/sites/twitch-twilight/modules/chat/line.js
@@ -1879,6 +1879,7 @@ other {# messages were deleted by a moderator.}
 
 				if ( clear_tokens ) {
 					msg.ffz_tokens = null;
+					msg.ffz_reply = null;
 					msg.highlights = msg.mentioned = msg.mention_color = msg.color_priority = null;
 				}
 
@@ -1927,6 +1928,7 @@ other {# messages were deleted by a moderator.}
 
 				if ( clear_tokens ) {
 					msg.ffz_tokens = null;
+					msg.ffz_reply = null;
 					msg.highlights = msg.mentioned = msg.mention_color = msg.mention_priority = msg.clear_priority = null;
 				}
 			}
@@ -1940,6 +1942,7 @@ other {# messages were deleted by a moderator.}
 
 				if ( clear_tokens ) {
 					msg.ffz_tokens = null;
+					msg.ffz_reply = null;
 					msg.highlights = msg.mentioned = msg.mention_color = msg.mention_priority = msg.clear_priority = null;
 				}
 			}
diff --git a/webpack.config.js b/webpack.config.js
index c483eaed..3ca4deee 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -122,8 +122,12 @@ const config = {
 		new CopyPlugin({
 			patterns: [
 				{
-					from: './src/entry.js',
-					to: 'script.js'
+					from: FOR_EXTENSION
+						? './src/entry_ext.js'
+						: './src/entry.js',
+					to: (DEV_SERVER || DEV_BUILD)
+						? 'script.js'
+						: 'script.min.js'
 				}
 			]
 		}),
@@ -142,7 +146,7 @@ const config = {
 			}
 		}),
 		new WebpackManifestPlugin({
-
+			publicPath: ''
 		})
 	],