From 5d3ba8778cc8c54a78d60ddecc7f8e7cdcca47da Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Tue, 25 Oct 2016 01:45:51 -0400
Subject: [PATCH] 3.5.346. Pass the modifier flag in from API emote sets.
 (Maybe just refactor how those emotes are treated entirely?) Fix emote
 duplication in the emote menu extension for people who use that.

---
 changelog.html          | 6 ++++++
 src/ember/chat-input.js | 4 +++-
 src/ext/api.js          | 1 +
 src/ext/emote_menu.js   | 3 +++
 src/main.js             | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index 6c01bd63..73ba9419 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">3.5.346 <time datetime="2016-10-25">(2016-10-25)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>API Fixed: Emoticons' <code>modifier</code> flags were not being accepted.</li>
+	<li>Fixed: Do not register FFZ emotes with the Emote Menu extension's API when BTTV is present to avoid duplication.</li>
+</ul>
+
 <div class="list-header">3.5.345 <time datetime="2016-10-23">(2016-10-23)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Bug preventing FFZ emoticons from working on browsers not supporting <code>Object.assign</code>.</li>
diff --git a/src/ember/chat-input.js b/src/ember/chat-input.js
index 214ba859..efb7b2d7 100644
--- a/src/ember/chat-input.js
+++ b/src/ember/chat-input.js
@@ -332,7 +332,9 @@ FFZ.prototype.modify_chat_input = function(component) {
 		ffz_chatters: [],
 
 		ffz_init: function() {
-			f._inputv = this;
+			// We don't want to store references to conversation input handlers.
+			if ( ! ConvoInput || ! (this.parentView instanceof ConvoInput) )
+				f._inputv = this;
 
 			var s = this._ffz_minimal_style = document.createElement('style');
 			s.id = 'ffz-minimal-chat-textarea-height';
diff --git a/src/ext/api.js b/src/ext/api.js
index d81a197c..0ecb7a06 100644
--- a/src/ext/api.js
+++ b/src/ext/api.js
@@ -209,6 +209,7 @@ API.prototype._load_set = function(real_id, set_id, data) {
 
 		new_emote.css = emote.css;
 		new_emote.margins = emote.margins;
+		new_emote.modifier = emote.modifier;
 
 		new_emote.srcSet = emote.urls[1] + ' 1x';
 		new_emote.urls[1] = emote.urls[1];
diff --git a/src/ext/emote_menu.js b/src/ext/emote_menu.js
index 43a14c37..288862c6 100644
--- a/src/ext/emote_menu.js
+++ b/src/ext/emote_menu.js
@@ -30,6 +30,9 @@ FFZ.prototype.setup_emote_menu = function(delay) {
 // --------------------
 
 FFZ.prototype._emote_menu_enumerator = function() {
+	if ( this.has_bttv )
+		return [];
+
 	var twitch_user = this.get_user(),
 		user_id = twitch_user ? twitch_user.login : null,
 		controller = utils.ember_lookup('controller:chat'),
diff --git a/src/main.js b/src/main.js
index fb1e87e0..f7e3f422 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 345,
+	major: 3, minor: 5, revision: 346,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}