Awesome People
+
+
+
+Awesome Resources
+
\ No newline at end of file
diff --git a/dark.css b/dark.css
index e9dc4de6..35cf4241 100644
--- a/dark.css
+++ b/dark.css
@@ -200,9 +200,15 @@ body.ffz-dark:not([data-page="teams#show"]),
box-shadow: rgba(255,255,255,0.2) 0 0 0 1px inset;
}
+.ffz-dark .balloon--tooltip:after,
+.ffz-dark .balloon--tooltip {
+ background-color: #000;
+}
+
.ffz-dark #flyout .content,
.ffz-dark .ffz-ui-popup.emoticon-selector .emoticon-selector-box { border: none }
+.ffz-dark .balloon--right.balloon--up:after,
.ffz-dark .balloon--up:after { box-shadow: 1px 1px 0 rgba(255,255,255,0.2) }
.ffz-dark .balloon--right.balloon--down:after,
.ffz-dark .balloon--down:after { box-shadow: -1px -1px 0 rgba(255,255,255,0.2) }
@@ -317,6 +323,7 @@ body.ffz-dark:not([data-page="teams#show"]),
.ffz-dark .ember-chat .chat-room-list .room:not(:hover) p.room-title,
.ffz-dark .dropmenu_action:not(:hover),
.ffz-dark .dropmenu_action:not(:hover) span,
+.ffz-dark .chat-menu-content button.font-color-purple,
.ffz-dark a {
/*.ffz-dark a:not(.profile-card__content):not(.filter-item):not(.ui-state-focus):not(.button):not(.switch):not(.follow):not(.fb_button):not(.what) {*/
color: #a68ed2;
@@ -365,6 +372,7 @@ body.ffz-dark:not([data-page="teams#show"]),
color: #a68ed2;
}
+.ffz-dark .button--icon.button--hollow figure svg,
.ffz-dark .button.button--icon-only svg {
fill: #a68ed2;
}
@@ -457,9 +465,9 @@ body.ffz-dark:not([data-page="teams#show"]),
}
.ffz-dark .tabs.tabs--fullwidth li:not(.selected) a:hover {
- color: #fff !important;
- background: #24242a;
- border-color: #8c8c9c;
+ color: #fff !important;
+ background: #24242a;
+ border-color: #8c8c9c;
}
.ffz-dark .tabs li.selected a {
@@ -534,6 +542,7 @@ body.ffz-dark:not([data-page="teams#show"]),
background-color: rgb(16,16,16);
}
+.ffz-dark .card__title,
.ffz-dark .card .card__title a,
.ffz-dark .card .card__info a,
.ffz-dark .items-grid .meta .title,
@@ -552,6 +561,17 @@ body.ffz-dark:not([data-page="teams#show"]),
color: #a68ed2;
}
+.ffz-dark .tabs { box-shadow: 0 -1px 0 rgba(255,255,255,0.2) inset; }
+
+.ffz-dark .tabs>.tab:hover,
+.ffz-dark .tabs>li:hover,
+.ffz-dark .tabs__item:hover,
+.ffz-dark .tabs__item--active,
+.ffz-dark .tabs__item.active,
+.ffz-dark .tabs__item.selected,
+.ffz-dark .tabs>li.selected,
+.ffz-dark .tabs>li>a.active { box-shadow: 0 -1px 0 #a68cd4 inset }
+
.ffz-dark .mininav,
.ffz-dark ul.tabs:before,
.ffz-dark .direcotry_header .nav:before,
@@ -856,7 +876,7 @@ body.ffz-dark:not([data-page="teams#show"]),
}
.ffz-dark .js-show-stream-key { background-color: #804400; }
-.ffz-dark .js-reset-stream-key { r-color: rgb(128,0,0); }
+.ffz-dark .js-reset-stream-key { border-color: rgb(128,0,0); }
.ffz-dark .js-show-stream-key:hover,
.ffz-dark .js-show-stream-key:focus,
@@ -1416,4 +1436,49 @@ body.ffz-dark:not([data-page="teams#show"]),
.ffz-dark .resultView__titlesep.isActive .resultView__titleMore { color: #a68ed2 }
.ffz-dark .resultView__titlesep {
background-color: #090909;
+}
+
+
+/* Channel Redesign */
+
+.ffz-dark .cn-bar {
+ background-color: #101010;
+ box-shadow: inset 0 -1px 0 #161616, -1px 1px rgba(255,255,255,0.065);
+}
+
+.ffz-dark .cn-metabar__more {
+ border-color: rgba(255,255,255,0.2) !important;
+}
+
+
+.ffz-dark .button--icon.cn-bar__button--subscribed {
+ background-color: #161616;
+ box-shadow: 0 0 0 1px rgba(255,255,255,0.065) inset;
+}
+
+
+.ffz-dark .cn-bar__avatar-wrap {
+ background-color: #101010;
+ border-color: #101010;
+}
+
+.ffz-dark .cn-bar__displayname {
+ color: #c3c3c3;
+}
+
+.ffz-dark .cn-tabs__item--withseparator:after {
+ border-color: rgba(255,255,255,0.2);
+}
+
+.ffz-dark .cn-tabs__item > a {
+ color: #999;
+}
+
+.ffz-dark .cn-tabs__item > a.active,
+.ffz-dark .cn-tabs__item > a:hover {
+ color: #a68ed2;
+}
+
+.ffz-dark .cn-tabs__item > a:hover:after {
+ border-color: #a68ed2;
}
\ No newline at end of file
diff --git a/src/ObjectPath.js b/src/ObjectPath.js
new file mode 100644
index 00000000..aea6ef94
--- /dev/null
+++ b/src/ObjectPath.js
@@ -0,0 +1,21 @@
+String.prototype.tokens=function(h){h=h?h:!1;var a,g,b=0,k=this.length,f,c,e=[],l="and;or;not;in;not in;is;is not;".split(";"),d=function(a,c,d){if(!d)return{type:a,value:c,position:[g,b]}};if(this){for(a=this.charAt(b);a;)if(g=b," ">=a)b+=1,a=this.charAt(b);else if("a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"==a){c=a;for(b+=1;;)if(a=this.charAt(b),"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"0"<=a&&"9">=a||"_"===a)c+=a,b+=1;else break;0<=l.indexOf(c)?(f=e[e.length-1],"not"===c&&f&&"is"===f.value?(c=d("op","is not"),
+c.position[0]=f.position[0],e[e.length-1]=c):"in"===c&&f&&"not"===e[e.length-1].value?(c=d("op","not in"),c.position[0]=f.position[0],e[e.length-1]=c):e.push(d("op",c))):e.push(d("name",c))}else if("0"<=a&&"9">=a){c=a;for(b+=1;;){a=this.charAt(b);if("0">a||"9"" + + "Example:
boop=/timeout {0} 15 {1$}" + + + "Allowed Variables
{room} | chat room's name | " + + "{room_name} | chat room's name |
{room_display_name} | chat room's display name | " + + "{room_id} | chat room's numeric ID |
' + + 'Broadcast ' + utils.time_to_string(delay, true) + ' Ago
' : 'Stream Latency
') + + 'Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p ' + stats.current_fps + ' fps
' + + 'Playback Rate: ' + bitrate + ' Kbps
' + + 'Dropped Frames: ' + dropped; + }, + + ffzUpdateChatters: function() { + var channel_id = this.get("channel.id"), + room = f.rooms && f.rooms[channel_id], + container = this.get('element'); + + if ( ! container || ! room || ! f.settings.chatter_count ) + return container && this.$("#ffz-chatter-display").remove(); + + var chatter_count = Object.keys(room.room.get('ffz_chatters') || {}).length, + el = container.querySelector('#ffz-chatter-display span'); + + if ( ! el ) { + var cont = container.querySelector('.cn-metabar__more'); + if ( ! cont ) + return; + + var stat = utils.createElement('span'), + figure = utils.createElement('figure', 'icon cn-metabar__icon', constants.ROOMS + ' '), + balloon = utils.createElement('div', 'balloon balloon--tooltip balloon--down balloon--center', 'Currently in Chat'), + balloon_wrapper = utils.createElement('div', 'balloon-wrapper', figure), + stat_wrapper = utils.createElement('div', 'cn-metabar__ffz flex__item mg-l-1', balloon_wrapper); + + balloon_wrapper.appendChild(stat); + balloon_wrapper.appendChild(balloon); + + stat_wrapper.id = 'ffz-chatter-display'; + + var viewers = cont.querySelector('#ffz-player-stats') || cont.querySelector('#ffz-uptime-display') || cont.querySelector(".cn-metabar__livecount") || cont.querySelector(".cn-metabar__viewcount"); + if ( viewers ) + cont.insertBefore(stat_wrapper, viewers.nextSibling); + else + cont.appendChild(stat_wrapper); + + el = stat; + } + + el.innerHTML = utils.number_commas(chatter_count); + }.observes('channel.id'), + + ffzUpdateHostButton: function() { + var t = this, + channel_id = this.get("channel.id"), + hosted_id = this.get("channel.hostModeTarget.id"), + + user = f.get_user(), + room = user && f.rooms && f.rooms[user.login] && f.rooms[user.login].room, + now_hosting = room && room.ffz_host_target, + hosts_left = room && room.ffz_hosts_left, + + el = this.get("element"), + + update_button = function(channel, container, before) { + if ( ! container ) + return; + + var btn = container.querySelector('#ffz-ui-host-button'); + + if ( ! f.settings.stream_host_button || ! user || user.login === channel ) { + if ( btn ) + btn.parentElement.removeChild(btn); + return; + } + + if ( ! btn ) { + btn = utils.createElement('button', 'button button--hollow mg-l-1'), + + btn.id = 'ffz-ui-host-button'; + btn.addEventListener('click', t.ffzClickHost.bind(t, channel !== channel_id)); + + if ( before ) + container.insertBefore(btn, before); + else + container.appendChild(btn); + + jQuery(btn).tipsy({html: true, gravity: utils.tooltip_placement(constants.TOOLTIP_DISTANCE, 'n')}); + } + + btn.classList.remove('disabled'); + btn.innerHTML = channel === now_hosting ? 'Unhost' : 'Host'; + if ( now_hosting ) { + var name = FFZ.get_capitalization(now_hosting); + btn.title = 'You are now hosting ' + f.format_display_name(name, now_hosting, true)[0] + '.'; + } else + btn.title = 'You are not hosting any channel.'; + + if ( typeof hosts_left === 'number' ) + btn.title += ' You have ' + hosts_left + ' host command' + utils.pluralize(hosts_left) + ' remaining this half hour.'; + }; + + if ( ! el ) + return; + + this.set("ffz_host_updating", false); + + if ( channel_id ) { + var container = el.querySelector('.cn-metabar__more'), + share = container && container.querySelector('.js-share-box'); + + update_button(channel_id, container, share ? share.parentElement : null); + } + + if ( hosted_id ) + update_button(hosted_id, el.querySelector('.cn-hosting--bottom')); + }.observes('channel.id', 'channel.hostModeTarget.id'), + + ffzClickHost: function(is_host, e) { + var btn = e.target, + target = this.get(is_host ? 'channel.hostModeTarget.id' : 'channel.id'), + user = f.get_user(), + room = user && f.rooms && f.rooms[user.login] && f.rooms[user.login].room, + now_hosting = room && room.ffz_host_target; + + if ( ! room || this.get('ffz_host_updating') ) + return; + + btn.classList.add('disabled'); + btn.title = 'Updating...'; + + this.set('ffz_host_updating', true); + if ( now_hosting === target ) + room.send('/unhost', true); + else + room.send('/host ' + target, true); + } + }) +} + + FFZ.prototype.modify_channel_index = function(view) { var f = this; utils.ember_reopen_view(view, { ffz_init: function() { - var id = this.get('controller.content.id') || this.get('controller.id'), + var channel_id = this.get('model.id'), el = this.get('element'); f._cindex = this; - f.ws_send("sub", "channel." + id); + f.ws_send("sub", "channel." + channel_id); - el.setAttribute('data-channel', id); + el.setAttribute('data-channel', channel_id); el.classList.add('ffz-channel'); this.ffzFixTitle(); @@ -225,7 +559,7 @@ FFZ.prototype.modify_channel_index = function(view) { f.rebuild_race_ui(); if ( f.settings.auto_theater ) { - var player = f.players && f.players[id] && f.players[id].get('player'); + var player = f.players && f.players[channel_id] && f.players[channel_id].get('player'); if ( player ) player.setTheatre(true); } @@ -241,12 +575,15 @@ FFZ.prototype.modify_channel_index = function(view) { }, ffz_destroy: function() { - var id = this.get('controller.content.id') || this.get('controller.id'); - if ( id ) - f.ws_send("unsub", "channel." + id); + var channel_id = this.get('model.id'); + if ( channel_id ) + f.ws_send("unsub", "channel." + channel_id); this.get('element').setAttribute('data-channel', ''); - f._cindex = undefined; + + if ( f._cindex === this ) + f._cindex = null; + if ( this._ffz_update_uptime ) clearTimeout(this._ffz_update_uptime); @@ -259,7 +596,7 @@ FFZ.prototype.modify_channel_index = function(view) { } document.body.classList.remove('ffz-small-player'); - utils.update_css(f._channel_style, id, null); + utils.update_css(f._channel_style, channel_id, null); }, @@ -279,23 +616,23 @@ FFZ.prototype.modify_channel_index = function(view) { if ( f.has_bttv || ! f.settings.stream_title ) return; - var status = this.get("controller.content.status"), - channel = this.get("controller.content.id"), - game = this.get("controller.content.game"), + var channel_id = this.get('model.id'), + status = this.get('model.status'), + game = this.get('model.game'), - tokens = f.tokenize_line(channel, channel, status, true); + tokens = f.tokenize_line(channel_id, channel_id, status, true); if ( game === 'Creative' ) tokens = f.tokenize_ctags(tokens); this.$("#broadcast-meta .title").html(f.render_tokens(tokens)); - status = this.get('controller.hostModeTarget.status'); - channel = this.get('controller.hostModeTarget.id'); - game = this.get('controller.hostModeTarget.game'); + status = this.get('hostModeTarget.status'); + channel_id = this.get('hostModeTarget.id'); + game = this.get('hostModeTarget.game'); - if ( channel ) { - tokens = f.tokenize_line(channel, channel, status, true); + if ( channel_id ) { + tokens = f.tokenize_line(channel_id, channel_id, status, true); if ( game === 'Creative' ) tokens = f.tokenize_ctags(tokens); @@ -305,8 +642,8 @@ FFZ.prototype.modify_channel_index = function(view) { ffzUpdateHostButton: function() { - var channel_id = this.get('controller.content.id') || this.get('controller.id'), - hosted_id = this.get('controller.hostModeTarget.id'), + var channel_id = this.get('model.id'), + hosted_id = this.get('hostModeTarget.id'), user = f.get_user(), room = user && f.rooms && f.rooms[user.login] && f.rooms[user.login].room, @@ -399,7 +736,7 @@ FFZ.prototype.modify_channel_index = function(view) { ffzClickHost: function(is_host, e) { var btn = e.target, - target = is_host ? this.get('controller.hostModeTarget.id') : (this.get('controller.content.id') || this.get('controller.id')), + target = is_host ? this.get('hostModeTarget.id') : this.get('model.id'), user = f.get_user(), room = user && f.rooms && f.rooms[user.login] && f.rooms[user.login].room, now_hosting = room && room.ffz_host_target; @@ -420,7 +757,7 @@ FFZ.prototype.modify_channel_index = function(view) { ffzUpdateChatters: function() { // Get the counts. - var room_id = this.get('controller.content.id') || this.get('controller.id'), + var room_id = this.get('model.id'), room = f.rooms && f.rooms[room_id]; if ( ! room || ! f.settings.chatter_count ) { @@ -505,8 +842,8 @@ FFZ.prototype.modify_channel_index = function(view) { if ( f.settings.player_stats ) this._ffz_update_stats = setTimeout(this.ffzUpdatePlayerStats.bind(this), 1000); - var channel_id = this.get('controller.content.id') || this.get('controller.id'), - hosted_id = this.get('controller.hostModeTarget.id'), + var channel_id = this.get('model.id'), + hosted_id = this.get('hostModeTarget.id'), el = this.get('element'); @@ -667,7 +1004,8 @@ FFZ.prototype.modify_channel_index = function(view) { delete this._ffz_update_uptime; } - if ( ! f.settings.stream_uptime || ! this.get("controller.isLiveAccordingToKraken") ) { + var controller = utils.ember_lookup('controller:channel'); + if ( ! f.settings.stream_uptime || ! (controller && controller.get('isLiveAccordingToKraken')) ) { var el = this.get('element').querySelector('#ffz-uptime-display'); if ( el ) el.parentElement.removeChild(el); @@ -678,7 +1016,7 @@ FFZ.prototype.modify_channel_index = function(view) { this._ffz_update_uptime = setTimeout(this.ffzUpdateUptime.bind(this), 1000); // Determine when the channel last went live. - var online = this.get("controller.content.stream.created_at"), + var online = this.get("model.stream.created_at"), now = Date.now() - (f._ws_server_offset || 0); online = online && utils.parse_date(online); @@ -894,6 +1232,93 @@ FFZ.settings_info.stream_title = { }; +FFZ.settings_info.channel_bar_bottom = { + type: "boolean", + value: false, + no_bttv: true, + no_mobile: true, + + category: "Appearance", + name: "Channel Bar on Bottom", + help: "Hide the profile banner and position the channel bar at the bottom of the screen.", + + on_update: function(val) { + if ( this.has_bttv ) + return; + + utils.toggle_cls('ffz-channel-bar-bottom')(val); + if ( this._cindex ) + this._cindex.ffzUpdateCoverHeight(); + + var Layout = utils.ember_lookup('service:layout'); + if ( Layout ) + Ember.propertyDidChange(Layout, 'windowHeight'); + } +} + + +FFZ.settings_info.channel_bar_collapse = { + type: "boolean", + value: false, + no_bttv: true, + no_mobile: true, + + category: "Appearance", + name: "Minimal Channel Bar", + help: "Slide the channel bar mostly out of view when it's not being used.", + + on_update: function(val) { + if ( this.has_bttv ) + return; + + utils.toggle_cls('ffz-minimal-channel-bar')(val); + + var Layout = utils.ember_lookup('service:layout'); + if ( Layout ) + Ember.propertyDidChange(Layout, 'windowHeight'); + } +} + + +FFZ.settings_info.channel_title_top = { + type: "select", + options: { + 0: "Disabled", + 1: "On Top", + 2: "On Top, Minimal" + }, + + value: 0, + process_value: function(val) { + if ( typeof val === "string" ) { + val = parseInt(val); + if ( isNaN(val) || ! isFinite(val) ) + val = 0; + } + return val; + }, + + no_bttv: true, + no_mobile: true, + + category: "Appearance", + name: "Channel Title on Top", + help: "Display the channel title and game above the player rather than below.", + + on_update: function(val) { + if ( this.has_bttv ) + return; + + document.body.classList.toggle('ffz-minimal-channel-title', val === 2); + document.body.classList.toggle('ffz-channel-title-top', val > 0); + + var Layout = utils.ember_lookup('service:layout'); + if ( Layout ) + Ember.propertyDidChange(Layout, 'windowHeight'); + } +} + + FFZ.settings_info.theater_stats = { type: "boolean", value: true, diff --git a/src/ember/chat-input.js b/src/ember/chat-input.js index 970e3917..87119fe7 100644 --- a/src/ember/chat-input.js +++ b/src/ember/chat-input.js @@ -100,7 +100,7 @@ FFZ.settings_info.input_complete_emotes = { 2: "All Emoticons" }, - value: 0, + value: 1, process_value: function(val) { if ( typeof val === 'string' ) @@ -111,7 +111,7 @@ FFZ.settings_info.input_complete_emotes = { category: "Chat Input", no_bttv: true, - name: "Tab-Complete Emoticons Beta", + name: "Tab-Complete Emoticons", help: "Use tab completion to complete emoticon names in chat.", on_update: function(val) { @@ -503,7 +503,7 @@ FFZ.prototype.modify_chat_input = function(component) { ffzFetchNameSuggestions: function() { if ( ! this.get('ffz_suggestions_visible') ) - this.set('ffz_name_suggestions', this.get('suggestions')); + this.set('ffz_name_suggestions', this.get('suggestions')()); }.observes('suggestions'), diff --git a/src/ember/chatview.js b/src/ember/chatview.js index d337241e..e6e6b4c8 100644 --- a/src/ember/chatview.js +++ b/src/ember/chatview.js @@ -138,16 +138,17 @@ FFZ.settings_info.chat_batching = { FFZ.settings_info.chat_delay = { type: "select", options: { - "-1": "Default Delay (Room Specific; Non-Mod Only)", - 0: "No Delay", - 300: "Minor (Bot Moderation; 0.3s)", - 1200: "Normal (Human Moderation; 1.2s)", - 5000: "Large (Spoiler Removal / Really Slow Mods; 5s)", - 10000: "Extra Large (10s)", - 15000: "Extremely Large (15s)", - 20000: "Mods Asleep; Delay Chat (20s)", - 30000: "Half a Minute (30s)", - 60000: "Why??? (1m)" + "-1": ["Default Delay (Room Specific; Non-Mod Only)", 0], + 0: ["No Delay", 1], + 300: ["Minor (Bot Moderation; 0.3s)", 2], + 1200: ["Normal (Human Moderation; 1.2s)", 3], + 5000: ["Large (Spoiler Removal / Really Slow Mods; 5s)", 4], + 10000: ["Extra Large (10s)", 5], + 15000: ["Extremely Large (15s)", 6], + 20000: ["Mods Asleep; Delay Chat (20s)", 7], + 30000: ["Half a Minute (30s)", 8], + 60000: ["Why??? (1m)", 9], + 788400000000: ["The CBenni Option (Literally 25 Years)", 10] }, value: -1, @@ -484,9 +485,83 @@ FFZ.prototype.setup_chatview = function() { this.log("Hooking the Ember Chat view."); this.update_views('view:chat', this.modify_chat_view); + + this.log("Hooking the Ember from-display-preview component."); + this.update_views('component:chat/from-display-preview', this.modify_from_display_preview); + } +// ---------------------------- +// Modify From Display Preview +// ---------------------------- + +FFZ.prototype.modify_from_display_preview = function(view) { + var f = this; + utils.ember_reopen_view(view, { + attributeBindings: ["chatUser.id:data-room"], + + ffz_init: function() { + var el = this.get('element'); + if ( el ) + el.classList.add('from-display-preview'); + + //this.ffzUpdateChatColor(); + this.ffzRenderBadges(); + }, + + ffz_badges: function() { + var badges = f.get_twitch_badges(this.get('chatUser.chatBadges')); + return f.get_badges(this.get('userData.login'), this.get('chatUser.id'), badges); + }.property('chatUser.chatBadges', 'userData.login', 'chatUser.id'), + + /*ffzUpdateChatColor: function() { + var el = this.get('element'), + name = el && el.querySelector('span.strong'); + + if ( ! name ) + return; + + name.classList.add('has-color'); + name.classList.add('replay-color'); + name.setAttribute('data-color', this.get('room.model.chatColor')); + + }.observes('room.model.chatColor'),*/ + + ffzRenderBadges: function() { + var badges = this.get('ffz_badges'), + el = this.get('element'), + badge_container = el && el.querySelector('.ffz_badges'); + + if ( ! badge_container ) { + var old_container = el && el.querySelector('.badges'); + if ( ! old_container ) + return; + + old_container.classList.add('hidden'); + + badge_container = utils.createElement('div', 'badges ffz_badges'); + old_container.parentElement.insertBefore(badge_container, old_container); + } + + badge_container.innerHTML = f.render_badges(badges); + + }.observes('ffz_badges'), + + /*colorStyle: function(e) { + var base_color = this.get('room.model.chatColor'), + colors = f._handle_color(base_color); + + if ( ! colors ) + return ""; + + return "color:" + ( f.settings.dark_twitch ? colors[1] : colors[0] ); + }*/ + }); +} + + + // -------------------- // Modify Chat View // -------------------- @@ -662,7 +737,7 @@ FFZ.prototype.modify_chat_view = function(view) { ffzUpdateHost: function() { var Channel = utils.ember_lookup('controller:channel'), Room = utils.ember_resolve('model:room'), - target = Room && Channel && Channel.get('hostModeTarget'), + target = Room && Channel && Channel.get('channelModel.hostModeTarget'), updated = false; diff --git a/src/ember/following.js b/src/ember/following.js index 921a3f8c..59e1104b 100644 --- a/src/ember/following.js +++ b/src/ember/following.js @@ -98,6 +98,83 @@ FFZ.prototype.setup_profile_following = function() { // Modify followed items. this.update_views('component:display-followed-item', this.modify_display_followed_item); + this.update_views('component:twitch-profile-card', this.modify_twitch_profile_card); +} + + +FFZ.prototype.modify_twitch_profile_card = function(component) { + var f = this; + utils.ember_reopen_view(component, { + ffzParentModel: function() { + var x = this.get('parentView'); + while(x) { + var model = x.get('model'); + if ( model ) + return model; + x = x.get('parentView'); + } + }.property('parentView'), + + ffz_init: function() { + var el = this.get('element'); + + el.classList.add('ffz-processed'); + jQuery('.aspect', el).tipsy(); + + if ( ! f.settings.enhance_profile_following ) + return; + + this.ffzUpdate(); + }, + + ffzUpdate: function() { + var el = this.get('element'), + t_el = el.querySelector('.ffz-followed-since'), + + channel_id = this.get('ffzParentModel.model.id'), + is_following = this.get('ffzParentModel.relationshipName') === 'following', + + user = f.get_user(), + mine = user && user.login && user.login === channel_id, + big_cache = is_following ? f._following_cache : f._follower_cache, + user_cache = big_cache[channel_id] = big_cache[channel_id] || {}, + + user_id = this.get('channelInfo.id'), + data = user_cache[user_id]; + + f.log("Profile Card [" + channel_id + "] " + user_id + " <" + JSON.stringify(data) + ">", this); + + if ( ! data || ! el ) { + if ( t_el ) + t_el.parentElement.removeChild(t_el); + return false; + } + + var now = Date.now() - (f._ws_server_offset || 0), + age = data[0] ? Math.floor((now - data[0].getTime()) / 1000) : 0, + t_el = el.querySelector('.ffz-followed-since') + + update_time = function() { + var now = Date.now() - (f._ws_server_offset || 0), + age = data && data[0] ? Math.floor((now - data[0].getTime()) / 1000) : undefined; + + if ( age !== undefined ) { + t_el.innerHTML = constants.CLOCK + ' ' + (age < 60 ? 'now' : utils.human_time(age, 10)); + t_el.title = 'Follow' + (is_following ? 'ed by ' : 'er of ') + channel_id + ' since:
Advanced Stuff: If you know regex, you can use regular expressions to match too! Start a line with
regex: to trigger that behavior.(Note: Your expression is wrapped in a capture group and may be joined with other expressions within that group via
"),
old_val,
function(new_val) {
if ( new_val === null || new_val === undefined )
return;
- new_val = new_val.trim().split(constants.SPLITTER);
- var vals = [];
+ var vals = new_val.trim().split(/\s*\n\s*/g),
+ i = vals.length;
- for(var i=0; i < new_val.length; i++)
- new_val[i] && vals.push(new_val[i]);
-
- if ( vals.length == 1 && vals[0] == "disable" )
- vals = [];
+ while(i--)
+ if ( vals[i].length === 0 )
+ vals.splice(i, 1);
f.settings.set("banned_words", vals);
- });
+ },
+ 600, input);
}
};
@@ -249,30 +253,32 @@ FFZ.settings_info.keywords = {
name: "Highlight Keywords",
help: "Set additional keywords that will be highlighted in chat.",
- method: function() {
+ method: function(e, from_basic) {
var f = this,
- old_val = this.settings.keywords.join(", ");
+ old_val = this.settings.keywords.join("\n"),
+ input = utils.createElement('textarea');
+
+ input.style.marginBottom = "20px";
utils.prompt(
"Highlight Keywords",
- "Please enter a comma-separated list of words that you would like to be highlighted in chat.",
+ "Please enter a list of words or phrases that you would like to be highlighted in chat. One item per line." + (from_basic ? "" : "|. All regular expressions are executed with the flags ig.)Advanced Stuff: If you know regex, you can use regular expressions to match too! Start a line with
regex: to trigger that behavior.(Note: Your expression is wrapped in a capture group and may be joined with other expressions within that group via
"),
old_val,
function(new_val) {
if ( new_val === null || new_val === undefined )
return;
// Split them up.
- new_val = new_val.trim().split(constants.SPLITTER);
- var vals = [];
+ var vals = new_val.trim().split(/\s*\n\s*/g),
+ i = vals.length;
- for(var i=0; i < new_val.length; i++)
- new_val[i] && vals.push(new_val[i]);
-
- if ( vals.length == 1 && vals[0] == "disable" )
- vals = [];
+ while(i--)
+ if ( vals[i].length === 0 )
+ vals.splice(i,1);
f.settings.set("keywords", vals);
- });
+ },
+ 600, input);
}
};
@@ -720,7 +726,7 @@ FFZ.prototype.save_aliases = function() {
FFZ.prototype._modify_chat_line = function(component, is_vod) {
var f = this,
Layout = utils.ember_lookup('service:layout'),
- Settings = utils.ember_lookup('controller:settings');
+ Settings = utils.ember_settings();
component.reopen({
/*tokenizedMessage: function() {
@@ -784,22 +790,39 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
for(var i=0, l = f.settings.mod_buttons.length; i < l; i++) {
var pair = f.settings.mod_buttons[i],
- prefix = pair[0], btn = pair[1],
+ prefix = pair[0], btn = pair[1], had_label = pair[2], is_emoji = pair[3],
cmd, tip;
+ if ( is_emoji ) {
+ var setting = f.settings.parse_emoji,
+ token = f.emoji_data[is_emoji],
+ url = null;
+ if ( token ) {
+ if ( setting === 1 && token.tw )
+ url = token.tw_src;
+ else if ( setting === 2 && token.noto )
+ url = token.noto_src;
+ else if ( setting === 3 && token.one )
+ url = token.one_src;
+
+ if ( url )
+ prefix = '|. All regular expressions are executed with the flags ig.)' + utils.quote_san(cmd).replace('\n','
'); } else { cmd = "/timeout " + user + " " + btn; @@ -819,7 +842,7 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) { raw_color = this.get(is_recipient ? 'msgObject.toColor' : 'msgObject.color'), - is_dark = (Layout && Layout.get('isTheatreMode')) || (is_replay ? f.settings.dark_twitch : (Settings && Settings.get('settings.darkMode'))), + is_dark = (Layout && Layout.get('isTheatreMode')) || (is_replay ? f.settings.dark_twitch : (Settings && Settings.get('darkMode'))), is_replay = this.get('ffz_is_replay'), colors = raw_color && f._handle_color(raw_color), @@ -845,7 +868,9 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) { } // Timestamp - output += ' '; + var timestamp = this.get('timestamp'); + if ( timestamp ) + output += ' '; // Moderator Actions output += this.buildModIconsHTML(); @@ -877,7 +902,7 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) { var raw_color = this.get('msgObject.color'), colors = raw_color && f._handle_color(raw_color), is_replay = this.get('ffz_is_replay'), - is_dark = (Layout && Layout.get('isTheatreMode')) || (is_replay ? f.settings.dark_twitch : (Settings && Settings.get('settings.darkMode'))); + is_dark = (Layout && Layout.get('isTheatreMode')) || (is_replay ? f.settings.dark_twitch : (Settings && Settings.get('darkMode'))); if ( raw_color ) output = '