From a081247fdc1f0177f106a52c819e19fdb81865af Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Tue, 14 Nov 2017 04:11:43 -0500
Subject: [PATCH] Improve support for interactive tooltips. Allow chat
 tokenizers to supply custom delays and interactive flags for their tooltips.
 Wrap text in <span> elements. Fix bug with stream uptime metadata. Fix bug
 with fine-router. Add method to EventEmitter that wraps emit in a try/catch.
 Add lilz to the socket server lineup.

---
 changelog.html                      | 24 ++++++++++++
 src/main.js                         |  2 +-
 src/modules/chat/index.js           | 22 +++++++++--
 src/modules/chat/room.js            |  7 +++-
 src/modules/chat/tokenizers.js      | 15 ++++++++
 src/modules/metadata.js             |  9 ++++-
 src/modules/tooltips.js             | 36 +++++++++++++++++-
 src/sites/twitch-twilight/index.js  |  2 +-
 src/utilities/compat/fine-router.js |  6 +--
 src/utilities/constants.js          |  3 +-
 src/utilities/events.js             |  9 +++++
 src/utilities/tooltip.js            | 58 ++++++++++++++++++-----------
 styles/tooltips.scss                |  2 -
 styles/widgets.scss                 | 13 +++++--
 14 files changed, 168 insertions(+), 40 deletions(-)

