From d3262d4fff758eded6965b4a6a5adf6cc08f9422 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Tue, 8 Nov 2016 16:43:02 -0500
Subject: [PATCH] 3.5.363. Properly position search popout. Dispatch events
 correctly for TwitchBot. Fix an issue with BTTV compatibility. Dark mode CSS
 tweaks.

---
 changelog.html      | 13 ++++++++-----
 dark.css            |  2 ++
 old_changes.html    |  5 +++++
 src/ember/layout.js |  1 +
 src/ember/line.js   | 14 ++++++++------
 src/ember/player.js |  2 +-
 src/ember/room.js   |  2 +-
 src/main.js         |  2 +-
 style.css           | 11 ++++++++++-
 9 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/changelog.html b/changelog.html
index cd42702e..54b01c71 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,11 @@
+<div class="list-header">3.5.363 <time datetime="2016-11-08">(2016-11-08)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Properly position Search popout when sidebars are swapped and in portrait mode.</li>
+	<li>Fixed: Dispatch events correctly when clicking mod icons for TwitchBot responses.</li>
+	<li>Fixed: Friend notices not appearing in chat when BetterTTV is also present.</li>
+	<li>Changed: Dark mode CSS tweaks.</li>
+</ul>
+
 <div class="list-header">3.5.362 <time datetime="2016-11-03">(2016-11-03)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Twitch changed how the player is sized, particularly in theater mode. This broke positioning of the player in several configurations.</li>
@@ -66,10 +74,5 @@
 	<li>Fixed: Group chat got broken.</li>
 </ul>
 
-<div class="list-header">3.5.352 <time datetime="2016-10-25">(2016-10-25)</time></div>
-<ul class="chat-menu-content menu-side-padding">
-	<li>Changed: More modifier CSS work.</li>
-</ul>
-
 <div class="list-header" id="ffz-old-news-button"><a href="#">View Older</a></div>
 <div id="ffz-old-news"></div>
\ No newline at end of file
diff --git a/dark.css b/dark.css
index f63ed4f9..a588c5dd 100644
--- a/dark.css
+++ b/dark.css
@@ -289,6 +289,7 @@ body.ffz-dark:not([data-page="teams#show"]),
 	background-color: #191919;
 }
 
+.ffz-dark select.pl-form__input,
 .ffz-dark .video-stats .form__input[type=search]:not(:focus):not(:hover) {
 	box-shadow: inset 0 0 1px rgba(255,255,255,0.2);
 }
@@ -483,6 +484,7 @@ body.ffz-dark:not([data-page="teams#show"]),
 
 /* Video Manager */
 
+.ffz-dark .player-menu-options,
 .ffz-dark ul.tabs:before,
 .ffz-dark .directory_header .nav:before,
 .ffz-dark ul.tabs_fake:before,
diff --git a/old_changes.html b/old_changes.html
index 42f44332..1665c317 100644
--- a/old_changes.html
+++ b/old_changes.html
@@ -1,3 +1,8 @@
+<div class="list-header">3.5.352 <time datetime="2016-10-25">(2016-10-25)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Changed: More modifier CSS work.</li>
+</ul>
+
 <div class="list-header">3.5.351 <time datetime="2016-10-25">(2016-10-25)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: <code>/untimeout</code> support.</li>
diff --git a/src/ember/layout.js b/src/ember/layout.js
index bc7ae62c..bfa60016 100644
--- a/src/ember/layout.js
+++ b/src/ember/layout.js
@@ -324,6 +324,7 @@ FFZ.prototype.setup_layout = function() {
 							'body[data-current-path^="user."] #left_col { overflow: hidden }' +
 							'body[data-current-path^="user."] #left_col .warp,' +
 							'body[data-current-path^="user."] #left_col,' +
+							'body[data-current-path^="user."] .searchPanel--slide,' +
 							'body[data-current-path^="user."]:not(.ffz-sidebar-swap) #main_col{' +
 								'margin-right:0 !important;' +
 								'top:' + video_top + 'px;' +
diff --git a/src/ember/line.js b/src/ember/line.js
index d9ec32c2..46ee79a4 100644
--- a/src/ember/line.js
+++ b/src/ember/line.js
@@ -2,6 +2,8 @@
 	utils = require("../utils"),
 	constants = require("../constants"),
 
+	TB_TOOLTIP = '<hr>This message was flagged by TwitchBot. Should it be allowed?',
+
 	BAN_SPLIT = /[/\.](?:ban ([^ ]+)|timeout ([^ ]+)(?: (\d+))?)(?: (.*))?$/;
 
 
@@ -726,7 +728,7 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
 			}
 		}.property("msgObject.message", "isChannelLinksDisabled", "currentUserNick", "msgObject.from", "msgObject.tags.emotes"),
 
