From a80728a10d158aa09042d4fd8aff6f333fbc6f1d Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Wed, 14 Apr 2021 16:53:15 -0400
Subject: [PATCH] 4.20.90

* Added: Support for custom VIP Badge images.
* Fixed: Certain emotes breaking when `Large Emotes` is combined with `Fix bad Twitch emotes`. (Closes #1020)
* Fixed: Remember the Compressor state, if it was toggled, when resetting the player. (Closes #1024)
* API Added: The `chat` module has two methods for maintaining a list of possible message highlight reasons, for use populating UI. Accessible via methods `addHighlightReason(key, data)` and `getHighlightReasons()`.
* API Added: `basic_array_merge` setting type.
* API Added: Logs now include the initial URL that the script was loaded into.
* API Changed: `<select>` settings can now support multiple selected values.
---
 package.json                                  |  2 +-
 src/bridge.js                                 |  2 +-
 src/clips.js                                  |  2 +-
 src/main.js                                   |  2 +-
 src/modules/chat/badges.jsx                   | 29 +++++++++++--
 src/modules/chat/index.js                     | 41 ++++++++++++++++++-
 src/modules/chat/room.js                      | 24 +++++++++++
 src/modules/chat/tokenizers.jsx               |  5 ++-
 .../components/setting-select-box.vue         | 24 +++++++++--
 src/player.js                                 |  2 +-
 src/settings/types.js                         | 27 ++++++++++++
 src/sites/shared/player.jsx                   | 33 ++++++++++++---
 styles/native/text.scss                       | 18 ++++----
 13 files changed, 183 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 58320942..84dfa87e 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frankerfacez",
   "author": "Dan Salvato LLC",
-  "version": "4.20.89",
+  "version": "4.20.90",
   "description": "FrankerFaceZ is a Twitch enhancement suite.",
   "private": true,
   "license": "Apache-2.0",
diff --git a/src/bridge.js b/src/bridge.js
index 3e6e036d..9c119540 100644
--- a/src/bridge.js
+++ b/src/bridge.js
@@ -34,7 +34,7 @@ class FFZBridge extends Module {
 
 		this.core_log = this.log.get('core');
 
-		this.log.info(`FrankerFaceZ Settings Bridge v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''})`);
+		this.log.info(`FrankerFaceZ Settings Bridge v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''}) (initial ${location})`);
 
 
 		// ========================================================================
diff --git a/src/clips.js b/src/clips.js
index 9df1f3ab..e4b4d77c 100644
--- a/src/clips.js
+++ b/src/clips.js
@@ -43,7 +43,7 @@ class FrankerFaceZ extends Module {
 
 		this.core_log = this.log.get('core');
 
-		this.log.info(`FrankerFaceZ Standalone Clips v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''})`);
+		this.log.info(`FrankerFaceZ Standalone Clips v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''}) (initial ${location})`);
 
 
 		// ========================================================================
diff --git a/src/main.js b/src/main.js
index 69619324..9063b369 100644
--- a/src/main.js
+++ b/src/main.js
@@ -47,7 +47,7 @@ class FrankerFaceZ extends Module {
 
 		this.core_log = this.log.get('core');
 
-		this.log.info(`FrankerFaceZ v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''})`);
+		this.log.info(`FrankerFaceZ v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''}) (initial ${location})`);
 
 
 		// ========================================================================
diff --git a/src/modules/chat/badges.jsx b/src/modules/chat/badges.jsx
index 56eb4f59..e11e93b4 100644
--- a/src/modules/chat/badges.jsx
+++ b/src/modules/chat/badges.jsx
@@ -257,7 +257,16 @@ export default class Badges extends Module {
 				title: 'Use custom moderator badges where available.',
 				component: 'setting-check-box'
 			}
-		})
+		});
+
+		this.settings.add('chat.badges.custom-vip', {
+			default: true,
+			ui: {
+				path: 'Chat > Badges >> tabs ~> Appearance',
+				title: 'Use custom VIP badges where available.',
+				component: 'setting-check-box'
+			}
+		});
 
 		this.settings.add('chat.badges.style', {
 			default: 1,
@@ -558,6 +567,7 @@ export default class Badges extends Module {
 		const hidden_badges = skip_hide ? {} : (this.parent.context.get('chat.badges.hidden') || {}),
 			badge_style = this.parent.context.get('chat.badges.style'),
 			custom_mod = this.parent.context.get('chat.badges.custom-mod'),
+			custom_vip = this.parent.context.get('chat.badges.custom-vip'),
 			is_mask = badge_style > 5,
 			is_colored = badge_style !== 5,
 			has_image = badge_style !== 3 && badge_style !== 4,
@@ -599,19 +609,30 @@ export default class Badges extends Module {
 					slot = last_slot++;
 
 				const data = dynamic_data[badge_id] || (badge_id === 'founder' && dynamic_data['subscriber']),
-					urls = badge_id === 'moderator' && custom_mod && room && room.data && room.data.mod_urls,
+					mod_urls = badge_id === 'moderator' && custom_mod && room && room.data && room.data.mod_urls,
+					vip_urls = badge_id === 'vip' && custom_vip && room && room.data && room.data.vip_badge,
 					badges = [];
 
-				if ( urls ) {
+				if ( mod_urls ) {
 					const bd = this.getTwitchBadge(badge_id, version, room_id, room_login);
 					badges.push({
 						provider: 'ffz',
-						image: urls[4] || urls[2] || urls[1],
+						image: mod_urls[4] || mod_urls[2] || mod_urls[1],
 						color: '#34ae0a',
 						title: bd ? bd.title : 'Moderator',
 						data
 					});
 
+				} else if ( vip_urls ) {
+					const bd = this.getTwitchBadge(badge_id, version, room_id, room_login);
+					badges.push({
+						provider: 'ffz',
+						image: vip_urls[4] || vip_urls[2] || vip_urls[1],
+						color: 'transparent',
+						title: bd ? bd.title : 'VIP',
+						data
+					});
+
 				} else
 					badges.push({
 						provider: 'twitch',
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index 4b88f9bb..6294cc95 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -8,7 +8,7 @@ import dayjs from 'dayjs';
 
 import Module from 'utilities/module';
 import {createElement, ManagedStyle} from 'utilities/dom';
-import {timeout, has, glob_to_regex, escape_regex, split_chars} from 'utilities/object';
+import {timeout, has, glob_to_regex, escape_regex, split_chars, deep_copy} from 'utilities/object';
 
 import Badges from './badges';
 import Emotes from './emotes';
@@ -88,11 +88,28 @@ export default class Chat extends Module {
 		this.rich_providers = {};
 		this.__rich_providers = [];
 
+		this._hl_reasons = {};
+		this.addHighlightReason('mention', 'Mentioned');
+		this.addHighlightReason('user', 'Highlight User');
+		this.addHighlightReason('badge', 'Highlight Badge');
+		this.addHighlightReason('term', 'Highlight Term');
 
 		// ========================================================================
 		// Settings
 		// ========================================================================
 
+		/*this.settings.add('debug.highlight-reason', {
+			default: [],
+			type: 'basic_array_merge',
+			ui: {
+				path: 'Chat > Debugging >> General',
+				title: 'Test',
+				component: 'setting-select-box',
+				multiple: true,
+				data: () => this.getHighlightReasons()
+			}
+		});*/
+
 		this.settings.add('debug.link-resolver.source', {
 			default: null,
 			ui: {
@@ -1598,6 +1615,28 @@ export default class Chat extends Module {
 	}
 
 
+	addHighlightReason(key, data) {
+		if ( typeof key === 'object' && key.key ) {
+			data = key;
+			key = data.key;
+
+		} else if ( typeof data === 'string' )
+			data = {title: data};
+
+		data.value = data.key = key;
+		if ( ! data.i18n_key )
+			data.i18n_key = `hl-reason.${key}`;
+
+		if ( this._hl_reasons[key] )
+			throw new Error(`Highlight Reason already exists with key ${key}`);
+
+		this._hl_reasons[key] = data;
+	}
+
+	getHighlightReasons() {
+		return Object.values(this._hl_reasons);
+	}
+
 	addTokenizer(tokenizer) {
 		const type = tokenizer.type;
 		this.tokenizers[type] = tokenizer;
diff --git a/src/modules/chat/room.js b/src/modules/chat/room.js
index 86886574..9340c509 100644
--- a/src/modules/chat/room.js
+++ b/src/modules/chat/room.js
@@ -111,6 +111,7 @@ export default class Room {
 				this.style.delete('css');
 
 			this.buildModBadgeCSS();
+			this.buildVIPBadgeCSS();
 		}
 
 		if ( other.badges && ! this.badges ) {
@@ -331,6 +332,7 @@ export default class Room {
 			this.style.delete('css');
 
 		this.buildModBadgeCSS();
+		this.buildVIPBadgeCSS();
 
 		return true;
 	}
@@ -429,6 +431,28 @@ export default class Room {
 		this.buildBadgeCSS();
 	}
 
+	buildVIPBadgeCSS() {
+		if ( this.destroyed )
+			return;
+
+		if ( ! this.data || ! this.data.vip_badge || ! this.manager.context.get('chat.badges.custom-vip') )
+			return this.style.delete('vip-badge');
+
+		const urls = this.data.vip_badge,
+			image = `url("${urls[1]}")`;
+
+		let image_set;
+		if ( urls[2] || urls[4] )
+			image_set = `${WEBKIT}image-set(${image} 1x${urls[2] ? `, url("${urls[2]}") 2x` : ''}${urls[4] ? `, url("${urls[4]}") 4x` : ''})`;
+
+		this.style.set('vip-badge', `[data-room-id="${this.id}"] .ffz-badge[data-badge="vip"] {
+			background-color: transparent;
+			background-image: ${image};
+			${image_set ? `background-image: ${image_set};` : ''}
+			${WEBKIT}mask-image: unset;
+		}`);
+	}
+
 	buildModBadgeCSS() {
 		if ( this.destroyed )
 			return;
diff --git a/src/modules/chat/tokenizers.jsx b/src/modules/chat/tokenizers.jsx
index 3d78814c..e36b1ade 100644
--- a/src/modules/chat/tokenizers.jsx
+++ b/src/modules/chat/tokenizers.jsx
@@ -1693,11 +1693,13 @@ export const TwitchEmotes = {
 
 				let src, srcSet;
 				let src2, srcSet2;
+				let can_big = true;
 
 				const replacement = REPLACEMENTS[e_id];
 				if ( replacement && use_replacements ) {
 					src = `${REPLACEMENT_BASE}${replacement}`;
 					srcSet = '';
+					can_big = false;
 
 				} else {
 					src = `${TWITCH_EMOTE_BASE}${e_id}/1.0`;
@@ -1718,7 +1720,8 @@ export const TwitchEmotes = {
 					src2,
 					srcSet2,
 					big,
-					can_big: true,
+					can_big,
+					height: 28, // Not always accurate but close enough.
 					text: text.slice(e_start - t_start, e_end - t_start).join(''),
 					modifiers: []
 				});
diff --git a/src/modules/main_menu/components/setting-select-box.vue b/src/modules/main_menu/components/setting-select-box.vue
index 3e9a79d6..143bf8ef 100644
--- a/src/modules/main_menu/components/setting-select-box.vue
+++ b/src/modules/main_menu/components/setting-select-box.vue
@@ -3,8 +3,8 @@
 		:class="{inherits: isInherited, default: isDefault}"
 		class="ffz--widget ffz--select-box"
 	>
-		<div class="tw-flex tw-align-items-center">
-			<label :for="item.full_key">
+		<div class="tw-flex tw-align-items-start">
+			<label :for="item.full_key" class="tw-mg-y-05">
 				{{ t(item.i18n_key, item.title) }}
 				<span v-if="unseen" class="tw-pill">{{ t('setting.new', 'New') }}</span>
 			</label>
@@ -12,6 +12,8 @@
 			<select
 				:id="item.full_key"
 				ref="control"
+				:multiple="item.multiple || false"
+				:size="item.size || 0"
 				class="tw-border-radius-medium tw-font-size-6 ffz-select tw-pd-l-1 tw-pd-r-3 tw-pd-y-05 tw-mg-05"
 				@change="onChange"
 			>
@@ -25,7 +27,7 @@
 						<option
 							v-for="j in i.entries"
 							:key="j.value"
-							:selected="j.value === value"
+							:selected="item.multiple ? (Array.isArray(value) && value.includes(j.value)) : j.value === value"
 							:value="j.v"
 						>
 							{{ j.i18n_key ? t(j.i18n_key, j.title, j) : j.title }}
@@ -34,7 +36,7 @@
 					<option
 						v-else
 						:key="i.value"
-						:selected="i.value === value"
+						:selected="item.multiple ? (Array.isArray(value) && value.includes(i.value)) : i.value === value"
 						:value="i.v"
 					>
 						{{ i.i18n_key ? t(i.i18n_key, i.title, i) : i.title }}
@@ -119,6 +121,20 @@ export default {
 
 	methods: {
 		onChange() {
+			if ( this.item.multiple ) {
+				const items = this.$refs.control.selectedOptions,
+					out = [];
+
+				for(let i=0; i < items.length; i++) {
+					const raw = this.data[items[i].index];
+					if ( raw )
+						out.push(raw.value);
+				}
+
+				this.set(out)
+				return;
+			}
+
 			const idx = this.$refs.control.value,
 				raw_value = this.data[idx];
 
diff --git a/src/player.js b/src/player.js
index 1cf3afeb..e3e17a24 100644
--- a/src/player.js
+++ b/src/player.js
@@ -40,7 +40,7 @@ class FrankerFaceZ extends Module {
 
 		this.core_log = this.log.get('core');
 
-		this.log.info(`FrankerFaceZ Standalone Player v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''})`);
+		this.log.info(`FrankerFaceZ Standalone Player v${VER} (build ${VER.build}${VER.commit ? ` - commit ${VER.commit}` : ''}) (initial ${location})`);
 
 
 		// ========================================================================
diff --git a/src/settings/types.js b/src/settings/types.js
index 55ae3753..dfed0291 100644
--- a/src/settings/types.js
+++ b/src/settings/types.js
@@ -44,6 +44,33 @@ export const object_merge = {
 }
 
 
+export const basic_array_merge = {
+	get(key, profiles, log) {
+		const values = [],
+			sources = [];
+
+		for(const profile of profiles)
+			if ( profile.has(key) ) {
+				const val = profile.get(key);
+				if ( ! Array.isArray(val) ) {
+					log.warn(`Profile #${profile.id} has an invalid value for "${key}"`);
+					continue;
+				}
+
+				sources.push(profile.id);
+				for(const v of val)
+					values.push(v);
+			}
+
+		if ( sources.length )
+			return [
+				values,
+				sources
+			]
+	}
+}
+
+
 export const array_merge = {
 	default(val) {
 		const values = [];
diff --git a/src/sites/shared/player.jsx b/src/sites/shared/player.jsx
index 70239f70..4a3f4b64 100644
--- a/src/sites/shared/player.jsx
+++ b/src/sites/shared/player.jsx
@@ -597,16 +597,31 @@ export default class PlayerBase extends Module {
 
 		cls.prototype.ffzUpdateState = function() {
 			this._ffz_state_raf = null;
-			const cont = this.props.containerRef,
-				player = this.props.mediaPlayerInstance;
+			const cont = this.props.containerRef;
 			if ( ! cont )
 				return;
 
 			const ds = cont.dataset;
 			ds.controls = this.state?.active || false;
 
-			ds.ended = player?.state?.playerState === 'Ended';
-			ds.paused = player?.state?.playerState === 'Idle';
+			let player = this.props.mediaPlayerInstance;
+			if ( ! player )
+				return;
+
+			if ( player.core )
+				player = player.core;
+
+			const state = player.state?.state;
+			if ( state === 'Playing' ) {
+				const video = player.mediaSinkManager?.video;
+				if ( video?._ffz_maybe_compress ) {
+					video._ffz_maybe_compress = false;
+					t.compressPlayer(this);
+				}
+			}
+
+			ds.ended = state === 'Ended';
+			ds.paused = state === 'Idle';
 		}
 
 		cls.prototype.ffzAttachListeners = function() {
@@ -780,7 +795,7 @@ export default class PlayerBase extends Module {
 	}
 
 	stopPlayer(player, events, inst) {
-		if ( player && player.pause && (player.getPlayerState?.() || player.core?.getPlayerState?.()) === 'Playing' )
+		if ( player && player.pause && (player.getState?.() || player.core?.getState?.()) === 'Playing' )
 			player.pause();
 		else if ( events && ! events._ffz_stopping ) {
 			events._ffz_stopping = true;
@@ -978,12 +993,14 @@ export default class PlayerBase extends Module {
 		if ( ! video || ! HAS_COMPRESSOR )
 			return;
 
+		video._ffz_maybe_compress = false;
 		const compressed = video._ffz_compressed || false;
-		let wanted = this.settings.get('player.compressor.default');
+		let wanted = video._ffz_toggled ? video._ffz_state : this.settings.get('player.compressor.default');
 		if ( e != null ) {
 			e.preventDefault();
 			video._ffz_toggled = true;
 			wanted = ! video._ffz_compressed;
+			video._ffz_state = wanted;
 		}
 
 		if ( ! video._ffz_compressor ) {
@@ -1406,6 +1423,10 @@ export default class PlayerBase extends Module {
 			const new_vid = createElement('video'),
 				vol = video?.volume ?? player.getVolume(),
 				muted = player.isMuted();
+
+			new_vid._ffz_state = video._ffz_state;
+			new_vid._ffz_toggled = video._ffz_toggled;
+			new_vid._ffz_maybe_compress = true;
 			new_vid.volume = muted ? 0 : vol;
 			new_vid.playsInline = true;
 			this.installPlaybackRate(new_vid);
diff --git a/styles/native/text.scss b/styles/native/text.scss
index 4d08e469..388acd8c 100644
--- a/styles/native/text.scss
+++ b/styles/native/text.scss
@@ -144,7 +144,7 @@
 	padding: .2rem 0
 }
 
-.ffz-input, .ffz-select {
+.ffz-input, .ffz-select:not([multiple]) {
 	height: 3rem;
 }
 
@@ -160,22 +160,26 @@
 	-moz-appearance: none;
 	-webkit-appearance: none;
 	appearance: none;
-	background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%230e0e10' d='M10.5 13.683l2.85-2.442 1.3 1.518-3.337 2.86a1.25 1.25 0 01-1.626 0l-3.338-2.86 1.302-1.518 2.849 2.442zm0-7.366L7.65 8.76l-1.3-1.518 3.337-2.86a1.25 1.25 0 011.627 0l3.337 2.86-1.302 1.518L10.5 6.317z'/%3E%3C/svg%3E");
-	background-position: right .8rem center;
-	background-repeat: no-repeat;
-	background-size: 2rem;
+
+	&:not([multiple]) {
+		background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%230e0e10' d='M10.5 13.683l2.85-2.442 1.3 1.518-3.337 2.86a1.25 1.25 0 01-1.626 0l-3.338-2.86 1.302-1.518 2.849 2.442zm0-7.366L7.65 8.76l-1.3-1.518 3.337-2.86a1.25 1.25 0 011.627 0l3.337 2.86-1.302 1.518L10.5 6.317z'/%3E%3C/svg%3E");
+		background-position: right .8rem center;
+		background-repeat: no-repeat;
+		background-size: 2rem;
+	}
+
 	border: var(--border-width-input) solid var(--color-border-input);
 	color: var(--color-text-input);
 	cursor: pointer;
 	line-height: 1.5;
 	line-height: normal;
 
-	.tw-root--theme-dark & {
+	.tw-root--theme-dark &:not([multiple]) {
 		background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23efeff1' d='M10.5 13.683l2.85-2.442 1.3 1.518-3.337 2.86a1.25 1.25 0 01-1.626 0l-3.338-2.86 1.302-1.518 2.849 2.442zm0-7.366L7.65 8.76l-1.3-1.518 3.337-2.86a1.25 1.25 0 011.627 0l3.337 2.86-1.302 1.518L10.5 6.317z'/%3E%3C/svg%3E");
 	}
 
 	// option isn't scoped, unlike default Twitch, to avoid flicker
-	&[data-focus-visible-added], option {
+	&[data-focus-visible-added], &:not([multiple]) option {
 		background-color: var(--color-background-input-focus);
 		border-color: var(--color-border-input-focus)
 	}