';
content += '| Developers |
|---|
';
- content += '| Dan Salvato | | | |
';
+ content += '| Dan Salvato | | | |
';
content += '| Stendec | | | |
';
content += '| Version ' + FFZ.version_info + ' | Logs |
';
diff --git a/src/ui/dash_feed.js b/src/ui/dash_feed.js
new file mode 100644
index 00000000..27324c99
--- /dev/null
+++ b/src/ui/dash_feed.js
@@ -0,0 +1,197 @@
+var FFZ = window.FrankerFaceZ,
+ utils = require('../utils'),
+
+ createElement = utils.createElement;
+
+
+// -------------------
+// Settings
+// -------------------
+
+FFZ.settings_info.dashboard_feed = {
+ type: "boolean",
+ value: true,
+
+ no_mobile: true,
+ //no_bttv: true,
+
+ category: "Dashboard",
+ name: "Channel Feed (Requires Refresh)",
+ help: "Add a way to post to your channel feed directly to the dashboard!"
+}
+
+
+// -------------------
+// Initialization
+// -------------------
+
+FFZ.prototype.setup_dash_feed = function() {
+ var f = this,
+ user = this.get_user(),
+ match = this.is_dashboard ? location.pathname.match(/\/([^\/]+)/) : undefined,
+ id = this.is_dashboard && match && match[1];
+
+ if ( /*this.has_bttv ||*/ ! this.settings.dashboard_feed || ! user || ! id || id !== user.login )
+ return;
+
+ utils.api.get("feed/" + id + "/posts", {limit: 1}, {version: 3}).done(function(data) {
+ // If this works, then the feed is enabled. Show the UI.
+ /*if ( ! f.has_bttv )*/
+ f.build_dash_feed();
+ })
+}
+
+
+FFZ.prototype._remove_dash_feed = function() {
+ var tabs = document.querySelector('#ffz-feed-tabs'),
+ parent = tabs && tabs.parentElement,
+ tab_status = document.querySelector('div.dash-broadcast-contain');
+
+ if ( ! tabs || ! parent )
+ return;
+
+ if ( tab_status && tabs.contains(tab_status) ) {
+ tabs.removeChild(tab_status);
+ parent.insertBefore(tab_status, tabs);
+ }
+
+ parent.removeChild(tabs);
+}
+
+
+FFZ.prototype.build_dash_feed = function() {
+ var f = this,
+ user = this.get_user(),
+
+ tabs = createElement('div'),
+ tab_bar = createElement('ul', 'tabs'),
+
+ nav_status = createElement('li', 'tab', 'Broadcast Status'),
+ nav_feed = createElement('li', 'tab', 'Channel Feed'),
+
+ tab_status = document.querySelector('div.dash-broadcast-contain'),
+ tab_feed = createElement('div', 'dash-broadcast-contain dash-ffz-feed-contain hidden'),
+
+ txt_input = createElement('textarea', 'ffz-feed-entry'),
+ char_count = createElement('span', 'char-count', '0');
+ align_btn = createElement('div', 'ffz-feed-button clearfix'),
+ chk_share = createElement('span', null, ' Share to Twitter'),
+ checkbox = chk_share.querySelector('input'),
+ btn_submit = createElement('button', 'button primary', 'Post'),
+
+ column = tab_status && tab_status.parentElement,
+ placeholder = 'Post an update to your channel...';
+
+ if ( ! tab_status || ! column || ! user )
+ return;
+
+ tab_feed.appendChild(txt_input);
+ tab_feed.appendChild(align_btn);
+
+ if ( user.twitter_connected )
+ align_btn.appendChild(chk_share);
+ else {
+ var tnc = createElement('span', null, '(Twitter Not Connected)');
+ tnc.title = 'Click to Refresh';
+ tnc.style.cursor = 'pointer';
+ tnc.addEventListener('click', function() {
+ user = f.get_user();
+ if ( user.twitter_connected ) {
+ jQuery(tnc).trigger('mouseout');
+ align_btn.removeChild(tnc);
+ align_btn.insertBefore(chk_share, align_btn.firstChild);
+ }
+ });
+ jQuery(tnc).tipsy();
+ align_btn.appendChild(tnc);
+ }
+
+ char_count.title = 'Roughly the first 115 characters of a post will appear in a Tweet.';
+ jQuery(char_count).tipsy();
+
+ align_btn.appendChild(btn_submit);
+ align_btn.appendChild(char_count);
+
+ txt_input.id = 'vod_status';
+ txt_input.placeholder = placeholder;
+
+ var updater = function() {
+ var share = user.twitter_connected && checkbox && checkbox.checked || false,
+ len = txt_input.value.length;
+
+ char_count.innerHTML = share ? utils.number_commas(115 - len) + '+' : utils.number_commas(len);
+ char_count.classList.toggle('over-limit', share && 115-len < 0 || false);
+
+ if ( len === 0 )
+ txt_input.placeholder = placeholder;
+ }
+
+ checkbox.addEventListener('change', updater);
+ txt_input.addEventListener('input', updater);
+
+ btn_submit.addEventListener('click', function() {
+ var match = f.is_dashboard ? location.pathname.match(/\/([^\/]+)/) : undefined,
+ id = f.is_dashboard && match && match[1];
+
+ if ( ! id || this.disabled )
+ return;
+
+ var share = user.twitter_connected && checkbox && checkbox.checked || false,
+ body = txt_input.value;
+
+ txt_input.disabled = true;
+ btn_submit.disabled = true;
+
+ utils.api.post("feed/" + id + "/posts?share=" + JSON.stringify(share), {content: body, share: share}).done(function(data) {
+ txt_input.disabled = false;
+ btn_submit.disabled = false;
+
+ txt_input.value = '';
+
+ var tweeted = data.tweet ? " The update was tweeted out." : (share ? " There was a problem tweeting the update." : "");
+ txt_input.placeholder = 'The update was posted successfully.' + tweeted + ' Post another update to your channel...';
+ f.log("Channel Feed Posting Succeeded", data);
+
+ }).fail(function(data) {
+ txt_input.disabled = false;
+ btn_submit.disabled = false;
+
+ data = data ? data.data || data.responseJSON || undefined : undefined;
+ f.log("Channel Feed Posting Failed", data);
+ alert("An error occured posting to your channel feed:\n\n" + (data && data.message || "Unknown Error"));
+
+ });
+ });
+
+ var switch_tab = function(e) {
+ var to = this.getAttribute('data-nav');
+ jQuery('.selected', tab_bar).removeClass('selected');
+ this.classList.add('selected');
+
+ jQuery('.active-tab', tabs).removeClass('active-tab').addClass('hidden');
+ jQuery('div[data-tab="' + to + '"]', tabs).addClass('active-tab').removeClass('hidden');
+ }
+
+ tabs.id = 'ffz-feed-tabs';
+
+ nav_status.setAttribute('data-nav', 'status');
+ nav_feed.setAttribute('data-nav', 'feed');
+
+ nav_status.addEventListener('click', switch_tab);
+ nav_feed.addEventListener('click', switch_tab);
+
+ tab_status.setAttribute('data-tab', 'status');
+ tab_feed.setAttribute('data-tab', 'feed');
+
+ column.removeChild(tab_status);
+
+ tab_bar.appendChild(nav_status);
+ tab_bar.appendChild(nav_feed);
+
+ tabs.appendChild(tab_bar);
+ tabs.appendChild(tab_status);
+ tabs.appendChild(tab_feed);
+
+ column.insertBefore(tabs, column.firstChild);
+ switch_tab.call(nav_status);
+}
\ No newline at end of file
diff --git a/src/ui/dash_stats.js b/src/ui/dash_stats.js
index 27bef0a3..694f4a4b 100644
--- a/src/ui/dash_stats.js
+++ b/src/ui/dash_stats.js
@@ -1,5 +1,10 @@
var FFZ = window.FrankerFaceZ,
- utils = require('../utils');
+ utils = require('../utils'),
+
+ update_viewer_count = function(text) {
+ var vc = jQuery("#channel_viewer_count");
+ vc.text() === 'Hidden' || vc.text(text);
+ };
// -------------------
@@ -196,7 +201,6 @@ FFZ.prototype._remove_dash_chart = function() {
}
-
FFZ.prototype.update_dash_stats = function() {
var f = this,
id = this.dashboard_channel;
@@ -225,10 +229,10 @@ FFZ.prototype.update_dash_stats = function() {
status = null;
if ( ! data || ! data.stream )
- !f.has_bttv && jQuery("#channel_viewer_count").text("Offline");
+ !f.has_bttv && update_viewer_count("Offline");
else {
- !f.has_bttv && jQuery("#channel_viewer_count").text(utils.number_commas(data.stream.viewers));
+ !f.has_bttv && update_viewer_count(utils.number_commas(data.stream.viewers));
viewers = data.stream.viewers;
var chan = data.stream.channel;
diff --git a/src/utils.js b/src/utils.js
index ed24907f..0f9af5da 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -467,5 +467,14 @@ module.exports = FFZ.utils = {
return "" + count;
},
- escape_regex: escape_regex
+ escape_regex: escape_regex,
+
+ createElement: function(tag, className, content) {
+ var out = document.createElement(tag);
+ if ( className )
+ out.className = className;
+ if ( content )
+ out.innerHTML = content;
+ return out;
+ }
}
\ No newline at end of file
diff --git a/style.css b/style.css
index 9996bda9..49f85790 100644
--- a/style.css
+++ b/style.css
@@ -286,6 +286,11 @@ body:not(.ffz-minimal-chat-input):not(.ffz-menu-replace) .chat-interface .emotic
opacity: 0.95;
}
+.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:focus #hostmode > div.clearfix,
+.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:hover #hostmode > div.clearfix,
+.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:focus .stats-and-actions,
+.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:hover .stats-and-actions,
+
.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:focus #hostmode > div.clearfix,
.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:hover #hostmode > div.clearfix,
.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:focus .stats-and-actions,
@@ -2441,6 +2446,8 @@ body:not(.ffz-bttv) .force-dark .ember-chat .chat-commands-dropdown li:hover {
/* Conversations */
+.ffz-theatre-conversations .app-main.theatre .conversations-content { display: none }
+
body:not(.ffz-bttv) .conversation-window .new-message-divider + .timestamp-line {
margin-top: -3px;
}
@@ -2500,6 +2507,8 @@ body:not(.ffz-top-conversations) .conversations-list-bottom-bar {
bottom: -10px;
}
+.ffz-theatre-conversations .theatre .player-controls-bottom,
+.ffz-theatre-conversations .theatre .player[data-controls=true] .player-controls-bottom,
.ffz-top-conversations .theatre .player-controls-bottom,
.ffz-top-conversations .theatre .player[data-controls=true] .player-controls-bottom {
padding-bottom: 0;
@@ -2721,4 +2730,21 @@ body:not(.ffz-creative-showcase) .creative-hero,
.ember-chat .chat-interface .suggestions.ffz-suggestions .suggestion.has-image:not(.has-info) {
line-height: 40px;
-}
\ No newline at end of file
+}
+
+/* Dashboard Channel Feed */
+
+.ffz-feed-button span { line-height: 30px; }
+#ffz-feed-tabs .tabs { margin-bottom: 10px }
+#ffz-feed-tabs textarea { resize: vertical }
+
+.ffz-feed-button .char-count.over-limit { color: #A00 }
+.ffz-feed-button .char-count.over-limit span { display: inline }
+.ffz-feed-button .char-count span { display: none; opacity: 0.75 }
+.ffz-feed-button .char-count,
+.ffz-feed-button button { float: right; margin-left: 10px }
+
+body.ffz-bttv #ffz-feed-tabs .tabs li:not(.selected):not(:hover) a { color: #6441a5; }
+body.ffz-bttv-dark #ffz-feed-tabs .tabs li:not(.selected):not(:hover) a { color: #999; }
+
+body.ffz-bttv #ffz-feed-tabs .tabs { margin-bottom: 0 }
\ No newline at end of file