From e3cf6cb7777de1af6e9ed32d2db0f767f7b3972c Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Mon, 3 Oct 2016 20:08:44 -0400
Subject: [PATCH] 3.5.309. I'm silly and forgot to account for the player
 controls being shifted up when conversations are on the bottom of the screen.
 (Also, sub count fixes.) Closes #12

---
 changelog.html      | 10 ++++++++++
 src/ember/layout.js |  4 +++-
 src/main.js         |  2 +-
 src/ui/sub_count.js | 10 +++++-----
 style.css           |  9 ++++++++-
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/changelog.html b/changelog.html
index a662ba56..88269937 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,13 @@
+<div class="list-header">3.5.309 <time datetime="2016-10-03">(2016-10-03)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Properly position the Theater Mode metadata bar when whispers are at the bottom of the screen.</li>
+</ul>
+
+<div class="list-header">3.5.308 <time datetime="2016-10-03">(2016-10-03)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Dashboard subscriber count should hopefully now be accurate and include Twitch Prime subscriptions.</li>
+</ul>
+
 <div class="list-header">3.5.307 <time datetime="2016-10-03">(2016-10-03)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: Option to only allow tab-completing usernames when the tab completion was started via an at sign.</li>
diff --git a/src/ember/layout.js b/src/ember/layout.js
index 3283c4aa..d0eeab8a 100644
--- a/src/ember/layout.js
+++ b/src/ember/layout.js
@@ -317,7 +317,9 @@ FFZ.prototype.setup_layout = function() {
 							'body.ffz-sidebar-swap .cn-bar-fixed { left: 0 !important }' +
 							'.ffz-theater-stats .app-main.theatre .cn-metabar__more {' +
 								'max-width: calc(100% - 300px);' +
-								'bottom: ' + (theatre_video_bottom + 55) + 'px !important}';
+								'bottom: ' + (theatre_video_bottom + 55) + 'px !important}' +
+							'.ffz-theater-stats:not(.ffz-theatre-conversations):not(.ffz-top-conversations) .app-main.theatre .cn-metabar__more {' +
+								'bottom: ' + (theatre_video_bottom + 90) + 'px !important}';
 
 					}  else {
 						out += 'top: 0; right: ' + width + 'px}' +
diff --git a/src/main.js b/src/main.js
index 6568b423..9147ffd6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ FFZ.msg_commands = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 307,
+	major: 3, minor: 5, revision: 309,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/src/ui/sub_count.js b/src/ui/sub_count.js
index 8b00c39d..22ecb6b0 100644
--- a/src/ui/sub_count.js
+++ b/src/ui/sub_count.js
@@ -18,9 +18,9 @@ FFZ.prototype._update_subscribers = function() {
 
 	var user = this.get_user(), f = this,
 		match = this.is_dashboard ? location.pathname.match(/\/([^\/]+)/) : undefined,
-		id = this.is_dashboard && match && match[1];
+		channel_id = this.is_dashboard && match && match[1];
 
-	if ( this.has_bttv || ! id || id !== user.login ) {
+	if ( this.has_bttv || ! channel_id || channel_id !== user.login ) {
 		var el = document.querySelector("#ffz-sub-display");
 		if ( el )
 			el.parentElement.removeChild(el);
@@ -31,8 +31,8 @@ FFZ.prototype._update_subscribers = function() {
 	// context of the web user.
 
 	// Get the count!
-	jQuery.getJSON("/" + id + "/dashboard/revenue/summary_data").done(function(data) {
-		var el, sub_count = data && data.data && data.data.total_subscriptions;
+	utils.api.get("/api/channels/" + channel_id + "/subscriber_count").done(function(data) {
+		var el, sub_count = data && data.count;
 		if ( typeof sub_count === "string" )
 			sub_count = parseInt(sub_count.replace(/[,\.]/g, ""));
 
@@ -77,7 +77,7 @@ FFZ.prototype._update_subscribers = function() {
 			el = document.createElement('span');
 			stat.appendChild(el);
 
-			utils.api.get("chat/" + id + "/badges", null, {version: 3})
+			utils.api.get("chat/" + channel_id + "/badges", null, {version: 3})
 				.done(function(data) {
 					if ( data.subscriber && data.subscriber.image ) {
 						stat.innerHTML = '';
diff --git a/style.css b/style.css
index b8c33b8a..eb4ab54e 100644
--- a/style.css
+++ b/style.css
@@ -302,7 +302,6 @@ body.ffz-bttv-dark .ffz-ui-toggle.blue.live:hover svg.svg-emoticons path { fill:
 	color: #aaa;
 
 	position: fixed;
-	bottom: 55px;
 	left: 10px;
 
 	width: auto;
@@ -311,6 +310,14 @@ body.ffz-bttv-dark .ffz-ui-toggle.blue.live:hover svg.svg-emoticons path { fill:
 	padding: 10px;
 }
 
+.ffz-theater-stats .app-main.theatre .cn-metabar__more {
+	bottom: 55px;
+}
+
+.ffz-theater-stats:not(.ffz-theatre-conversations):not(.ffz-top-conversations) .app-main.theatre .cn-metabar__more {
+	bottom: 95px;
+}
+
 .ffz-theater-stats .app-main.theatre .cn-metabar__more span,
 .ffz-theater-stats .app-main.theatre .cn-metabar__more div { flex-grow: 0 !important }