From 8fb51dc06bf718939897ed124a5ecb5a385e5947 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Thu, 13 Aug 2020 14:00:47 -0400
Subject: [PATCH] 4.20.30

* Added: Support for Twitch's native chat replies style.
* Added: Option to display in-line actions on hover.
* Added: Option for changing the current replies style, including a choice to disable replies.
* Fixed: Hover styling for elements including rich chat embeds due to a removed CSS class.
---
 package.json                                  |  2 +-
 src/modules/chat/actions/index.jsx            | 10 +-
 src/modules/chat/actions/types.jsx            |  2 +-
 src/modules/chat/components/chat-rich.vue     |  2 +-
 src/modules/chat/index.js                     |  2 -
 src/modules/chat/tokenizers.jsx               | 14 +--
 .../main_menu/components/action-editor.vue    | 20 ++++
 src/settings/context.js                       |  2 +-
 .../twitch-twilight/modules/chat/index.js     | 16 ++++
 .../twitch-twilight/modules/chat/line.js      | 95 ++++++++++++++-----
 .../modules/chat/rich_content.jsx             |  2 +-
 .../modules/chat/settings_menu.jsx            |  6 +-
 .../css_tweaks/styles/chat-padding.scss       |  2 +-
 .../modules/directory/following.jsx           |  4 +-
 src/sites/twitch-twilight/styles/chat.scss    | 22 +++++
 src/utilities/rich_tokens.js                  |  2 +-
 styles/chat.scss                              |  5 +
 17 files changed, 160 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index ef2699c0..beb9e479 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frankerfacez",
   "author": "Dan Salvato LLC",
-  "version": "4.20.29",
+  "version": "4.20.30",
   "description": "FrankerFaceZ is a Twitch enhancement suite.",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/src/modules/chat/actions/index.jsx b/src/modules/chat/actions/index.jsx