diff --git a/changelog.html b/changelog.html
index 96dad766..e062c1da 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,27 @@
+<div class="list-header">4.0.0-beta1.3<span>@b86de82715b14711a01c</span> <time datetime="2017-11-13">(2017-11-13)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Added: Freeze Chat Scrolling</li>
+	<li>Changed: Wrap chat line text in <code>&lt;span&gt;</code> elements for greater compatibility.</li>
+</ul>
+
+<div class="list-header">4.0.0-beta1.2<span>@5ddb43a7481741a4fdec</span> <time datetime="2017-11-13">(2017-11-13)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Stop running the FFZ script on certain Twitch subdomains.</li>
+</ul>
+
+<div class="list-header">4.0.0-beta1.2<span>@843d3308f09fa8d42276</span> <time datetime="2017-11-13">(2017-11-13)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Not catching errors when emitting events.</li>
+	<li>Fixed: lastResult is null when getting stream uptime.</li>
+</ul>
+
+<div class="list-header">4.0.0-beta1.2<span>@a2ef3cb4f248129b2a3b</span> <time datetime="2017-11-13">(2017-11-13)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Added: New socket server: <code>lilz.frankerfacez.com</code></li>
+	<li>Fixed: Avoid hiding page content when the FFZ menu is maximized to avoid causing scrolling issues.</li>
+	<li>Fixed: Stop modifying the games directory query until we have a better way to modify queries.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta1 <time datetime="2017-11-12">(2017-11-12)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>This is the initial release of the complete rewrite, FrankerFaceZ v4.</li>
diff --git a/src/main.js b/src/main.js
index 18927709..25923e22 100644
--- a/src/main.js
+++ b/src/main.js
@@ -95,7 +95,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-beta1.1',
+	major: 4, minor: 0, revision: 0, extra: '-beta1.3',
 	build: __webpack_hash__,
 	toString: () =>
 		`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index 3de0af36..4668b101 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -108,6 +108,15 @@ export default class Chat extends Module {
 			}
 		});
 
+		this.settings.add('tooltip.link-interaction', {
+			default: true,
+			ui: {
+				path: 'Chat > Tooltips >> Links',
+				title: 'Allow interaction with supported link tooltips.',
+				component: 'setting-check-box'
+			}
+		});
+
 		this.settings.add('tooltip.link-images', {
 			default: true,
 			requires: ['tooltip.images'],
@@ -380,8 +389,13 @@ export default class Chat extends Module {
 		if ( tokenizer.priority == null )
 			tokenizer.priority = 0;
 
-		if ( tokenizer.tooltip )
-			this.tooltips.types[type] = tokenizer.tooltip.bind(this);
+		if ( tokenizer.tooltip ) {
+			const tt = tokenizer.tooltip;
+			const tk = this.tooltips.types[type] = tt.bind(this);
+
+			for(const i of ['interactive', 'delayShow', 'delayHide'])
+				tk[i] = typeof tt[i] === 'function' ? tt[i].bind(this) : tt[i];
+		}
 
 		this.__tokenizers.push(tokenizer);
 		this.__tokenizers.sort((a, b) => {
@@ -450,7 +464,9 @@ export default class Chat extends Module {
 			let res;
 
 			if ( type === 'text' )
-				res = token.text;
+				res = e('span', {
+					'data-a-target': 'chat-message-text'
+				}, token.text);
 
 			else if ( tk )
 				res = tk.render.call(this, token, e);
diff --git a/src/modules/chat/room.js b/src/modules/chat/room.js
index a9bbd643..ace10d80 100644
--- a/src/modules/chat/room.js
+++ b/src/modules/chat/room.js
@@ -36,7 +36,10 @@ export default class Room extends EventEmitter {
 		this.users = [];
 		this.user_ids = [];
 
-		this.load_data();
+		if ( this.login ) {
+			this.manager.socket.subscribe(`room.${login}`);
+			this.load_data();
+		}
 	}
 
 	destroy() {
@@ -44,6 +47,8 @@ export default class Room extends EventEmitter {
 		this._destroy_timer = null;
 		this.destroyed = true;
 
+		this.manager.socket.unsubscribe(`room.${this.login}`);
+
 		this.style.destroy();
 
 		if ( this.manager.room_ids[this.id] === this )
diff --git a/src/modules/chat/tokenizers.js b/src/modules/chat/tokenizers.js
index bc44acad..2b945b77 100644
--- a/src/modules/chat/tokenizers.js
+++ b/src/modules/chat/tokenizers.js
@@ -140,6 +140,21 @@ export const Links = {
 	}
 }
 
+Links.tooltip.interactive = function(target, tip) {
+	if ( ! this.context.get('tooltip.rich-links') || ! this.context.get('tooltip.link-interaction') || target.dataset.isMail === 'true' )
+		return false;
+
+	const info = this.get_link_info(target.dataset.url, true);
+	return info && info.interactive;
+};
+
+Links.tooltip.delayHide = function(target, tip) {
+	if ( ! this.context.get('tooltip.rich-links') || ! this.context.get('tooltip.link-interaction') || target.dataset.isMail === 'true' )
+		return 0;
+
+	return 64;
+};
+
 
 // ============================================================================
 // Rich Content
diff --git a/src/modules/metadata.js b/src/modules/metadata.js
index e7f1703d..5181b37d 100644
--- a/src/modules/metadata.js
+++ b/src/modules/metadata.js
@@ -61,11 +61,16 @@ export default class Metadata extends Module {
 			setup() {
 				const socket = this.resolve('socket'),
 					query = this.resolve('site.apollo').getQuery('ChannelPage_ChannelInfoBar_User'),
-					result = query.lastResult,
-					created_at = get('data.user.stream.createdAt', result);
+					result = query && query.lastResult,
+					created_at = result && get('data.user.stream.createdAt', result);
+
+				if ( ! query )
+					return {};
 
 				if ( created_at === undefined && ! query._ffz_refetched ) {
 					query._ffz_refetched = true;
+					if ( result )
+						result.stale = true;
 					query.refetch();
 					return {};
 				}
diff --git a/src/modules/tooltips.js b/src/modules/tooltips.js
index 21a55554..ef5aa3be 100644
--- a/src/modules/tooltips.js
+++ b/src/modules/tooltips.js
@@ -5,6 +5,7 @@
 // ============================================================================
 
 import {createElement as e} from 'utilities/dom';
+import {has, maybe_call} from 'utilities/object';
 
 import Tooltip from 'utilities/tooltip';
 import Module from 'utilities/module';
@@ -65,14 +66,47 @@ export default class TooltipProvider extends Module {
 	onEnable() {
 		this.tips = new Tooltip('[data-reactroot]', 'ffz-tooltip', {
 			html: true,
+			delayHide: this.checkDelayHide.bind(this),
+			delayShow: this.checkDelayShow.bind(this),
 			content: this.process.bind(this),
+			interactive: this.checkInteractive.bind(this),
 			popper: {
 				placement: 'top'
 			}
 		});
 	}
 
-	process(target, tip) { //eslint-disable-line class-methods-use-this
+	checkDelayShow(target, tip) {
+		const type = target.dataset.tooltipType,
+			handler = this.types[type];
+
+		if ( has(handler, 'delayShow') )
+			return maybe_call(handler.delayShow, null, target, tip);
+
+		return 0;
+	}
+
+	checkDelayHide(target, tip) {
+		const type = target.dataset.tooltipType,
+			handler = this.types[type];
+
+		if ( has(handler, 'delayHide') )
+			return maybe_call(handler.delayHide, null, target, tip);
+
+		return 0;
+	}
+
+	checkInteractive(target, tip) {
+		const type = target.dataset.tooltipType,
+			handler = this.types[type];
+
+		if ( has(handler, 'interactive') )
+			return maybe_call(handler.interactive, null, target, tip);
+
+		return false;
+	}
+
+	process(target, tip) {
 		const type = target.dataset.tooltipType,
 			handler = this.types[type];
 
diff --git a/src/sites/twitch-twilight/index.js b/src/sites/twitch-twilight/index.js
index 042e455e..33efb4e4 100644
--- a/src/sites/twitch-twilight/index.js
+++ b/src/sites/twitch-twilight/index.js
@@ -51,7 +51,7 @@ export default class Twilight extends BaseSite {
 		this.updateContext();
 
 		this.router.on(':route', (route, match) => {
-			this.log.info('Navigation', route && route.name, match[0]);
+			this.log.info('Navigation', route && route.name, match && match[0]);
 		});
 
 		document.head.appendChild(e('link', {
diff --git a/src/utilities/compat/fine-router.js b/src/utilities/compat/fine-router.js
index a04468a0..44e72795 100644
--- a/src/utilities/compat/fine-router.js
+++ b/src/utilities/compat/fine-router.js
@@ -52,14 +52,14 @@ export default class FineRouter extends Module {
 				this.log.debug('Matching Route', route, match);
 				this.current = route;
 				this.match = match;
-				this.emit(':route', route, match);
-				this.emit(`:route:${route.name}`, ...match);
+				this.emitSafe(':route', route, match);
+				this.emitSafe(`:route:${route.name}`, ...match);
 				return;
 			}
 		}
 
 		this.current = this.match = null;
-		this.emit(':route', null, null);
+		this.emitSafe(':route', null, null);
 	}
 
 	route(name, path) {
diff --git a/src/utilities/constants.js b/src/utilities/constants.js
index 378865b4..66969762 100644
--- a/src/utilities/constants.js
+++ b/src/utilities/constants.js
@@ -9,7 +9,8 @@ export const WS_CLUSTERS = {
 	Production: [
 		['wss://catbag.frankerfacez.com/', 0.25],
 		['wss://andknuckles.frankerfacez.com/', 1],
-		['wss://tuturu.frankerfacez.com/', 1]
+		['wss://tuturu.frankerfacez.com/', 1],
+		['wss://lilz.frankerfacez.com/', 1]
 	],
 
 	Development: [
diff --git a/src/utilities/events.js b/src/utilities/events.js
index ceebd5a1..ff8e26f8 100644
--- a/src/utilities/events.js
+++ b/src/utilities/events.js
@@ -160,6 +160,15 @@ export class EventEmitter {
 		}
 	}
 
+	emitSafe(event, ...args) {
+		try {
+			return [this.emit(event, ...args), undefined];
+
+		} catch(err) {
+			return [null, err];
+		}
+	}
+
 	emitAsync(event, ...args) {
 		const list = this.__listeners[event];
 		if ( ! list )
diff --git a/src/utilities/tooltip.js b/src/utilities/tooltip.js
index 7ff2b0ea..7cad1407 100644
--- a/src/utilities/tooltip.js
+++ b/src/utilities/tooltip.js
@@ -123,55 +123,60 @@ export class Tooltip {
 
 
 	_enter(target) {
-		let tip = target[this._accessor],
-			delay = this.options.delayShow;
-
+		let tip = target[this._accessor];
 		if ( ! tip )
 			tip = target[this._accessor] = {target};
 
 		tip.state = true;
 
+		if ( tip._show_timer ) {
+			clearTimeout(tip._show_timer);
+			tip._show_timer = null;
+		}
+
 		if ( tip.visible )
 			return;
 
+		const delay = maybe_call(this.options.delayShow, null, target, tip);
+
 		if ( delay === 0 )
 			this.show(tip);
 
-		else {
-			if ( tip._show_timer )
-				clearTimeout(tip._show_timer);
-
+		else
 			tip._show_timer = setTimeout(() => {
 				tip._show_timer = null;
 				if ( tip.state )
 					this.show(tip);
 			}, delay);
-		}
 	}
 
 	_exit(target) {
 		const tip = target[this._accessor];
-		if ( ! tip || ! tip.visible )
+		if ( ! tip )
 			return;
 
-		const delay = this.options.delayHide;
+			tip.state = false;
 
-		tip.state = false;
+		if ( tip._show_timer ) {
+			clearTimeout(tip._show_timer);
+			tip._show_timer = null;
+		}
+
+		if ( ! tip.visible )
+			return;
+
+		const delay = maybe_call(this.options.delayHide, null, target, tip);
 
 		if ( delay === 0 )
 			this.hide(tip);
 
-		else {
-			if ( tip._show_timer )
-				clearTimeout(tip._show_timer);
-
+		else
 			tip._show_timer = setTimeout(() => {
 				tip._show_timer = null;
 				if ( ! tip.state )
 					this.hide(tip);
 
 			}, delay);
-		}
 	}
 
 
@@ -207,11 +212,20 @@ export class Tooltip {
 
 		arrow.setAttribute('x-arrow', true);
 
-		if ( maybe_call(opts.interactive, null, target, tip) ) {
-			el.classList.add('interactive');
-			el.addEventListener('mouseover', () => this._enter(target));
-			el.addEventListener('mouseout', () => this._exit(target));
-		}
+		const interactive = maybe_call(opts.interactive, null, target, tip);
+		el.classList.toggle('interactive', interactive || false);
+
+		el.addEventListener('mouseover', () => {
+			if ( ! document.contains(target) )
+				this.hide(tip);
+
+			else if ( maybe_call(opts.interactive, null, target, tip) )
+				this._enter(target);
+			else
+				this._exit(target);
+		});
+
+		el.addEventListener('mouseout', () => this._exit(target));
 
 		// Assign our content. If there's a Promise, we'll need
 		// to do this weirdly.
@@ -219,7 +233,7 @@ export class Tooltip {
 			setter = use_html ? 'innerHTML' : 'textContent';
 
 		const pop_opts = Object.assign({
-			arrowElement: arrow,
+			arrowElement: arrow
 		}, opts.popper);
 
 		tip._update = () => {
diff --git a/styles/tooltips.scss b/styles/tooltips.scss
index 138754ff..36db1f11 100644
--- a/styles/tooltips.scss
+++ b/styles/tooltips.scss
@@ -11,11 +11,9 @@ body {
 	font-size: 1.2rem;
 	line-height: 1;
 	text-align: left;
-	pointer-events: none;
 	white-space: pre-wrap;
 
 	&.html { white-space: normal }
-	&.interactive { pointer-events: all }
 
 
 	.loader {
diff --git a/styles/widgets.scss b/styles/widgets.scss
index a95cf9b6..99930c00 100644
--- a/styles/widgets.scss
+++ b/styles/widgets.scss
@@ -127,15 +127,22 @@
 	.list-header {
 		margin: 10px 20px 5px;
 		padding: 15px 0 5px;
-		border-top: 1px solid #dad8de;
+		border-bottom: 1px solid #dad8de;
 		font-size: 16px;
-		text-transform: uppercase;
+		font-variant: small-caps;
 
 		.theme--dark & {
-			border-top-color: #2c2541;
+			border-bottom-color: #2c2541;
+		}
+
+		span {
+			opacity: 0.5;
+			font-size: 10px;
+			font-variant: normal;
 		}
 
 		time {
+			float: right;
 			opacity: 0.5;
 		}
 	}