-		lineChanged: Ember.observer("msgObject.deleted", "isModeratorOrHigher", "msgObject.ffz_old_messages", "ffzTokenizedMessage", function() {
+		lineChanged: Ember.observer("msgObject.deleted", "isModeratorOrHigher", "msgObject.ffz_old_messages", "ffzTokenizedMessage", "hasClickedFlaggedMessage", function() {
 			this.$(".mod-icons").replaceWith(this.buildModIconsHTML());
 			if ( this.get("msgObject.deleted") ) {
 				this.$(".message").replaceWith(this.buildDeletedMessageHTML());
@@ -774,9 +776,9 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
 
 			output = ['<span class="mod-icons">'];
 
-			if ( is_tb ) {
-				output.push('<a class="mod-icon html-tooltip tb-reject" title="Not Allowed">Not Allowed</a>');
-				output.push('<a class="mod-icon html-tooltip tb-allow" title="Allowed">Allowed</a>');
+			if ( is_tb && ! this.get('hasClickedFlaggedMessage') ) {
+				output.push('<a class="mod-icon html-tooltip tb-reject" title="Not Allowed' + TB_TOOLTIP + '">Not Allowed</a>');
+				output.push('<a class="mod-icon html-tooltip tb-allow" title="Allowed' + TB_TOOLTIP + '">Allowed</a>');
 			}
 
 			for(var i=0, l = f.settings.mod_buttons.length; i < l; i++) {
@@ -1135,10 +1137,10 @@ FFZ.prototype._modify_chat_subline = function(component) {
 				e.preventDefault();
 
 				if ( cl.contains('tb-reject') )
-					this.sendAction("clickedTwitchBotNo", this.get('msgObject.tags.id'));
+					this.actions.clickedTwitchBotResponse.call(this, this.get('msgObject.tags.id'), 'no');
 
 				else if ( cl.contains('tb-allow') )
-					this.sendAction("clickedTwitchBotYes", this.get('msgObject.tags.id'));
+					this.actions.clickedTwitchBotResponse.call(this, this.get('msgObject.tags.id'), 'yes');
 
 				else if ( cl.contains('ban') )
 					this.sendAction("banUser", {user:from});
diff --git a/src/ember/player.js b/src/ember/player.js
index 22368627..5315eb58 100644
--- a/src/ember/player.js
+++ b/src/ember/player.js
@@ -224,7 +224,7 @@ FFZ.prototype.modify_twitch_player = function(player) {
 
 			if ( el && ! container.querySelector('.js-player-reset') ) {
 				var btn_link = utils.createElement('a', 'player-text-link js-player-reset', 'Reset Player'),
-					btn = utils.createElement('p', 'player-menu__item player-menu__item--reset', btn_link);
+					btn = utils.createElement('p', 'player-menu__item player-menu__item--reset pl-small', btn_link);
 
 				btn_link.tabindex = '-1';
 				btn_link.href = '#';
diff --git a/src/ember/room.js b/src/ember/room.js
index 99f0a365..f215dc72 100644
--- a/src/ember/room.js
+++ b/src/ember/room.js
@@ -1255,7 +1255,7 @@ FFZ.prototype._modify_room = function(room) {
 
 		addFriendsWatchingMessage: function(msg) {
 			this.addMessage({
-				style: 'admin friend-watching',
+				style: 'admin' + (f.has_bttv ? '' : ' friend-watching'),
 				message: msg,
 				tags: {
 					emotes: tmimotes && tmimotes(this.get('userEmotes').tryParseEmotes(msg))
diff --git a/src/main.js b/src/main.js
index 5027570c..12d9d5ab 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: 362,
+	major: 3, minor: 5, revision: 363,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/style.css b/style.css
index 1c770eb8..aacb6bf0 100644
--- a/style.css
+++ b/style.css
@@ -1328,11 +1328,12 @@ img.channel_background[src="null"] { display: none; }
 }
 
 .ffz-moderation-card .info .stat {
-    pointer-events: auto;
+	pointer-events: auto;
 }
 
 .ffz-moderation-card .info.channel-stats .stat {
 	color: #fff !important;
+	padding-left: 10px;
 }
 
 .ffz-moderation-card .info.channel-stats .stat svg {
@@ -1517,6 +1518,9 @@ body:not(.ffz-hide-friends) .ffz-moderation-card .follow-button {
 	background-repeat: no-repeat;
 }
 
+.mod-icons .tb-allow { background-image: url("//cdn.frankerfacez.com/script/button_accept.svg") }
+.mod-icons .tb-reject { background-image: url("//cdn.frankerfacez.com/script/button_reject.svg") }
+
 .mod-icons .custom {
 	text-indent: 0 !important;
 	text-align: center;
@@ -2277,6 +2281,11 @@ body:not([data-current-path^="user."]) .ffz-sidebar-swap .ember-chat .chat-inter
 	left: 20px;
 }
 
+.ffz-sidebar-swap .searchPanel--slide {
+	left: auto;
+	right: 240px;
+}
+
 .ffz-sidebar-swap .cn-bar-fixed {
 	right: 50px;
 }