index 42affe17..7fa7cec7 100644
--- a/src/modules/chat/actions/index.jsx
+++ b/src/modules/chat/actions/index.jsx
@@ -484,11 +484,16 @@ export default class Actions extends Module {
 		const u = site.getUser(),
 			r = {id: line.props.channelID, login: room};
 
+		const has_replies = line.chatRepliesTreatment ? line.chatRepliesTreatment !== 'control' : false,
+			can_replies = has_replies && ! msg.deleted && ! line.props.disableReplyClick,
+			can_reply = can_replies && u.login !== msg.user?.login && ! msg.reply;
+
 		msg.roomId = r.id;
 
 		if ( u ) {
 			u.moderator = line.props.isCurrentUserModerator;
 			u.staff = line.props.isCurrentUserStaff;
+			u.can_reply = this.parent.context.get('chat.replies.style') === 2 && can_reply;
 		}
 
 		const current_level = this.getUserLevel(r, u),
@@ -629,6 +634,7 @@ export default class Actions extends Module {
 			let ap = data.appearance || {};
 			const disp = data.display || {},
 				keys = disp.keys,
+				hover = disp.hover,
 				act = this.actions[data.action];
 
 			if ( ! act || disp.disabled ||
@@ -661,12 +667,12 @@ export default class Actions extends Module {
 
 			let list = actions;
 
-			if ( keys )
+			if ( keys || hover )
 				list = modified;
 
 			had_action = true;
 			list.push(<button
-				class={`ffz-tooltip ffz-mod-icon mod-icon tw-c-text-alt-2${disabled ? ' disabled' : ''}${has_color ? ' colored' : ''}${keys ? ` ffz-modifier-${keys}` : ''}`}
+				class={`ffz-tooltip ffz-mod-icon mod-icon tw-c-text-alt-2${disabled ? ' disabled' : ''}${has_color ? ' colored' : ''}${keys ? ` ffz-modifier-${keys}` : ''}${hover ? ' ffz-hover' : ''}`}
 				disabled={disabled}
 				data-tooltip-type="action"
 				data-action={data.action}
diff --git a/src/modules/chat/actions/types.jsx b/src/modules/chat/actions/types.jsx
index c8de86b6..b509da79 100644
--- a/src/modules/chat/actions/types.jsx
+++ b/src/modules/chat/actions/types.jsx
@@ -16,7 +16,7 @@ export const reply = {
 	required_context: ['message'],
 
 	title: 'Reply to Message',
-	description: 'Allows you to directly reply to another user\'s message.',
+	description: 'Allows you to directly reply to another user\'s message. Only functions when the Chat Replies Style is "FrankerFaceZ".',
 
 	can_self: true,
 
diff --git a/src/modules/chat/components/chat-rich.vue b/src/modules/chat/components/chat-rich.vue
index 804a5137..350cf9b0 100644
--- a/src/modules/chat/components/chat-rich.vue
+++ b/src/modules/chat/components/chat-rich.vue
@@ -282,7 +282,7 @@ export default {
 					tooltip && 'ffz-tooltip',
 					this.accent && 'ffz-accent-card',
 					!this.error && 'tw-interactable--hover-enabled',
-					'tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--alpha tw-interactive'
+					'tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--default tw-interactive'
 				],
 				attrs: {
 					'data-tooltip-type': 'link',
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index 61baecfa..b88b9a28 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -1514,8 +1514,6 @@ export default class Chat extends Module {
 			return [];
 
 		let tokens = [{type: 'text', text: msg.message}];
-		if ( ! tokens[0].text )
-			return tokens;
 
 		for(const tokenizer of this.__tokenizers)
 			tokens = tokenizer.process.call(this, tokens, msg, user);
diff --git a/src/modules/chat/tokenizers.jsx b/src/modules/chat/tokenizers.jsx
index 0bce585f..efba64a8 100644
--- a/src/modules/chat/tokenizers.jsx
+++ b/src/modules/chat/tokenizers.jsx
@@ -250,7 +250,7 @@ export const Replies = {
 		}
 
 		return (<strong
-			class={`chat-line__message-mention ffz-tooltip ffz--reply-mention ffz-i-reply${token.me ? ' ffz--mention-me' : ''}`}
+			class={`chat-line__message-mention ffz--pointer-events ffz-tooltip ffz--reply-mention ffz-i-reply${token.me ? ' ffz--mention-me' : ''}`}
 			style={{color}}
 			data-tooltip-type="reply"
 			data-login={token.recipient}
@@ -311,7 +311,7 @@ export const Mentions = {
 		}
 
 		return (<strong
-			class={`chat-line__message-mention${token.me ? ' ffz--mention-me' : ''}`}
+			class={`chat-line__message-mention${token.me ? ' ffz--mention-me' : ''} ffz--pointer-events`}
 			style={{color}}
 			data-login={token.recipient}
 			onClick={this.handleMentionClick}
@@ -637,7 +637,7 @@ export const BlockedTerms = {
 		return (<strong
 			data-text={token.text}
 			data-tooltip-type="blocked"
-			class="ffz-tooltip ffz--blocked"
+			class="ffz-tooltip ffz--blocked ffz--pointer-events"
 			onClick={this.clickToReveal}
 		>
 			&times;&times;&times;
@@ -698,7 +698,7 @@ export const AutomoddedTerms = {
 			data-text={token.text}
 			data-categories={JSON.stringify(token.categories)}
 			data-tooltip-type="amterm"
-			class="ffz-tooltip ffz--blocked"
+			class="ffz-tooltip ffz--blocked ffz--pointer-events"
 			onClick={this.clickToReveal}
 		>
 			&times;&times;&times;
@@ -866,7 +866,7 @@ export const CheerEmotes = {
 
 	render(token, createElement) {
 		return (<span
-			class="ffz-cheer ffz-tooltip"
+			class="ffz-cheer ffz-tooltip ffz--pointer-events"
 			data-tooltip-type="cheer"
 			data-prefix={token.prefix}
 			data-amount={this.i18n.formatNumber(token.amount)}
@@ -1087,7 +1087,7 @@ export const AddonEmotes = {
 	render(token, createElement, wrapped) {
 		const mods = token.modifiers || [], ml = mods.length,
 			emote = (<img
-				class={`${EMOTE_CLASS} ffz-tooltip${token.provider === 'ffz' ? ' ffz-emote' : token.provider === 'emoji' ? ' ffz-emoji' : ''}`}
+				class={`${EMOTE_CLASS} ffz--pointer-events ffz-tooltip${token.provider === 'ffz' ? ' ffz-emote' : token.provider === 'emoji' ? ' ffz-emoji' : ''}`}
 				src={token.src}
 				srcSet={token.srcSet}
 				alt={token.text}
@@ -1110,7 +1110,7 @@ export const AddonEmotes = {
 		}
 
 		return (<div
-			class="ffz--inline modified-emote"
+			class="ffz--inline ffz--pointer-events modified-emote"
 			data-test-selector="emote-button"
 			data-provider={token.provider}
 			data-id={token.id}
diff --git a/src/modules/main_menu/components/action-editor.vue b/src/modules/main_menu/components/action-editor.vue
index 8c6cfb60..a3fa7f04 100644
--- a/src/modules/main_menu/components/action-editor.vue
+++ b/src/modules/main_menu/components/action-editor.vue
@@ -329,6 +329,22 @@
 										</span>
 									</label>
 								</div>
+
+								<div class="tw-pd-r-1 tw-checkbox">
+									<input
+										:id="'key_hover$' + id"
+										ref="key_hover"
+										:checked="edit_data.display.hover"
+										type="checkbox"
+										class="tw-checkbox__input"
+										@change="onChangeKeys"
+									>
+									<label :for="'key_hover$' + id" class="tw-checkbox__label">
+										<span class="tw-mg-l-1">
+											{{ t('setting.key.hover', 'Hover') }}
+										</span>
+									</label>
+								</div>
 							</div>
 						</div>
 					</div>
@@ -660,6 +676,9 @@ export default {
 					}));
 			}
 
+			if ( disp.hover )
+				out.push(this.t('setting.actions.visible.hover', 'when hovering'));
+
 			if ( ! out.length )
 				return this.t('setting.actions.visible.always', 'always');
 
@@ -693,6 +712,7 @@ export default {
 			if ( this.$refs.key_meta.checked )
 				i |= 8;
 
+			this.edit_data.display.hover = this.$refs.key_hover.checked;
 			this.edit_data.display.keys = i;
 		},
 
diff --git a/src/settings/context.js b/src/settings/context.js
index cff67d2d..e635331c 100644
--- a/src/settings/context.js
+++ b/src/settings/context.js
@@ -404,7 +404,7 @@ export default class SettingsContext extends EventEmitter {
 		if ( ! type )
 			throw new Error(`non-existent type for ${key}`)
 
-		return type.get(key, this.profiles(), this.manager.definitions.get(key), this.manager.log);
+		return type.get(key, this.profiles(), this.manager.definitions.get(key), this.manager.log, this);
 	}
 	/*	for(const profile of this.__profiles)
 			if ( profile.has(key) )
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index 58294e4e..dbb87183 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -250,6 +250,21 @@ export default class ChatHook extends Module {
 
 		// Settings
 
+		this.settings.add('chat.replies.style', {
+			default: 2,
+			ui: {
+				path: 'Chat > Appearance >> Replies',
+				title: 'Style',
+				description: `Twitch's default style makes entire messages clickable and adds a button to the right. FrankerFaceZ uses an In-Line Chat Action and does not make messages clickable.`,
+				component: 'setting-select-box',
+				data: [
+					{value: 0, title: 'Disabled'},
+					{value: 1, title: 'Vanilla Twitch'},
+					{value: 2, title: 'FrankerFaceZ'}
+				]
+			}
+		});
+
 		this.settings.add('channel.raids.no-autojoin', {
 			default: false,
 			ui: {
@@ -698,6 +713,7 @@ export default class ChatHook extends Module {
 		this.chat.context.on('changed:chat.points.allow-highlight', this.updateChatLines, this);
 		this.chat.context.on('changed:chat.filtering.display-deleted', this.updateChatLines, this);
 		this.chat.context.on('changed:chat.filtering.display-mod-action', this.updateChatLines, this);
+		this.chat.context.on('changed:chat.replies.style', this.updateChatLines, this);
 		this.chat.context.on('changed:chat.filtering.clickable-mentions', val => this.css_tweaks.toggle('clickable-mentions', val));
 		this.chat.context.on('changed:chat.filtering.bold-mentions', val => this.css_tweaks.toggle('chat-mention-no-bold', ! val));
 		this.chat.context.on('changed:chat.pin-resubs', val => {
diff --git a/src/sites/twitch-twilight/modules/chat/line.js b/src/sites/twitch-twilight/modules/chat/line.js
index 883c6ce1..fbf1e3c9 100644
--- a/src/sites/twitch-twilight/modules/chat/line.js
+++ b/src/sites/twitch-twilight/modules/chat/line.js
@@ -241,6 +241,11 @@ export default class ChatLine extends Module {
 			}
 
 			cls.prototype.ffzOpenReply = function() {
+				if ( this.props.reply ) {
+					this.setOPCardTray(this.props.reply);
+					return;
+				}
+
 				const old_render_author = this.renderMessageAuthor;
 				this.renderMessageAuthor = () => this.ffzReplyAuthor();
 
@@ -317,10 +322,11 @@ export default class ChatLine extends Module {
 
 				const types = t.parent.message_types || {},
 					deleted_count = this.props.deletedCount,
+					reply_mode = t.chat.context.get('chat.replies.style'),
 					override_mode = t.chat.context.get('chat.filtering.display-deleted'),
 
 					msg = t.chat.standardizeMessage(this.props.message),
-					reply_tokens = msg.ffz_reply = msg.ffz_reply || t.chat.tokenizeReply(this.props.reply),
+					reply_tokens = reply_mode === 2 ? ( msg.ffz_reply = msg.ffz_reply || t.chat.tokenizeReply(this.props.reply) ) : null,
 					is_action = msg.messageType === types.Action,
 
 					user = msg.user,
@@ -411,21 +417,27 @@ other {# messages were deleted by a moderator.}
 				//if ( ! msg.message && msg.messageParts )
 				//	t.chat.detokenizeMessage(msg);
 
-				const has_replies = this.chatRepliesTreatment ? this.chatRepliesTreatment !== 'control' : false;
-
 				const u = t.site.getUser(),
 					r = {id: room_id, login: room};
 
+				const has_replies = this.chatRepliesTreatment ? this.chatRepliesTreatment !== 'control' : false,
+					can_replies = has_replies && msg.message && ! msg.deleted && ! this.props.disableReplyClick,
+					can_reply = can_replies && u.login !== msg.user?.login && ! msg.reply,
+					twitch_clickable = reply_mode === 1 && can_replies && (!!msg.reply || can_reply);
+
 				if ( u ) {
 					u.moderator = this.props.isCurrentUserModerator;
 					u.staff = this.props.isCurrentUserStaff;
-					u.can_reply = has_replies && u.login !== msg.user?.login && ! msg.deleted && ! this.props.disableReplyClick
+					u.can_reply = reply_mode === 2 && can_reply;
 				}
 
 				const tokens = msg.ffz_tokens = msg.ffz_tokens || t.chat.tokenizeMessage(msg, u, r),
 					rich_content = FFZRichContent && t.chat.pluckRichContent(tokens, msg),
 					bg_css = msg.mentioned && msg.mention_color ? t.parent.inverse_colors.process(msg.mention_color) : null;
 
+				if ( ! this.ffz_open_reply )
+					this.ffz_open_reply = this.ffzOpenReply.bind(this);
+
 				if ( ! this.ffz_user_click_handler ) {
 					if ( this.props.onUsernameClick )
 						this.ffz_user_click_handler = event => {
@@ -473,30 +485,36 @@ other {# messages were deleted by a moderator.}
 
 				const override_name = t.overrides.getName(user.id);
 
-				let cls = `chat-line__message${show_class ? ' ffz--deleted-message' : ''}`,
+				const user_bits = [
+					t.actions.renderInline(msg, this.props.showModerationIcons, u, r, e),
+					e('span', {
+						className: 'chat-line__message--badges'
+					}, t.chat.badges.render(msg, e)),
+					e('span', {
+						className: `chat-line__username notranslate${override_name ? ' ffz--name-override tw-relative tw-tooltip-wrapper' : ''}`,
+						role: 'button',
+						style: { color },
+						onClick: this.ffz_user_click_handler,
+						onContextMenu: t.actions.handleUserContext
+					}, override_name ? [
+						e('span', {
+							className: 'chat-author__display-name'
+						}, override_name),
+						e('div', {
+							className: 'tw-tooltip tw-tooltip--down tw-tooltip--align-center'
+						}, user_block)
+					] : user_block)
+				];
+
+				let cls = `chat-line__message${show_class ? ' ffz--deleted-message' : ''}${twitch_clickable ? ' tw-relative' : ''}${twitch_clickable && can_reply ? ' tw-pd-r-3' : ''}`,
 					out = (tokens.length || ! msg.ffz_type) ? [
 						this.props.showTimestamps && e('span', {
 							className: 'chat-line__timestamp'
 						}, t.chat.formatTime(msg.timestamp)),
-						t.actions.renderInline(msg, this.props.showModerationIcons, u, r, e),
-						e('span', {
-							className: 'chat-line__message--badges'
-						}, t.chat.badges.render(msg, e)),
-						e('span', {
-							className: `chat-line__username notranslate${override_name ? ' ffz--name-override tw-relative tw-tooltip-wrapper' : ''}`,
-							role: 'button',
-							style: { color },
-							onClick: this.ffz_user_click_handler,
-							onContextMenu: t.actions.handleUserContext
-						}, override_name ? [
-							e('span', {
-								className: 'chat-author__display-name'
-							}, override_name),
-							e('div', {
-								className: 'tw-tooltip tw-tooltip--down tw-tooltip--align-center'
-							}, user_block)
-						] : user_block),
-						e('span', null, is_action ? ' ' : ': '),
+						twitch_clickable ?
+							e('div', {className: 'chat-line__username-container tw-inline-block'}, user_bits)
+							: user_bits,
+						e('span', {'aria-hidden': true}, is_action ? ' ' : ': '),
 						show && has_replies && reply_tokens ?
 							t.chat.renderTokens(reply_tokens, e)
 							: null,
@@ -504,7 +522,7 @@ other {# messages were deleted by a moderator.}
 							e('span', {
 								className:'message',
 								style: is_action ? { color } : null
-							}, t.chat.renderTokens(tokens, e, has_replies ? this.props.reply : null))
+							}, t.chat.renderTokens(tokens, e, (reply_mode !== 0 && has_replies) ? this.props.reply : null))
 							:
 							e('span', {
 								className: 'chat-line__message--deleted',
@@ -531,6 +549,33 @@ other {# messages were deleted by a moderator.}
 						}, JSON.stringify([tokens, msg.emotes], null, 2))*/
 					] : null;
 
+				if ( twitch_clickable ) {
+					let btn = null;
+					if ( can_reply )
+						btn = e('div', {
+							className: 'chat-line__reply-icon tw-absolute tw-c-text-alt-2 tw-right-0 tw-top-0 ffz-tooltip ffz-tooltip--no-mouse',
+							'data-title': t.i18n.t('chat.actions.reply', 'Reply to Message')
+						}, [
+							e('div', {
+								className: 'chat-line__reply-icon-background tw-border-bottom-left-radius-medium tw-border-top-right-radius-medium tw-c-background-alt-2'
+							}),
+							e('figure', {className: 'ffz-i-reply'})
+						]);
+
+					out = [
+						e('button', {
+							className: 'ffz--reply-container chat-line__reply-button-container tw-interactive tw-link tw-link--button',
+							'data-test-selector': 'chat-reply-button',
+							onClick: this.ffz_open_reply
+						}, e('div', {className: 'chat-line__reply-button'}, btn)),
+
+						e('div', {className: 'chat-line__message-container tw-relative'}, [
+							this.renderReplyLine(),
+							out
+						])
+					];
+				}
+
 				if ( msg.ffz_type === 'sub_mystery' ) {
 					const mystery = msg.mystery;
 					if ( mystery )
diff --git a/src/sites/twitch-twilight/modules/chat/rich_content.jsx b/src/sites/twitch-twilight/modules/chat/rich_content.jsx
index 61f22169..363083ac 100644
--- a/src/sites/twitch-twilight/modules/chat/rich_content.jsx
+++ b/src/sites/twitch-twilight/modules/chat/rich_content.jsx
@@ -227,7 +227,7 @@ export default class RichContent extends Module {
 				const tooltip = this.props.card_tooltip && this.state.full && ! this.props.force_full;
 				if ( this.state.url ) {
 					content = (<a
-						class={`${tooltip ? 'ffz-tooltip ' : ''}${this.state.accent ? 'ffz-accent-card ' : ''}${this.state.error ? 'tw-interactable--hover-enabled ': ''} tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--alpha tw-interactive`}
+						class={`${tooltip ? 'ffz-tooltip ' : ''}${this.state.accent ? 'ffz-accent-card ' : ''}${this.state.error ? '': 'tw-interactable--hover-enabled '}tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--default tw-interactive`}
 						data-tooltip-type="link"
 						data-url={this.state.url}
 						data-is-mail={false}
diff --git a/src/sites/twitch-twilight/modules/chat/settings_menu.jsx b/src/sites/twitch-twilight/modules/chat/settings_menu.jsx
index 714f8bc8..ddafb703 100644
--- a/src/sites/twitch-twilight/modules/chat/settings_menu.jsx
+++ b/src/sites/twitch-twilight/modules/chat/settings_menu.jsx
@@ -57,7 +57,7 @@ export default class SettingsMenu extends Module {
 					this.ffzPauseClick = () => this.setState({ffzPauseMenu: ! this.state.ffzPauseMenu});
 
 				val.props.children.push(<div class="tw-full-width tw-relative">
-					<button class="tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--hover-enabled tw-interactable--alpha tw-interactive" onClick={this.ffzSettingsClick}>
+					<button class="tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--hover-enabled tw-interactable--default tw-interactive" onClick={this.ffzSettingsClick}>
 						<div class="tw-align-items-center tw-flex tw-pd-05 tw-relative">
 							<div class="tw-flex-grow-1">
 								{t.i18n.t('site.menu_button', 'FrankerFaceZ Control Center')}
@@ -85,7 +85,7 @@ export default class SettingsMenu extends Module {
 
 				val.props.children.push(<div class="tw-full-width tw-relative">
 					<button
-						class="tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--hover-enabled tw-interactable--alpha tw-interactive"
+						class="tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--hover-enabled tw-interactable--default tw-interactive"
 						onClick={this.ffzPauseClick}
 					>
 						<div class="tw-align-items-center tw-flex tw-pd-05 tw-relative">
@@ -143,7 +143,7 @@ export default class SettingsMenu extends Module {
 													</p>
 												</div>
 												<button
-													class="tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--hover-enabled tw-interactable--alpha tw-interactive"
+													class="tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--hover-enabled tw-interactable--default tw-interactive"
 													data-page="chat.behavior"
 													onClick={this.ffzSettingsClick}
 												>
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-padding.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-padding.scss
index 5a09c824..0c652f73 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-padding.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-padding.scss
@@ -2,7 +2,7 @@
 .chat-line__moderation,
 .chat-line__status,
 .chat-line__raid {
-	padding: .5rem 1rem !important;
+	padding: .5rem 1rem;
 }
 
 .ffz--points-line,
diff --git a/src/sites/twitch-twilight/modules/directory/following.jsx b/src/sites/twitch-twilight/modules/directory/following.jsx
index 66446ced..5e09c377 100644
--- a/src/sites/twitch-twilight/modules/directory/following.jsx
+++ b/src/sites/twitch-twilight/modules/directory/following.jsx
@@ -160,7 +160,7 @@ export default class Following extends SiteModule {
 
 		// Hosted Channel Content
 		simplebarContentChildren.push(<a
-			class="tw-block tw-border-radius-small tw-full-width tw-interactable tw-interactable--alpha tw-interactive"
+			class="tw-block tw-border-radius-small tw-full-width tw-interactable tw-interactable--default tw-interactable--hover-enabled tw-interactive"
 			href={`/${inst.props.channelLogin}`}
 			onClick={e => this.parent.hijackUserClick(e, inst.props.channelLogin, this.destroyHostMenu.bind(this))} // eslint-disable-line react/jsx-no-bind
 		>
@@ -182,7 +182,7 @@ export default class Following extends SiteModule {
 		// Hosting Channels Content
 		for (const channel of channels) {
 			simplebarContentChildren.push(<a
-				class="tw-block tw-border-radius-small tw-full-width tw-interactable tw-interactable--alpha tw-interactive"
+				class="tw-block tw-border-radius-small tw-full-width tw-interactable tw-interactable--default tw-interactable--hover-enabled tw-interactive"
 				href={`/${channel.login}`}
 				onClick={e => this.parent.hijackUserClick(e, channel.login, this.destroyHostMenu.bind(this))} // eslint-disable-line react/jsx-no-bind
 			>
diff --git a/src/sites/twitch-twilight/styles/chat.scss b/src/sites/twitch-twilight/styles/chat.scss
index e764d882..f929a0ef 100644
--- a/src/sites/twitch-twilight/styles/chat.scss
+++ b/src/sites/twitch-twilight/styles/chat.scss
@@ -13,6 +13,10 @@
 	cursor: pointer;
 }
 
+.ffz--pointer-events {
+	pointer-events: all;
+}
+
 .ffz--freeze-indicator {
 	pointer-events: none;
 }
@@ -55,6 +59,24 @@
 	pointer-events: none;
 }
 
+.ffz--reply-container {
+	height: 100% !important;
+	width: 100% !important;
+	left: 0 !important;
+	right: 0 !important;
+
+	.chat-line__reply-icon {
+		padding: 0;
+
+		figure {
+			position: absolute;
+			z-index: 1;
+			top: 0.25rem;
+			right: 0.25rem;
+		}
+	}
+}
+
 .ffz--reply-mention {
 	padding: 0.25rem 0.5rem;
 	border-radius: 1rem;
diff --git a/src/utilities/rich_tokens.js b/src/utilities/rich_tokens.js
index e8d2d500..3f205a6c 100644
--- a/src/utilities/rich_tokens.js
+++ b/src/utilities/rich_tokens.js
@@ -816,7 +816,7 @@ TOKEN_TYPES.link = function(token, createElement, ctx) {
 
 	const klass = [];
 	if ( token.interactive )
-		klass.push(`tw-interactable tw-interactable--hover-enabled tw-interactable--alpha tw-interactive`);
+		klass.push(`tw-interactable tw-interactable--hover-enabled tw-interactable--default tw-interactive`);
 
 	if ( token.tooltip !== false )
 		klass.push('ffz-tooltip');
diff --git a/styles/chat.scss b/styles/chat.scss
index f30a6f71..a4238f87 100644
--- a/styles/chat.scss
+++ b/styles/chat.scss
@@ -334,6 +334,11 @@
 		margin: 0 .5rem;
 		display: none;
 	}
+
+
+	.chat-line__message:hover & .ffz-hover {
+		display: inline-flex;
+	}
 }
 
 .ffz--keys {