"; + tooltip += "Channel: " + utils.sanitize(link_data.channel) + " | " + utils.time_to_string(link_data.duration) + "
"; + tooltip += utils.number_commas(link_data.views||0) + " Views | 👍 " + utils.number_commas(link_data.likes||0) + " 👎 " + utils.number_commas(link_data.dislikes||0); + + } else if ( link_data.type == "strawpoll" ) { + tooltip = "Strawpoll: " + utils.sanitize(link_data.title) + "
| ' + utils.sanitize(key) + ' | ' + utils.number_commas(votes) + " |
Total: " + utils.number_commas(link_data.total); + var fetched = utils.parse_date(link_data.fetched); + if ( fetched ) { + var age = Math.floor((fetched.getTime() - Date.now()) / 1000); + if ( age > 60 ) + tooltip += "
Data was cached " + utils.time_to_string(age) + " ago."; + } + + + } else if ( link_data.type == "twitch" ) { + tooltip = "Twitch: " + utils.sanitize(link_data.display_name) + "
"; + var since = utils.parse_date(link_data.since); + if ( since ) + tooltip += "Member Since: " + utils.date_string(since) + "
"; + tooltip += "
"; + tooltip += utils.sanitize(link_data.tweet); + + + } else if ( link_data.type == "reputation" ) { + tooltip = '' + utils.sanitize(link_data.full.toLowerCase()) + ''; + if ( link_data.trust < 50 || link_data.safety < 50 || (link_data.tags && link_data.tags.length > 0) ) { + tooltip += "
"; + var had_extra = false; + if ( link_data.trust < 50 || link_data.safety < 50 ) { + link_data.unsafe = true; + tooltip += "Potentially Unsafe Link
"; + tooltip += "Trust: " + link_data.trust + "% | Child Safety: " + link_data.safety + "%"; + had_extra = true; + } + + if ( link_data.tags && link_data.tags.length > 0 ) + tooltip += (had_extra ? "
" : "") + "Tags: " + link_data.tags.join(", "); + + tooltip += "
Data Source: WOT"; + } + + + } else if ( link_data.full ) + tooltip = '' + utils.sanitize(link_data.full.toLowerCase()) + ''; + + if ( ! tooltip ) + tooltip = '' + utils.sanitize(href.toLowerCase()) + ''; + + link_data.tooltip = tooltip; + return tooltip; + }, + + load_link_data = function(href, success, data) { + if ( ! success ) + return; + + this._link_data[href] = data; + data.unsafe = false; + + var tooltip = build_link_tooltip.bind(this)(href), links, + no_trail = href.charAt(href.length-1) == "/" ? href.substr(0, href.length-1) : null; + + if ( no_trail ) + links = document.querySelectorAll('span.message a[href="' + href + '"], span.message a[href="' + no_trail + '"], span.message a[data-url="' + href + '"], span.message a[data-url="' + no_trail + '"]'); + else + links = document.querySelectorAll('span.message a[href="' + href + '"], span.message a[data-url="' + href + '"]'); + + if ( ! this.settings.link_info ) + return; + + for(var x=0; x < links.length; x++) { + if ( data.unsafe ) + links[x].classList.add('unsafe-link'); + + if ( ! links[x].classList.contains('deleted-link') ) + links[x].title = tooltip; + } }; @@ -610,24 +883,13 @@ var FFZ = window.FrankerFaceZ, // Settings // --------------------- -FFZ.settings_info.capitalize = { - type: "boolean", - value: true, - - category: "Chat", - visible: function() { return ! this.has_bttv }, - - name: "Username Capitalization", - help: "Display names in chat with proper capitalization." - }; - - FFZ.settings_info.banned_words = { type: "button", value: [], category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Banned Words", help: "Set a list of words that will be locally removed from chat messages.", @@ -658,7 +920,8 @@ FFZ.settings_info.keywords = { value: [], category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Highlight Keywords", help: "Set additional keywords that will be highlighted in chat.", @@ -690,7 +953,8 @@ FFZ.settings_info.fix_color = { value: true, category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Adjust Username Colors", help: "Ensure that username colors contrast with the background enough to be readable.", @@ -704,12 +968,26 @@ FFZ.settings_info.fix_color = { }; +FFZ.settings_info.link_info = { + type: "boolean", + value: true, + + category: "Chat", + no_bttv: true, + //visible: function() { return ! this.has_bttv }, + + name: "Link Tooltips Beta", + help: "Check links against known bad websites, unshorten URLs, and show YouTube info." + }; + + FFZ.settings_info.chat_rows = { type: "boolean", value: false, category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Chat Line Backgrounds", help: "Display alternating background colors for lines in chat.", @@ -743,6 +1021,7 @@ FFZ.prototype.setup_line = function() { // Emoticon Data this._twitch_emotes = {}; + this._link_data = {}; this.log("Hooking the Ember Line controller."); @@ -764,6 +1043,11 @@ FFZ.prototype.setup_line = function() { if ( ! user || this.get("model.from") != user.login ) tokens = f._mentionize(this, tokens); + // Store the capitalization. + var display = this.get("model.tags.display-name"); + if ( display && display.length ) + FFZ.capitalization[this.get("model.from")] = [display.trim(), Date.now()]; + var end = performance.now(); if ( end - start > 5 ) f.log("Tokenizing Message Took Too Long - " + (end-start) + "ms", tokens, false, true); @@ -797,7 +1081,6 @@ FFZ.prototype.setup_line = function() { row_type = controller.get('model.ffz_alternate'); - // Color Processing if ( color ) f._handle_color(color); @@ -822,11 +1105,6 @@ FFZ.prototype.setup_line = function() { f.render_badge(this); - // Capitalization - if ( f.settings.capitalize ) - f.capitalize(this, user); - - // Mention Highlighting var mentioned = el.querySelector('span.mentioned'); if ( mentioned ) { @@ -889,12 +1167,52 @@ FFZ.prototype.setup_line = function() { this.target = "_new"; this.textContent = link; + // Now, check for a tooltip. + var link_data = f._link_data[link]; + if ( link_data && typeof link_data != "boolean" ) { + this.title = link_data.tooltip; + if ( link_data.unsafe ) + this.classList.add('unsafe-link'); + } + // Stop from Navigating e.preventDefault(); }); // Also add a nice tooltip. - jQuery(link).tipsy(); + jQuery(link).tipsy({html:true}); + } + + + // Link Tooltips + if ( f.settings.link_info ) { + var links = el.querySelectorAll("span.message a"); + for(var i=0; i < links.length; i++) { + var link = links[i], + href = link.href, + deleted = false; + + if ( link.classList.contains("deleted-link") ) { + href = link.getAttribute("data-url"); + deleted = true; + } + + // Check the cache. + var link_data = f._link_data[href]; + if ( link_data ) { + if ( !deleted && typeof link_data != "boolean" ) + link.title = link_data.tooltip; + + if ( link_data.unsafe ) + link.classList.add('unsafe-link'); + + } else if ( ! /^mailto:/.test(href) ) { + f._link_data[href] = true; + f.ws_send("get_link", href, load_link_data.bind(f, href)); + } + } + + jQuery(links).tipsy({html:true}); } @@ -1068,16 +1386,6 @@ FFZ.get_capitalization = function(name, callback) { } -FFZ.prototype.capitalize = function(view, user) { - var name = FFZ.get_capitalization(user, this.capitalize.bind(this, view)); - if ( !name || !view ) - return; - - var from = view.$('.from'); - from && from.text(name); -} - - // --------------------- // Extra Mentions // --------------------- @@ -1242,7 +1550,7 @@ FFZ.prototype._emoticonize = function(controller, tokens) { return tokens; } -},{"../utils":27}],7:[function(require,module,exports){ +},{"../utils":28}],8:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, utils = require("../utils"), @@ -1250,7 +1558,8 @@ var FFZ = window.FrankerFaceZ, ESC: 27, P: 80, B: 66, - T: 84 + T: 84, + U: 85 }, btns = [ @@ -1272,7 +1581,8 @@ FFZ.settings_info.enhanced_moderation = { type: "boolean", value: false, - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, category: "Chat", name: "Enhanced Moderation", @@ -1286,32 +1596,33 @@ FFZ.settings_info.enhanced_moderation = { FFZ.prototype.setup_mod_card = function() { this.log("Hooking the Ember Moderation Card view."); - var Card = App.__container__.resolve('view:moderation-card'), + var Card = App.__container__.resolve('component:moderation-card'), f = this; Card.reopen({ didInsertElement: function() { this._super(); + window._card = this; try { if ( f.has_bttv || ! f.settings.enhanced_moderation ) return; var el = this.get('element'), - controller = this.get('context'); + controller = this.get('controller'); // Style it! el.classList.add('ffz-moderation-card'); // Only do the big stuff if we're mod. - if ( controller.get('parentController.model.isModeratorOrHigher') ) { + if ( controller.get('cardInfo.isModeratorOrHigher') ) { el.classList.add('ffz-is-mod'); el.setAttribute('tabindex', 1); // Key Handling el.addEventListener('keyup', function(e) { var key = e.keyCode || e.which, - user_id = controller.get('model.user.id'), - room = controller.get('parentController.model'); + user_id = controller.get('cardInfo.user.id'), + room = App.__container__.lookup('controller:chat').get('currentRoom'); if ( key == keycodes.P ) room.send("/timeout " + user_id + " 1"); @@ -1322,6 +1633,9 @@ FFZ.prototype.setup_mod_card = function() { else if ( key == keycodes.T ) room.send("/timeout " + user_id + " 600"); + else if ( key == keycodes.U ) + room.send("/unban " + user_id); + else if ( key != keycodes.ESC ) return; @@ -1334,8 +1648,8 @@ FFZ.prototype.setup_mod_card = function() { line.className = 'interface clearfix'; var btn_click = function(timeout) { - var user_id = controller.get('model.user.id'), - room = controller.get('parentController.model'); + var user_id = controller.get('cardInfo.user.id'), + room = App.__container__.lookup('controller:chat').get('currentRoom'); if ( timeout === -1 ) room.send("/unban " + user_id); @@ -1396,8 +1710,9 @@ FFZ.prototype.setup_mod_card = function() { // More Fixing Other Buttons var op_btn = el.querySelector('button.mod'); if ( op_btn ) { - var model = controller.get('parentController.model'), - can_op = model.get('isBroadcaster') || model.get('isStaff') || model.get('isAdmin'); + var is_owner = controller.get('cardInfo.isChannelOwner'), + user = ffz.get_user(); + can_op = is_owner || (user && user.is_admin) || (user && user.is_staff); if ( ! can_op ) op_btn.parentElement.removeChild(op_btn); @@ -1405,7 +1720,7 @@ FFZ.prototype.setup_mod_card = function() { var msg_btn = el.querySelector(".interface > button"); - if ( msg_btn && msg_btn.className == "button" ) { + if ( msg_btn && msg_btn.classList.contains("message-button") ) { msg_btn.innerHTML = MESSAGE; msg_btn.classList.add('glyph-only'); msg_btn.classList.add('message'); @@ -1494,7 +1809,7 @@ FFZ.chat_commands.u = function(room, args) { } FFZ.chat_commands.u.enabled = function() { return this.settings.enhanced_moderation; } -},{"../utils":27}],8:[function(require,module,exports){ +},{"../utils":28}],9:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, CSS = /\.([\w\-_]+)\s*?\{content:\s*?"([^"]+)";\s*?background-image:\s*?url\("([^"]+)"\);\s*?height:\s*?(\d+)px;\s*?width:\s*?(\d+)px;\s*?margin:([^;}]+);?([^}]*)\}/mg, MOD_CSS = /[^\n}]*\.badges\s+\.moderator\s*{\s*background-image:\s*url\(\s*['"]([^'"]+)['"][^}]+(?:}|$)/, @@ -1525,6 +1840,16 @@ FFZ.prototype.setup_room = function() { this.log("Hooking the Ember Room model."); + // Responsive ban button. + var RC = App.__container__.lookup('controller:room'); + if ( RC ) { + var orig_action = RC._actions.banUser; + RC._actions.banUser = function(e) { + orig_action.bind(this)(e); + this.get("model").clearMessages(e.user); + } + } + var Room = App.__container__.resolve('model:room'); this._modify_room(Room); @@ -1784,8 +2109,7 @@ FFZ.prototype._modify_room = function(room) { var suggestions = this._super(); try { - if ( f.settings.capitalize ) - suggestions = _.map(suggestions, FFZ.get_capitalization); + suggestions = _.map(suggestions, FFZ.get_capitalization); } catch(err) { f.error("get_suggestions: " + err); } @@ -1862,7 +2186,7 @@ FFZ.prototype._legacy_load_room_css = function(room_id, callback, data) { output.css = data || null; return this._load_room_json(room_id, callback, output); } -},{"../constants":3,"../utils":27}],9:[function(require,module,exports){ +},{"../constants":3,"../utils":28}],10:[function(require,module,exports){ var FFZ = window.FrankerFaceZ; @@ -1960,7 +2284,7 @@ FFZ.prototype._modify_viewers = function(controller) { }.property("content.chatters") }); } -},{}],10:[function(require,module,exports){ +},{}],11:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, CSS = /\.([\w\-_]+)\s*?\{content:\s*?"([^"]+)";\s*?background-image:\s*?url\("([^"]+)"\);\s*?height:\s*?(\d+)px;\s*?width:\s*?(\d+)px;\s*?margin:([^;}]+);?([^}]*)\}/mg, MOD_CSS = /[^\n}]*\.badges\s+\.moderator\s*{\s*background-image:\s*url\(\s*['"]([^'"]+)['"][^}]+(?:}|$)/, @@ -2165,7 +2489,7 @@ FFZ.prototype._legacy_load_css = function(set_id, callback, data) { this._load_set_json(set_id, callback, output); } -},{"./constants":3,"./utils":27}],11:[function(require,module,exports){ +},{"./constants":3,"./utils":28}],12:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, SENDER_REGEX = /(\sdata-sender="[^"]*"(?=>))/; @@ -2342,7 +2666,7 @@ FFZ.prototype.setup_bttv = function(delay) { this.update_ui_link(); } -},{}],12:[function(require,module,exports){ +},{}],13:[function(require,module,exports){ var FFZ = window.FrankerFaceZ; @@ -2418,7 +2742,7 @@ FFZ.prototype._emote_menu_enumerator = function() { return emotes; } -},{}],13:[function(require,module,exports){ +},{}],14:[function(require,module,exports){ // Modify Array and others. require('./shims'); @@ -2443,7 +2767,7 @@ FFZ.get = function() { return FFZ.instance; } // Version var VER = FFZ.version_info = { - major: 3, minor: 2, revision: 5, + major: 3, minor: 3, revision: 1, toString: function() { return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); } @@ -2514,7 +2838,7 @@ FFZ.prototype.get_user = function() { if ( window.PP && PP.login ) { return PP; } else if ( window.App ) { - var nc = App.__container__.lookup("controller:navigation"); + var nc = App.__container__.lookup("controller:login"); return nc ? nc.get("userData") : undefined; } } @@ -2536,6 +2860,7 @@ require('./emoticons'); require('./badges'); // Analytics: require('./ember/router'); +require('./ember/channel'); require('./ember/room'); require('./ember/line'); require('./ember/chatview'); @@ -2575,7 +2900,17 @@ FFZ.prototype.initialize = function(increment, delay) { // Make sure that FrankerFaceZ doesn't start setting itself up until the // Twitch ember application is ready. - // TODO: Special Dashboard check. + // Check for special non-ember pages. + if ( /\/(?:settings|messages?\/)/.test(location.pathname) ) { + this.setup_normal(delay); + return; + } + + // Check for the dashboard. + if ( /\/[A-Za-z_-]+\/dashboard/.test(location.pathname) && !/bookmarks$/.test(location.pathname) ) { + this.setup_dashboard(delay); + return; + } var loaded = window.App != undefined && App.__container__ != undefined && @@ -2595,6 +2930,65 @@ FFZ.prototype.initialize = function(increment, delay) { } +FFZ.prototype.setup_normal = function(delay) { + var start = (window.performance && performance.now) ? performance.now() : Date.now(); + this.log("Found non-Ember Twitch after " + (delay||0) + " ms in \"" + location + "\". Initializing FrankerFaceZ version " + FFZ.version_info); + + this.users = {}; + + // Initialize all the modules. + this.load_settings(); + + // Start this early, for quick loading. + this.setup_dark(); + + this.ws_create(); + this.setup_emoticons(); + this.setup_badges(); + + this.setup_notifications(); + this.setup_css(); + + this.find_bttv(10); + + var end = (window.performance && performance.now) ? performance.now() : Date.now(), + duration = end - start; + + this.log("Initialization complete in " + duration + "ms"); +} + + +FFZ.prototype.is_dashboard = false; + +FFZ.prototype.setup_dashboard = function(delay) { + var start = (window.performance && performance.now) ? performance.now() : Date.now(); + this.log("Found Twitch Dashboard after " + (delay||0) + " ms in \"" + location + "\". Initializing FrankerFaceZ version " + FFZ.version_info); + + this.users = {}; + this.is_dashboard = true; + + // Initialize all the modules. + this.load_settings(); + + // Start this early, for quick loading. + this.setup_dark(); + + this.ws_create(); + this.setup_emoticons(); + this.setup_badges(); + + this.setup_notifications(); + this.setup_css(); + + this.find_bttv(10); + + var end = (window.performance && performance.now) ? performance.now() : Date.now(), + duration = end - start; + + this.log("Initialization complete in " + duration + "ms"); +} + + FFZ.prototype.setup_ember = function(delay) { var start = (window.performance && performance.now) ? performance.now() : Date.now(); this.log("Found Twitch application after " + (delay||0) + " ms in \"" + location + "\". Initializing FrankerFaceZ version " + FFZ.version_info); @@ -2614,6 +3008,7 @@ FFZ.prototype.setup_ember = function(delay) { //this.setup_piwik(); //this.setup_router(); + this.setup_channel(); this.setup_room(); this.setup_line(); this.setup_chatview(); @@ -2639,7 +3034,7 @@ FFZ.prototype.setup_ember = function(delay) { this.log("Initialization complete in " + duration + "ms"); } -},{"./badges":1,"./commands":2,"./debug":4,"./ember/chatview":5,"./ember/line":6,"./ember/moderation-card":7,"./ember/room":8,"./ember/viewers":9,"./emoticons":10,"./ext/betterttv":11,"./ext/emote_menu":12,"./featurefriday":14,"./settings":15,"./shims":16,"./socket":17,"./ui/about_page":18,"./ui/dark":19,"./ui/menu":20,"./ui/menu_button":21,"./ui/my_emotes":22,"./ui/notifications":23,"./ui/races":24,"./ui/styles":25,"./ui/viewer_count":26}],14:[function(require,module,exports){ +},{"./badges":1,"./commands":2,"./debug":4,"./ember/channel":5,"./ember/chatview":6,"./ember/line":7,"./ember/moderation-card":8,"./ember/room":9,"./ember/viewers":10,"./emoticons":11,"./ext/betterttv":12,"./ext/emote_menu":13,"./featurefriday":15,"./settings":16,"./shims":17,"./socket":18,"./ui/about_page":19,"./ui/dark":20,"./ui/menu":21,"./ui/menu_button":22,"./ui/my_emotes":23,"./ui/notifications":24,"./ui/races":25,"./ui/styles":26,"./ui/viewer_count":27}],15:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, constants = require('./constants'); @@ -2689,7 +3084,7 @@ FFZ.prototype._feature_friday_ui = function(room_id, parent, view) { if ( ! this.feature_friday || this.feature_friday.channel == room_id ) return; - this._emotes_for_sets(parent, view, [this.feature_friday.set], this.feature_friday.title); + this._emotes_for_sets(parent, view, [this.feature_friday.set], this.feature_friday.title, this.feature_friday.icon, "FrankerFaceZ"); // Before we add the button, make sure the channel isn't the // current channel. @@ -2787,7 +3182,7 @@ FFZ.prototype._update_ff_name = function(name) { if ( this.feature_friday ) this.feature_friday.display_name = name; } -},{"./constants":3}],15:[function(require,module,exports){ +},{"./constants":3}],16:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, constants = require("./constants"); @@ -2848,6 +3243,19 @@ FFZ.prototype.load_settings = function() { // Menu Page // -------------------- +FFZ.settings_info.replace_twitch_menu = { + type: "boolean", + value: false, + + name: "Replace Twitch Emoticon Menu Beta", + help: "Completely replace the default Twitch emoticon menu.", + + on_update: function(val) { + document.body.classList.toggle("ffz-menu-replace", val); + } + }; + + FFZ.menu_pages.settings = { render: function(view, container) { var settings = {}, @@ -2931,37 +3339,53 @@ FFZ.menu_pages.settings = { el.className = 'clearfix'; - if ( info.type == "boolean" ) { - var swit = document.createElement('a'), - label = document.createElement('span'); - - swit.className = 'switch'; - swit.classList.toggle('active', val); - swit.innerHTML = ""; - + if ( this.has_bttv && info.no_bttv ) { + var label = document.createElement('span'), + help = document.createElement('span'); label.className = 'switch-label'; label.innerHTML = info.name; - el.appendChild(swit); - el.appendChild(label); + help = document.createElement('span'); + help.className = 'help'; + help.innerHTML = 'Disabled due to incompatibility with BetterTTV.'; - swit.addEventListener("click", toggle_setting.bind(this, swit, key)); + el.classList.add('disabled'); + el.appendChild(label); + el.appendChild(help); } else { - el.classList.add("option"); - var link = document.createElement('a'); - link.innerHTML = info.name; - link.href = "#"; - el.appendChild(link); + if ( info.type == "boolean" ) { + var swit = document.createElement('a'), + label = document.createElement('span'); - link.addEventListener("click", info.method.bind(this)); - } + swit.className = 'switch'; + swit.classList.toggle('active', val); + swit.innerHTML = ""; - if ( info.help ) { - var help = document.createElement('span'); - help.className = 'help'; - help.innerHTML = info.help; - el.appendChild(help); + label.className = 'switch-label'; + label.innerHTML = info.name; + + el.appendChild(swit); + el.appendChild(label); + + swit.addEventListener("click", toggle_setting.bind(this, swit, key)); + + } else { + el.classList.add("option"); + var link = document.createElement('a'); + link.innerHTML = info.name; + link.href = "#"; + el.appendChild(link); + + link.addEventListener("click", info.method.bind(this)); + } + + if ( info.help ) { + var help = document.createElement('span'); + help.className = 'help'; + help.innerHTML = info.help; + el.appendChild(help); + } } menu.appendChild(el); @@ -2973,7 +3397,8 @@ FFZ.menu_pages.settings = { name: "Settings", icon: constants.GEAR, - sort_order: 99999 + sort_order: 99999, + wide: true }; @@ -2985,8 +3410,6 @@ FFZ.prototype._setting_update = function(e) { if ( ! e ) e = window.event; - this.log("Storage Event", e); - if ( ! e.key || e.key.substr(0, 12) !== "ffz_setting_" ) return; @@ -3079,7 +3502,7 @@ FFZ.prototype._setting_del = function(key) { this.log('Error running updater for setting "' + key + '": ' + err); } } -},{"./constants":3}],16:[function(require,module,exports){ +},{"./constants":3}],17:[function(require,module,exports){ Array.prototype.equals = function (array) { // if the other array is a falsy value, return if (!array) @@ -3105,7 +3528,7 @@ Array.prototype.equals = function (array) { } -},{}],17:[function(require,module,exports){ +},{}],18:[function(require,module,exports){ var FFZ = window.FrankerFaceZ; FFZ.prototype._ws_open = false; @@ -3144,6 +3567,13 @@ FFZ.prototype.ws_create = function() { if ( user ) f.ws_send("setuser", user.login); + // Join the right channel if we're in the dashboard. + if ( f.is_dashboard ) { + var match = location.pathname.match(/\/([^\/]+)/); + if ( match ) + f.ws_send("sub", match[1]); + } + // Send the current rooms. for(var room_id in f.rooms) f.rooms.hasOwnProperty(room_id) && f.ws_send("sub", room_id); @@ -3267,7 +3697,7 @@ FFZ.ws_commands.do_authorize = function(data) { // Try again shortly. setTimeout(FFZ.ws_commands.do_authorize.bind(this, data), 5000); } -},{}],18:[function(require,module,exports){ +},{}],19:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, constants = require("../constants"); @@ -3307,6 +3737,18 @@ FFZ.menu_pages.about = { heading.innerHTML = content; container.appendChild(heading); + var clicks = 0, head = heading.querySelector("h1"); + head && head.addEventListener("click", function() { + head.style.cursor = "pointer"; + clicks++; + if ( clicks >= 3 ) { + clicks = 0; + var el = document.querySelector(".app-main") || document.querySelector(".ember-chat-container"); + el && el.classList.toggle('ffz-flip'); + } + setTimeout(function(){clicks=0;head.style.cursor=""},2000); + }); + // Advertising var btn_container = document.createElement('div'), @@ -3363,7 +3805,7 @@ FFZ.menu_pages.about = { container.appendChild(credits); } } -},{"../constants":3}],19:[function(require,module,exports){ +},{"../constants":3}],20:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, constants = require("../constants"); @@ -3383,9 +3825,10 @@ FFZ.settings_info.dark_twitch = { type: "boolean", value: false, - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, - name: "Dark Twitch Beta", + name: "Dark Twitch", help: "Apply a dark background to channels and other related pages for easier viewing.", on_update: function(val) { @@ -3394,14 +3837,14 @@ FFZ.settings_info.dark_twitch = { document.body.classList.toggle("ffz-dark", val); - var model = App.__container__.lookup('controller:settings').get('model'); + var model = window.App ? App.__container__.lookup('controller:settings').get('model') : undefined; if ( val ) { this._load_dark_css(); - this.settings.set('twitch_chat_dark', model.get('darkMode')); - model.set('darkMode', true); + model && this.settings.set('twitch_chat_dark', model.get('darkMode')); + model && model.set('darkMode', true); } else - model.set('darkMode', this.settings.twitch_chat_dark); + model && model.set('darkMode', this.settings.twitch_chat_dark); } }; @@ -3416,7 +3859,7 @@ FFZ.prototype.setup_dark = function() { document.body.classList.toggle("ffz-dark", this.settings.dark_twitch); if ( this.settings.dark_twitch ) - App.__container__.lookup('controller:settings').set('model.darkMode', true); + window.App && App.__container__.lookup('controller:settings').set('model.darkMode', true); if ( this.settings.dark_twitch ) this._load_dark_css(); @@ -3436,9 +3879,12 @@ FFZ.prototype._load_dark_css = function() { s.setAttribute('href', constants.SERVER + "script/dark.css?_=" + Date.now()); document.head.appendChild(s); } -},{"../constants":3}],20:[function(require,module,exports){ +},{"../constants":3}],21:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, - constants = require('../constants'); + constants = require('../constants'), + utils = require('../utils'), + + TWITCH_BASE = "http://static-cdn.jtvnw.net/emoticons/v1/"; // -------------------- @@ -3462,6 +3908,8 @@ FFZ.prototype.setup_menu = function() { delete f._popup_kill; } }); + + document.body.classList.toggle("ffz-menu-replace", this.settings.replace_twitch_menu); } @@ -3547,27 +3995,31 @@ FFZ.prototype.build_ui_popup = function(view) { jQuery(link).tipsy(); - link.addEventListener("click", this._ui_change_page.bind(this, view, menu, sub_container, key)); + link.addEventListener("click", this._ui_change_page.bind(this, view, inner, menu, sub_container, key)); el.appendChild(link); menu.appendChild(el); } // Render Current Page - this._ui_change_page(view, menu, sub_container, this._last_page || "channel"); + this._ui_change_page(view, inner, menu, sub_container, this._last_page || "channel"); // Add the menu to the DOM. this._popup = container; - sub_container.style.maxHeight = Math.max(100, view.$().height() - 162) + "px"; + sub_container.style.maxHeight = Math.max(200, view.$().height() - 172) + "px"; view.$('.chat-interface').append(container); } -FFZ.prototype._ui_change_page = function(view, menu, container, page) { +FFZ.prototype._ui_change_page = function(view, inner, menu, container, page) { this._last_page = page; container.innerHTML = ""; container.setAttribute('data-page', page); + // Allow settings to be wide. We need to know if chat is stand-alone. + var app = document.querySelector(".app-main") || document.querySelector(".ember-chat-container"); + inner.style.maxWidth = (!FFZ.menu_pages[page].wide || (typeof FFZ.menu_pages[page].wide == "function" && !FFZ.menu_pages[page].wide.bind(this)())) ? "" : (app.offsetWidth < 640 ? (app.offsetWidth-40) : 600) + "px"; + var els = menu.querySelectorAll('li.active'); for(var i=0; i < els.length; i++) els[i].classList.remove('active'); @@ -3582,55 +4034,6 @@ FFZ.prototype._ui_change_page = function(view, menu, container, page) { } -// -------------------- -// Favorites Page -// -------------------- - -FFZ.prototype._tokenize_message = function(message, room_id) { - var lc = App.__container__.lookup('controller:line'), - rc = App.__container__.lookup('controller:room'), - room = this.rooms[room_id], - user = this.get_user(); - - if ( ! lc || ! rc || ! room ) - return [message]; - - rc.set('model', room.room); - lc.set('parentController', rc); - - var model = { - from: user && user.login || "FrankerFaceZ", - message: message, - tags: { - emotes: room.room.tmiSession._emotesParser.parseEmotesTag(message) - } - }; - - lc.set('model', model); - - var tokens = lc.get('tokenizedMessage'); - - lc.set('model', null); - rc.set('model', null); - lc.set('parentController', null); - - return tokens; -} - - -/*FFZ.menu_pages.favorites = { - render: function(view, container) { - // Get the current room. - var room_id = view.get('controller.currentRoom.id'); - - - }, - - name: "Favorites", - icon: constants.HEART - };*/ - - // -------------------- // Channel Page // -------------------- @@ -3639,10 +4042,107 @@ FFZ.menu_pages.channel = { render: function(view, inner) { // Get the current room. var room_id = view.get('controller.currentRoom.id'), - room = this.rooms[room_id]; + room = this.rooms[room_id], + has_product = false; + + // Check for a product. + if ( this.settings.replace_twitch_menu ) { + var product = room.room.get("product"); + if ( product && !product.get("error") ) { + // We have a product, and no error~! + has_product = true; + var is_subscribed = room.room.get("channel.isSubscribed.content"), + icon = room.room.get("badgeSet.subscriber.image"), + + grid = document.createElement("div"), + header = document.createElement("div"), + c = 0; + + // Weird is_subscribed check. Might be more accurate? + is_subscribed = is_subscribed && is_subscribed.length > 0; + + grid.className = "emoticon-grid"; + header.className = "heading"; + if ( icon ) + header.style.backgroundImage = 'url("' + icon + '")'; + + header.innerHTML = 'TwitchSubscriber Emoticons'; + grid.appendChild(header); + + for(var emotes=product.get("emoticons"), i=0; i < emotes.length; i++) { + var emote = emotes[i]; + if ( emote.state !== "active" ) + continue; + + var s = document.createElement('span'), + can_use = is_subscribed || !emote.subscriber_only, + img_set = 'image-set(url("' + TWITCH_BASE + emote.id + '/1.0") 1x, url("' + TWITCH_BASE + emote.id + '/2.0") 2x, url("' + TWITCH_BASE + emote.id + '/3.0") 4x)'; + + s.className = 'emoticon tooltip' + (!can_use ? " locked" : ""); + + s.style.backgroundImage = 'url("' + TWITCH_BASE + emote.id + '/1.0")'; + s.style.backgroundImage = '-webkit-' + img_set; + s.style.backgroundImage = '-moz-' + img_set; + s.style.backgroundImage = '-ms-' + img_set; + s.style.backgroundImage = img_set; + + s.style.width = emote.width + "px"; + s.style.height = emote.height + "px"; + s.title = emote.regex; + if ( can_use ) + s.addEventListener('click', this._add_emote.bind(this, view, emote.regex)); + grid.appendChild(s); + c++; + } + + if ( c > 0 ) + inner.appendChild(grid); + + if ( ! is_subscribed ) { + var sub_message = document.createElement("div"), + nonsub_message = document.createElement("div"), + unlock_text = document.createElement("span"), + sub_link = document.createElement("a"); + + sub_message.className = "subscribe-message"; + nonsub_message.className = "non-subscriber-message"; + sub_message.appendChild(nonsub_message); + + unlock_text.className = "unlock-text"; + unlock_text.innerHTML = "Subscribe to unlock Emoticons"; + nonsub_message.appendChild(unlock_text); + + sub_link.className = "action subscribe-button button primary"; + sub_link.href = product.get("product_url"); + sub_link.innerHTML = 'Subscribe' + product.get("price") + ''; + nonsub_message.appendChild(sub_link); + + inner.appendChild(sub_message); + } else { + var last_content = room.room.get("channel.isSubscribed.content"); + last_content = last_content.length > 0 ? last_content[last_content.length-1] : undefined; + if ( last_content && last_content.purchase_profile && !last_content.purchase_profile.will_renew ) { + var ends_at = utils.parse_date(last_content.access_end || ""); + sub_message = document.createElement("div"), + nonsub_message = document.createElement("div"), + unlock_text = document.createElement("span"), + end_time = ends_at ? Math.floor((ends_at.getTime() - Date.now()) / 1000) : null; + + sub_message.className = "subscribe-message"; + nonsub_message.className = "non-subscriber-message"; + sub_message.appendChild(nonsub_message); + + unlock_text.className = "unlock-text"; + unlock_text.innerHTML = "Subscription expires in " + utils.time_to_string(end_time, true, true); + nonsub_message.appendChild(unlock_text); + inner.appendChild(sub_message); + } + } + } + } // Basic Emote Sets - this._emotes_for_sets(inner, view, room && room.menu_sets || []); + this._emotes_for_sets(inner, view, room && room.menu_sets || [], (this.feature_friday || has_product) ? "Channel Emoticons" : null, "http://cdn.frankerfacez.com/channel/global/devicon.png", "FrankerFaceZ"); // Feature Friday! this._feature_friday_ui(room_id, inner, view); @@ -3657,21 +4157,29 @@ FFZ.menu_pages.channel = { // Emotes for Sets // -------------------- -FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, btn) { - if ( header != null ) { - var el_header = document.createElement('div'); - el_header.className = 'list-header'; - el_header.appendChild(document.createTextNode(header)); - - if ( btn ) - el_header.appendChild(btn); - - parent.appendChild(el_header); - } - +FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, image, sub_text) { var grid = document.createElement('div'), c = 0; grid.className = 'emoticon-grid'; + if ( header != null ) { + var el_header = document.createElement('div'); + el_header.className = 'heading'; + + if ( sub_text ) { + var s = document.createElement("span"); + s.className = "right"; + s.appendChild(document.createTextNode(sub_text)); + el_header.appendChild(s); + } + + el_header.appendChild(document.createTextNode(header)); + + if ( image ) + el_header.style.backgroundImage = 'url("' + image + '")'; + + grid.appendChild(el_header); + } + for(var i=0; i < sets.length; i++) { var set = this.emote_sets[sets[i]]; if ( ! set || ! set.emotes ) @@ -3698,8 +4206,8 @@ FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, btn) { } if ( !c ) { - grid.innerHTML = "This channel has no emoticons."; - grid.className = "chat-menu-content ffz-no-emotes center"; + grid.innerHTML += "This channel has no emoticons."; + grid.className = "emoticon-grid ffz-no-emotes center"; } parent.appendChild(grid); @@ -3725,7 +4233,7 @@ FFZ.prototype._add_emote = function(view, emote) { else room.set('messageToSend', text); } -},{"../constants":3}],21:[function(require,module,exports){ +},{"../constants":3,"../utils":28}],22:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, constants = require('../constants'); @@ -3746,7 +4254,7 @@ FFZ.prototype.build_ui_link = function(view) { FFZ.prototype.update_ui_link = function(link) { - var controller = App.__container__.lookup('controller:chat'); + var controller = window.App && App.__container__.lookup('controller:chat'); link = link || document.querySelector('a.ffz-ui-toggle'); if ( !link || !controller ) return; @@ -3776,7 +4284,7 @@ FFZ.prototype.update_ui_link = function(link) { link.classList.toggle('dark', dark); link.classList.toggle('blue', blue); } -},{"../constants":3}],22:[function(require,module,exports){ +},{"../constants":3}],23:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, constants = require("../constants"), @@ -3784,6 +4292,12 @@ var FFZ = window.FrankerFaceZ, BANNED_SETS = {"00000turbo":true}, KNOWN_CODES = { + "#-?[\\\\/]": "#-/", + ":-?(?:7|L)": ":-7", + "\\<\\;\\]": "<]", + "\\:-?(S|s)": ":-S", + "\\:-?\\\\": ":-\\", + "\\:\\>\\;": ":>", "B-?\\)": "B-)", "\\:-?[z|Z|\\|]": ":-Z", "\\:-?\\)": ":-)", @@ -3791,7 +4305,7 @@ var FFZ = window.FrankerFaceZ, "\\:-?(p|P)": ":-P", "\\;-?(p|P)": ";-P", "\\<\\;3": "<3", - "\\:-?(?:\\/|\\\\)(?!\\/)": ":-/", + "\\:-?[\\\\/]": ":-/", "\\;-?\\)": ";-)", "R-?\\)": "R-)", "[o|O](_|\\.)[o|O]": "O.o", @@ -3812,7 +4326,7 @@ var FFZ = window.FrankerFaceZ, user_sets = user && ffz.users[user.login] && ffz.users[user.login].sets || []; // Remove the 'default' set. - set_ids = set_ids.split(",").removeObject("0") + set_ids = set_ids.split(",").removeObject("0"); if ( ffz.settings.global_emotes_in_menu ) { set_ids.push("0"); @@ -3847,6 +4361,8 @@ FFZ.prototype.setup_my_emotes = function() { } this._twitch_set_to_channel[0] = "twitch_global"; + this._twitch_set_to_channel[33] = "twitch_tfaces"; + this._twitch_set_to_channel[42] = "twitch_tfaces"; } @@ -3930,7 +4446,7 @@ FFZ.menu_pages.my_emotes = { return; } - if ( name == "turbo" ) { + if ( name == "turbo" || name == "twitch_tfaces" ) { set.channel = "Twitch Turbo"; set.badge = "//cdn.frankerfacez.com/script/turbo_badge.png"; return; @@ -3970,7 +4486,7 @@ FFZ.menu_pages.my_emotes = { if ( ! set.channel ) set.channel = name; dn(); - }.bind(this,set,name,dn), 2000); + }.bind(this,set,name,dn), 500); }.bind(this, set, lname, name))); }, handle_promises = function() { @@ -4065,11 +4581,16 @@ FFZ.menu_pages.my_emotes = { var an = a[1].toLowerCase(), bn = b[1].toLowerCase(); - if ( an === "twitch turbo" || an === "global emoticons" ) - an = "zzz" + an; + if ( an === "twitch turbo" || an === "twitch_tfaces" ) + an = "zza|" + an; + + else if ( an === "global emoticons" ) + an = "zzz|" + an; - if ( bn === "twitch turbo" || bn === "global emoticons" ) - bn = "zzz" + bn; + if ( bn === "twitch turbo" || bn === "twitch_tfaces" ) + bn = "zza|" + bn; + else if ( bn === "global emoticons" ) + bn = "zzz|" + bn; if ( an < bn ) return -1; else if ( an > bn ) return 1; @@ -4104,7 +4625,7 @@ FFZ.menu_pages.my_emotes = { } else { ems = set.emotes; - title = FFZ.get_capitalization(set.channel); + title = set.channel == "Twitch Turbo" ? set.channel : FFZ.get_capitalization(set.channel); badge = set.badge; } @@ -4181,7 +4702,7 @@ FFZ.menu_pages.my_emotes = { } }; -},{"../constants":3}],23:[function(require,module,exports){ +},{"../constants":3}],24:[function(require,module,exports){ var FFZ = window.FrankerFaceZ; @@ -4204,7 +4725,8 @@ FFZ.settings_info.highlight_notifications = { value: false, category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Highlight Notifications", help: "Display notifications when a highlighted word appears in chat in an unfocused tab.", @@ -4330,7 +4852,7 @@ FFZ.prototype.show_message = function(message) { closeWith: ["button"] }).show(); } -},{}],24:[function(require,module,exports){ +},{}],25:[function(require,module,exports){ var FFZ = window.FrankerFaceZ, utils = require('../utils'); @@ -4520,14 +5042,14 @@ FFZ.prototype.build_race_popup = function() { out += '
| # | Entrant | Time |
|---|
SRL'; - + if ( has_entrant ) out += ' Multitwitch'; - + out += '
'; popup.innerHTML = out; container.appendChild(popup); @@ -4617,7 +5139,7 @@ FFZ.prototype._update_race = function(not_timer) { tbody.innerHTML += ''+BetterTTV.chat.templates.timestamp(r.time)+" "+(s?BetterTTV.chat.templates.modicons():"")+" "+BetterTTV.chat.templates.badges(r.badges)+BetterTTV.chat.templates.from(r.nickname,r.color)+BetterTTV.chat.templates.message(r.sender,r.message,r.emotes,t?r.color:!1)+"
"}catch(l){return n.log("Error: ",l),a(e,t,i,s,r)}};var s,r=BetterTTV.chat.templates.message;BetterTTV.chat.templates.message=function(e,t,o,i){try{i=i||!1;var a=encodeURIComponent(t);if("jtv"!==e){s=e;var l=BetterTTV.chat.templates.emoticonize(t,o);s=null;for(var c=0;cFrankerFaceZ
",c+='new ways to woof
',l.className="chat-menu-content center",l.innerHTML=c,t.appendChild(l);var u=document.createElement("div"),d=document.createElement("a"),h="To use custom emoticons in "+(i?"this channel":"tons of channels")+", get FrankerFaceZ from http://www.frankerfacez.com";d.className="button primary",d.innerHTML="Advertise in Chat",d.addEventListener("click",this._add_emote.bind(this,e,h)),u.appendChild(d);var m=document.createElement("a");m.className="button ffz-donate",m.href="http://www.frankerfacez.com/donate.html",m.target="_new",m.innerHTML="Donate",u.appendChild(m),u.className="chat-menu-content center",t.appendChild(u);var _=document.createElement("div");c='| Developers | |||
|---|---|---|---|
| Dan Salvato | |||
| Stendec | |||
| Version '+n.version_info+' | Logs | ||
| # | Entrant | Time |
|---|
SRL',c&&(r+=' Multitwitch'),r+="
",e.innerHTML=r,t.appendChild(e),this._update_race(!0)}}},n.prototype._update_race=function(e){this._race_timer&&e&&(clearTimeout(this._race_timer),delete this._race_timer);var t=document.querySelector("#ffz-ui-race");if(t){var n=t.getAttribute("data-channel"),i=this.srl_races[n];if(!i)return t.parentElement.removeChild(t),this._popup_kill&&this._popup_kill(),void(this._popup&&(delete this._popup,delete this._popup_kill));var a=i.twitch_entrants[n],s=i.entrants[a],r=t.querySelector("#ffz-race-popup"),l=Date.now()/1e3,c=Math.floor(l-i.time);if(t.querySelector(".logo").innerHTML=o.placement(s),r){var u=r.querySelector("tbody"),d=r.querySelector(".heading span"),h=r.querySelector(".heading div");u.innerHTML="";var m=[],_=!0;for(var p in i.entrants)i.entrants.hasOwnProperty(p)&&("racing"==i.entrants[p].state&&(_=!1),m.push(i.entrants[p]));m.sort(function(e,t){var n=e.place||9999,o=t.place||9999,i=e.time||c,a=t.time||c;return("forfeit"==e.state||"dq"==e.state)&&(n=1e4),("forfeit"==t.state||"dq"==t.state)&&(o=1e4),o>n?-1:n>o?1:e.name'+F+"
Goal: "+E}c?_?d.innerHTML="Done":(d.innerHTML=o.time_to_string(c),this._race_timer=setTimeout(this._update_race.bind(this),1e3)):d.innerHTML="Entry Open"}}}},{"../utils":27}],25:[function(t){var n=e.FrankerFaceZ,o=t("../constants");n.prototype.setup_css=function(){this.log("Injecting main FrankerFaceZ CSS.");var e=this._main_style=document.createElement("link");e.id="ffz-ui-css",e.setAttribute("rel","stylesheet"),e.setAttribute("href",o.SERVER+"script/style.css?_="+Date.now()),document.head.appendChild(e),jQuery.noty.themes.ffzTheme={name:"ffzTheme",style:function(){this.$bar.removeClass().addClass("noty_bar").addClass("ffz-noty").addClass(this.options.type)},callback:{onShow:function(){},onClose:function(){}}}}},{"../constants":3}],26:[function(t){var n=e.FrankerFaceZ,o=t("../constants"),i=t("../utils");n.ws_commands.viewers=function(e){var t=e[0],n=e[1],a=App.__container__.lookup("controller:channel"),s=a&&a.get&&a.get("id");if(s===t){var r=document.querySelector(".channel-stats .ffz.stat"),l=o.ZREKNARF+" "+i.number_commas(n);if(r)r.innerHTML=l;else{var c=document.querySelector(".channel-stats");if(!c)return;r=document.createElement("span"),r.className="ffz stat",r.title="Viewers with FrankerFaceZ",r.innerHTML=l,c.appendChild(r),jQuery(r).tipsy()}}}},{"../constants":3,"../utils":27}],27:[function(t,n){var o=(e.FrankerFaceZ,t("./constants"),{}),i=document.createElement("span"),a=function(e){return 1==e?"1st":2==e?"2nd":3==e?"3rd":null==e?"---":e+"th"},s=function(e,t){t=0===t?0:t||1,t=Math.round(255*-(t/100));var n=Math.max(0,Math.min(255,e[0]-t)),o=Math.max(0,Math.min(255,e[1]-t)),i=Math.max(0,Math.min(255,e[2]-t));return[n,o,i]},r=function(e){return"rgb("+e[0]+", "+e[1]+", "+e[2]+")"},l=function(e,t){return t=0===t?0:t||1,s(e,-t)},c=function(e){e=[e[0]/255,e[1]/255,e[2]/255];for(var t=0;t",t+="Channel: "+a.sanitize(n.channel)+" | "+a.time_to_string(n.duration)+"
",t+=a.number_commas(n.views||0)+" Views | 👍 "+a.number_commas(n.likes||0)+" 👎 "+a.number_commas(n.dislikes||0);else if("strawpoll"==n.type){t="Strawpoll: "+a.sanitize(n.title)+"
| '+a.sanitize(o)+' | '+a.number_commas(i)+" |
Total: "+a.number_commas(n.total);var s=a.parse_date(n.fetched);if(s){var r=Math.floor((s.getTime()-Date.now())/1e3);r>60&&(t+="
Data was cached "+a.time_to_string(r)+" ago.")}}else if("twitch"==n.type){t="Twitch: "+a.sanitize(n.display_name)+"
";var l=a.parse_date(n.since);l&&(t+="Member Since: "+a.date_string(l)+"
"),t+="
",t+=a.sanitize(n.tweet);else if("reputation"==n.type){if(t=''+a.sanitize(n.full.toLowerCase())+"",n.trust<50||n.safety<50||n.tags&&n.tags.length>0){t+="
";var c=!1;(n.trust<50||n.safety<50)&&(n.unsafe=!0,t+="Potentially Unsafe Link
",t+="Trust: "+n.trust+"% | Child Safety: "+n.safety+"%",c=!0),n.tags&&n.tags.length>0&&(t+=(c?"
":"")+"Tags: "+n.tags.join(", ")),t+="
Data Source: WOT"}}else n.full&&(t=''+a.sanitize(n.full.toLowerCase())+"");return t||(t=''+a.sanitize(e.toLowerCase())+""),n.tooltip=t,t},m=function(e,t,n){if(t){this._link_data[e]=n,n.unsafe=!1;var a,o=p.bind(this)(e),i="/"==e.charAt(e.length-1)?e.substr(0,e.length-1):null;if(a=document.querySelectorAll(i?'span.message a[href="'+e+'"], span.message a[href="'+i+'"], span.message a[data-url="'+e+'"], span.message a[data-url="'+i+'"]':'span.message a[href="'+e+'"], span.message a[data-url="'+e+'"]'),this.settings.link_info)for(var s=0;s
'+BetterTTV.chat.templates.timestamp(r.time)+" "+(s?BetterTTV.chat.templates.modicons():"")+" "+BetterTTV.chat.templates.badges(r.badges)+BetterTTV.chat.templates.from(r.nickname,r.color)+BetterTTV.chat.templates.message(r.sender,r.message,r.emotes,t?r.color:!1)+"
"}catch(l){return n.log("Error: ",l),i(e,t,o,s,r)}};var s,r=BetterTTV.chat.templates.message;BetterTTV.chat.templates.message=function(e,t,a,o){try{o=o||!1;var i=encodeURIComponent(t);if("jtv"!==e){s=e;var l=BetterTTV.chat.templates.emoticonize(t,a);s=null;for(var c=0;cFrankerFaceZ
",c+='new ways to woof
',l.className="chat-menu-content center",l.innerHTML=c,t.appendChild(l);var u=0,d=l.querySelector("h1");d&&d.addEventListener("click",function(){if(d.style.cursor="pointer",u++,u>=3){u=0;var e=document.querySelector(".app-main")||document.querySelector(".ember-chat-container");e&&e.classList.toggle("ffz-flip")}setTimeout(function(){u=0,d.style.cursor=""},2e3)});var h=document.createElement("div"),p=document.createElement("a"),m="To use custom emoticons in "+(o?"this channel":"tons of channels")+", get FrankerFaceZ from http://www.frankerfacez.com";p.className="button primary",p.innerHTML="Advertise in Chat",p.addEventListener("click",this._add_emote.bind(this,e,m)),h.appendChild(p);var _=document.createElement("a");_.className="button ffz-donate",_.href="http://www.frankerfacez.com/donate.html",_.target="_new",_.innerHTML="Donate",h.appendChild(_),h.className="chat-menu-content center",t.appendChild(h);var f=document.createElement("div");c='| Developers | |||
|---|---|---|---|
| Dan Salvato | |||
| Stendec | |||
| Version '+n.version_info+' | Logs | ||
| # | Entrant | Time |
|---|
SRL',c&&(r+=' Multitwitch'),r+="
",e.innerHTML=r,t.appendChild(e),this._update_race(!0)}}},n.prototype._update_race=function(e){this._race_timer&&e&&(clearTimeout(this._race_timer),delete this._race_timer);var t=document.querySelector("#ffz-ui-race");if(t){var n=t.getAttribute("data-channel"),o=this.srl_races[n];if(!o)return t.parentElement.removeChild(t),this._popup_kill&&this._popup_kill(),void(this._popup&&(delete this._popup,delete this._popup_kill));var i=o.twitch_entrants[n],s=o.entrants[i],r=t.querySelector("#ffz-race-popup"),l=Date.now()/1e3,c=Math.floor(l-o.time);if(t.querySelector(".logo").innerHTML=a.placement(s),r){var u=r.querySelector("tbody"),d=r.querySelector(".heading span"),h=r.querySelector(".heading div");u.innerHTML="";var p=[],m=!0;for(var _ in o.entrants)o.entrants.hasOwnProperty(_)&&("racing"==o.entrants[_].state&&(m=!1),p.push(o.entrants[_]));p.sort(function(e,t){var n=e.place||9999,a=t.place||9999,o=e.time||c,i=t.time||c;return("forfeit"==e.state||"dq"==e.state)&&(n=1e4),("forfeit"==t.state||"dq"==t.state)&&(a=1e4),a>n?-1:n>a?1:e.name'+F+"
Goal: "+E}c?m?d.innerHTML="Done":(d.innerHTML=a.time_to_string(c),this._race_timer=setTimeout(this._update_race.bind(this),1e3)):d.innerHTML="Entry Open"}}}},{"../utils":28}],26:[function(t){var n=e.FrankerFaceZ,a=t("../constants");n.prototype.setup_css=function(){this.log("Injecting main FrankerFaceZ CSS.");var e=this._main_style=document.createElement("link");e.id="ffz-ui-css",e.setAttribute("rel","stylesheet"),e.setAttribute("href",a.SERVER+"script/style.css?_="+Date.now()),document.head.appendChild(e),jQuery.noty.themes.ffzTheme={name:"ffzTheme",style:function(){this.$bar.removeClass().addClass("noty_bar").addClass("ffz-noty").addClass(this.options.type)},callback:{onShow:function(){},onClose:function(){}}}}},{"../constants":3}],27:[function(t){var n=e.FrankerFaceZ,a=t("../constants"),o=t("../utils");n.ws_commands.viewers=function(t){var n=t[0],i=t[1],s=e.App&&App.__container__.lookup("controller:channel"),r=this.is_dashboard?location.pathname.match(/\/([^\/]+)/):void 0,l=this.is_dashboard?r&&r[1]:s&&s.get&&s.get("id");if(l===n){var c=document.querySelector("#ffz-viewer-display"),u=a.ZREKNARF+" "+o.number_commas(i);if(c)c.innerHTML=u;else{var d=document.querySelector(this.is_dashboard?"#stats":".stats-and-actions .channel-stats");if(!d)return;c=document.createElement("span"),c.id="ffz-viewer-display",c.className="ffz stat",c.title="Chatters with FrankerFaceZ",c.innerHTML=u,d.appendChild(c),jQuery(c).tipsy(this.is_dashboard?{gravity:"s"}:void 0)}}}},{"../constants":3,"../utils":28}],28:[function(t,n){var a=(e.FrankerFaceZ,t("./constants"),{}),o=document.createElement("span"),i=function(e){return 1==e?"1st":2==e?"2nd":3==e?"3rd":null==e?"---":e+"th"},s=function(e,t){t=0===t?0:t||1,t=Math.round(255*-(t/100));var n=Math.max(0,Math.min(255,e[0]-t)),a=Math.max(0,Math.min(255,e[1]-t)),o=Math.max(0,Math.min(255,e[2]-t));return[n,a,o]},r=function(e){return"rgb("+e[0]+", "+e[1]+", "+e[2]+")"},l=function(e,t){return t=0===t?0:t||1,s(e,-t)},c=function(e){e=[e[0]/255,e[1]/255,e[2]/255];for(var t=0;t"; + tooltip += "Channel: " + utils.sanitize(link_data.channel) + " | " + utils.time_to_string(link_data.duration) + "
"; + tooltip += utils.number_commas(link_data.views||0) + " Views | 👍 " + utils.number_commas(link_data.likes||0) + " 👎 " + utils.number_commas(link_data.dislikes||0); + + } else if ( link_data.type == "strawpoll" ) { + tooltip = "Strawpoll: " + utils.sanitize(link_data.title) + "
| ' + utils.sanitize(key) + ' | ' + utils.number_commas(votes) + " |
Total: " + utils.number_commas(link_data.total); + var fetched = utils.parse_date(link_data.fetched); + if ( fetched ) { + var age = Math.floor((fetched.getTime() - Date.now()) / 1000); + if ( age > 60 ) + tooltip += "
Data was cached " + utils.time_to_string(age) + " ago."; + } + + + } else if ( link_data.type == "twitch" ) { + tooltip = "Twitch: " + utils.sanitize(link_data.display_name) + "
"; + var since = utils.parse_date(link_data.since); + if ( since ) + tooltip += "Member Since: " + utils.date_string(since) + "
"; + tooltip += "
"; + tooltip += utils.sanitize(link_data.tweet); + + + } else if ( link_data.type == "reputation" ) { + tooltip = '' + utils.sanitize(link_data.full.toLowerCase()) + ''; + if ( link_data.trust < 50 || link_data.safety < 50 || (link_data.tags && link_data.tags.length > 0) ) { + tooltip += "
"; + var had_extra = false; + if ( link_data.trust < 50 || link_data.safety < 50 ) { + link_data.unsafe = true; + tooltip += "Potentially Unsafe Link
"; + tooltip += "Trust: " + link_data.trust + "% | Child Safety: " + link_data.safety + "%"; + had_extra = true; + } + + if ( link_data.tags && link_data.tags.length > 0 ) + tooltip += (had_extra ? "
" : "") + "Tags: " + link_data.tags.join(", "); + + tooltip += "
Data Source: WOT"; + } + + + } else if ( link_data.full ) + tooltip = '' + utils.sanitize(link_data.full.toLowerCase()) + ''; + + if ( ! tooltip ) + tooltip = '' + utils.sanitize(href.toLowerCase()) + ''; + + link_data.tooltip = tooltip; + return tooltip; + }, + + load_link_data = function(href, success, data) { + if ( ! success ) + return; + + this._link_data[href] = data; + data.unsafe = false; + + var tooltip = build_link_tooltip.bind(this)(href), links, + no_trail = href.charAt(href.length-1) == "/" ? href.substr(0, href.length-1) : null; + + if ( no_trail ) + links = document.querySelectorAll('span.message a[href="' + href + '"], span.message a[href="' + no_trail + '"], span.message a[data-url="' + href + '"], span.message a[data-url="' + no_trail + '"]'); + else + links = document.querySelectorAll('span.message a[href="' + href + '"], span.message a[data-url="' + href + '"]'); + + if ( ! this.settings.link_info ) + return; + + for(var x=0; x < links.length; x++) { + if ( data.unsafe ) + links[x].classList.add('unsafe-link'); + + if ( ! links[x].classList.contains('deleted-link') ) + links[x].title = tooltip; + } }; @@ -78,24 +178,13 @@ var FFZ = window.FrankerFaceZ, // Settings // --------------------- -FFZ.settings_info.capitalize = { - type: "boolean", - value: true, - - category: "Chat", - visible: function() { return ! this.has_bttv }, - - name: "Username Capitalization", - help: "Display names in chat with proper capitalization." - }; - - FFZ.settings_info.banned_words = { type: "button", value: [], category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Banned Words", help: "Set a list of words that will be locally removed from chat messages.", @@ -126,7 +215,8 @@ FFZ.settings_info.keywords = { value: [], category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Highlight Keywords", help: "Set additional keywords that will be highlighted in chat.", @@ -158,7 +248,8 @@ FFZ.settings_info.fix_color = { value: true, category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Adjust Username Colors", help: "Ensure that username colors contrast with the background enough to be readable.", @@ -172,12 +263,26 @@ FFZ.settings_info.fix_color = { }; +FFZ.settings_info.link_info = { + type: "boolean", + value: true, + + category: "Chat", + no_bttv: true, + //visible: function() { return ! this.has_bttv }, + + name: "Link Tooltips Beta", + help: "Check links against known bad websites, unshorten URLs, and show YouTube info." + }; + + FFZ.settings_info.chat_rows = { type: "boolean", value: false, category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Chat Line Backgrounds", help: "Display alternating background colors for lines in chat.", @@ -211,6 +316,7 @@ FFZ.prototype.setup_line = function() { // Emoticon Data this._twitch_emotes = {}; + this._link_data = {}; this.log("Hooking the Ember Line controller."); @@ -232,6 +338,11 @@ FFZ.prototype.setup_line = function() { if ( ! user || this.get("model.from") != user.login ) tokens = f._mentionize(this, tokens); + // Store the capitalization. + var display = this.get("model.tags.display-name"); + if ( display && display.length ) + FFZ.capitalization[this.get("model.from")] = [display.trim(), Date.now()]; + var end = performance.now(); if ( end - start > 5 ) f.log("Tokenizing Message Took Too Long - " + (end-start) + "ms", tokens, false, true); @@ -265,7 +376,6 @@ FFZ.prototype.setup_line = function() { row_type = controller.get('model.ffz_alternate'); - // Color Processing if ( color ) f._handle_color(color); @@ -290,11 +400,6 @@ FFZ.prototype.setup_line = function() { f.render_badge(this); - // Capitalization - if ( f.settings.capitalize ) - f.capitalize(this, user); - - // Mention Highlighting var mentioned = el.querySelector('span.mentioned'); if ( mentioned ) { @@ -357,12 +462,52 @@ FFZ.prototype.setup_line = function() { this.target = "_new"; this.textContent = link; + // Now, check for a tooltip. + var link_data = f._link_data[link]; + if ( link_data && typeof link_data != "boolean" ) { + this.title = link_data.tooltip; + if ( link_data.unsafe ) + this.classList.add('unsafe-link'); + } + // Stop from Navigating e.preventDefault(); }); // Also add a nice tooltip. - jQuery(link).tipsy(); + jQuery(link).tipsy({html:true}); + } + + + // Link Tooltips + if ( f.settings.link_info ) { + var links = el.querySelectorAll("span.message a"); + for(var i=0; i < links.length; i++) { + var link = links[i], + href = link.href, + deleted = false; + + if ( link.classList.contains("deleted-link") ) { + href = link.getAttribute("data-url"); + deleted = true; + } + + // Check the cache. + var link_data = f._link_data[href]; + if ( link_data ) { + if ( !deleted && typeof link_data != "boolean" ) + link.title = link_data.tooltip; + + if ( link_data.unsafe ) + link.classList.add('unsafe-link'); + + } else if ( ! /^mailto:/.test(href) ) { + f._link_data[href] = true; + f.ws_send("get_link", href, load_link_data.bind(f, href)); + } + } + + jQuery(links).tipsy({html:true}); } @@ -536,16 +681,6 @@ FFZ.get_capitalization = function(name, callback) { } -FFZ.prototype.capitalize = function(view, user) { - var name = FFZ.get_capitalization(user, this.capitalize.bind(this, view)); - if ( !name || !view ) - return; - - var from = view.$('.from'); - from && from.text(name); -} - - // --------------------- // Extra Mentions // --------------------- diff --git a/src/ember/moderation-card.js b/src/ember/moderation-card.js index cb5d6412..d7c5faa5 100644 --- a/src/ember/moderation-card.js +++ b/src/ember/moderation-card.js @@ -5,7 +5,8 @@ var FFZ = window.FrankerFaceZ, ESC: 27, P: 80, B: 66, - T: 84 + T: 84, + U: 85 }, btns = [ @@ -27,7 +28,8 @@ FFZ.settings_info.enhanced_moderation = { type: "boolean", value: false, - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, category: "Chat", name: "Enhanced Moderation", @@ -41,32 +43,33 @@ FFZ.settings_info.enhanced_moderation = { FFZ.prototype.setup_mod_card = function() { this.log("Hooking the Ember Moderation Card view."); - var Card = App.__container__.resolve('view:moderation-card'), + var Card = App.__container__.resolve('component:moderation-card'), f = this; Card.reopen({ didInsertElement: function() { this._super(); + window._card = this; try { if ( f.has_bttv || ! f.settings.enhanced_moderation ) return; var el = this.get('element'), - controller = this.get('context'); + controller = this.get('controller'); // Style it! el.classList.add('ffz-moderation-card'); // Only do the big stuff if we're mod. - if ( controller.get('parentController.model.isModeratorOrHigher') ) { + if ( controller.get('cardInfo.isModeratorOrHigher') ) { el.classList.add('ffz-is-mod'); el.setAttribute('tabindex', 1); // Key Handling el.addEventListener('keyup', function(e) { var key = e.keyCode || e.which, - user_id = controller.get('model.user.id'), - room = controller.get('parentController.model'); + user_id = controller.get('cardInfo.user.id'), + room = App.__container__.lookup('controller:chat').get('currentRoom'); if ( key == keycodes.P ) room.send("/timeout " + user_id + " 1"); @@ -77,6 +80,9 @@ FFZ.prototype.setup_mod_card = function() { else if ( key == keycodes.T ) room.send("/timeout " + user_id + " 600"); + else if ( key == keycodes.U ) + room.send("/unban " + user_id); + else if ( key != keycodes.ESC ) return; @@ -89,8 +95,8 @@ FFZ.prototype.setup_mod_card = function() { line.className = 'interface clearfix'; var btn_click = function(timeout) { - var user_id = controller.get('model.user.id'), - room = controller.get('parentController.model'); + var user_id = controller.get('cardInfo.user.id'), + room = App.__container__.lookup('controller:chat').get('currentRoom'); if ( timeout === -1 ) room.send("/unban " + user_id); @@ -151,8 +157,9 @@ FFZ.prototype.setup_mod_card = function() { // More Fixing Other Buttons var op_btn = el.querySelector('button.mod'); if ( op_btn ) { - var model = controller.get('parentController.model'), - can_op = model.get('isBroadcaster') || model.get('isStaff') || model.get('isAdmin'); + var is_owner = controller.get('cardInfo.isChannelOwner'), + user = ffz.get_user(); + can_op = is_owner || (user && user.is_admin) || (user && user.is_staff); if ( ! can_op ) op_btn.parentElement.removeChild(op_btn); @@ -160,7 +167,7 @@ FFZ.prototype.setup_mod_card = function() { var msg_btn = el.querySelector(".interface > button"); - if ( msg_btn && msg_btn.className == "button" ) { + if ( msg_btn && msg_btn.classList.contains("message-button") ) { msg_btn.innerHTML = MESSAGE; msg_btn.classList.add('glyph-only'); msg_btn.classList.add('message'); diff --git a/src/ember/room.js b/src/ember/room.js index b8f39a68..66272401 100644 --- a/src/ember/room.js +++ b/src/ember/room.js @@ -28,6 +28,16 @@ FFZ.prototype.setup_room = function() { this.log("Hooking the Ember Room model."); + // Responsive ban button. + var RC = App.__container__.lookup('controller:room'); + if ( RC ) { + var orig_action = RC._actions.banUser; + RC._actions.banUser = function(e) { + orig_action.bind(this)(e); + this.get("model").clearMessages(e.user); + } + } + var Room = App.__container__.resolve('model:room'); this._modify_room(Room); @@ -287,8 +297,7 @@ FFZ.prototype._modify_room = function(room) { var suggestions = this._super(); try { - if ( f.settings.capitalize ) - suggestions = _.map(suggestions, FFZ.get_capitalization); + suggestions = _.map(suggestions, FFZ.get_capitalization); } catch(err) { f.error("get_suggestions: " + err); } diff --git a/src/featurefriday.js b/src/featurefriday.js index ef3239a7..002027c5 100644 --- a/src/featurefriday.js +++ b/src/featurefriday.js @@ -47,7 +47,7 @@ FFZ.prototype._feature_friday_ui = function(room_id, parent, view) { if ( ! this.feature_friday || this.feature_friday.channel == room_id ) return; - this._emotes_for_sets(parent, view, [this.feature_friday.set], this.feature_friday.title); + this._emotes_for_sets(parent, view, [this.feature_friday.set], this.feature_friday.title, this.feature_friday.icon, "FrankerFaceZ"); // Before we add the button, make sure the channel isn't the // current channel. diff --git a/src/main.js b/src/main.js index 8c7a485e..3b54d6e6 100644 --- a/src/main.js +++ b/src/main.js @@ -22,7 +22,7 @@ FFZ.get = function() { return FFZ.instance; } // Version var VER = FFZ.version_info = { - major: 3, minor: 2, revision: 5, + major: 3, minor: 3, revision: 1, toString: function() { return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); } @@ -93,7 +93,7 @@ FFZ.prototype.get_user = function() { if ( window.PP && PP.login ) { return PP; } else if ( window.App ) { - var nc = App.__container__.lookup("controller:navigation"); + var nc = App.__container__.lookup("controller:login"); return nc ? nc.get("userData") : undefined; } } @@ -115,6 +115,7 @@ require('./emoticons'); require('./badges'); // Analytics: require('./ember/router'); +require('./ember/channel'); require('./ember/room'); require('./ember/line'); require('./ember/chatview'); @@ -154,7 +155,17 @@ FFZ.prototype.initialize = function(increment, delay) { // Make sure that FrankerFaceZ doesn't start setting itself up until the // Twitch ember application is ready. - // TODO: Special Dashboard check. + // Check for special non-ember pages. + if ( /\/(?:settings|messages?\/)/.test(location.pathname) ) { + this.setup_normal(delay); + return; + } + + // Check for the dashboard. + if ( /\/[A-Za-z_-]+\/dashboard/.test(location.pathname) && !/bookmarks$/.test(location.pathname) ) { + this.setup_dashboard(delay); + return; + } var loaded = window.App != undefined && App.__container__ != undefined && @@ -174,6 +185,65 @@ FFZ.prototype.initialize = function(increment, delay) { } +FFZ.prototype.setup_normal = function(delay) { + var start = (window.performance && performance.now) ? performance.now() : Date.now(); + this.log("Found non-Ember Twitch after " + (delay||0) + " ms in \"" + location + "\". Initializing FrankerFaceZ version " + FFZ.version_info); + + this.users = {}; + + // Initialize all the modules. + this.load_settings(); + + // Start this early, for quick loading. + this.setup_dark(); + + this.ws_create(); + this.setup_emoticons(); + this.setup_badges(); + + this.setup_notifications(); + this.setup_css(); + + this.find_bttv(10); + + var end = (window.performance && performance.now) ? performance.now() : Date.now(), + duration = end - start; + + this.log("Initialization complete in " + duration + "ms"); +} + + +FFZ.prototype.is_dashboard = false; + +FFZ.prototype.setup_dashboard = function(delay) { + var start = (window.performance && performance.now) ? performance.now() : Date.now(); + this.log("Found Twitch Dashboard after " + (delay||0) + " ms in \"" + location + "\". Initializing FrankerFaceZ version " + FFZ.version_info); + + this.users = {}; + this.is_dashboard = true; + + // Initialize all the modules. + this.load_settings(); + + // Start this early, for quick loading. + this.setup_dark(); + + this.ws_create(); + this.setup_emoticons(); + this.setup_badges(); + + this.setup_notifications(); + this.setup_css(); + + this.find_bttv(10); + + var end = (window.performance && performance.now) ? performance.now() : Date.now(), + duration = end - start; + + this.log("Initialization complete in " + duration + "ms"); +} + + FFZ.prototype.setup_ember = function(delay) { var start = (window.performance && performance.now) ? performance.now() : Date.now(); this.log("Found Twitch application after " + (delay||0) + " ms in \"" + location + "\". Initializing FrankerFaceZ version " + FFZ.version_info); @@ -193,6 +263,7 @@ FFZ.prototype.setup_ember = function(delay) { //this.setup_piwik(); //this.setup_router(); + this.setup_channel(); this.setup_room(); this.setup_line(); this.setup_chatview(); diff --git a/src/settings.js b/src/settings.js index 8f5bb5ca..44e0c8d6 100644 --- a/src/settings.js +++ b/src/settings.js @@ -58,6 +58,19 @@ FFZ.prototype.load_settings = function() { // Menu Page // -------------------- +FFZ.settings_info.replace_twitch_menu = { + type: "boolean", + value: false, + + name: "Replace Twitch Emoticon Menu Beta", + help: "Completely replace the default Twitch emoticon menu.", + + on_update: function(val) { + document.body.classList.toggle("ffz-menu-replace", val); + } + }; + + FFZ.menu_pages.settings = { render: function(view, container) { var settings = {}, @@ -141,37 +154,53 @@ FFZ.menu_pages.settings = { el.className = 'clearfix'; - if ( info.type == "boolean" ) { - var swit = document.createElement('a'), - label = document.createElement('span'); - - swit.className = 'switch'; - swit.classList.toggle('active', val); - swit.innerHTML = ""; - + if ( this.has_bttv && info.no_bttv ) { + var label = document.createElement('span'), + help = document.createElement('span'); label.className = 'switch-label'; label.innerHTML = info.name; - el.appendChild(swit); - el.appendChild(label); + help = document.createElement('span'); + help.className = 'help'; + help.innerHTML = 'Disabled due to incompatibility with BetterTTV.'; - swit.addEventListener("click", toggle_setting.bind(this, swit, key)); + el.classList.add('disabled'); + el.appendChild(label); + el.appendChild(help); } else { - el.classList.add("option"); - var link = document.createElement('a'); - link.innerHTML = info.name; - link.href = "#"; - el.appendChild(link); + if ( info.type == "boolean" ) { + var swit = document.createElement('a'), + label = document.createElement('span'); - link.addEventListener("click", info.method.bind(this)); - } + swit.className = 'switch'; + swit.classList.toggle('active', val); + swit.innerHTML = ""; - if ( info.help ) { - var help = document.createElement('span'); - help.className = 'help'; - help.innerHTML = info.help; - el.appendChild(help); + label.className = 'switch-label'; + label.innerHTML = info.name; + + el.appendChild(swit); + el.appendChild(label); + + swit.addEventListener("click", toggle_setting.bind(this, swit, key)); + + } else { + el.classList.add("option"); + var link = document.createElement('a'); + link.innerHTML = info.name; + link.href = "#"; + el.appendChild(link); + + link.addEventListener("click", info.method.bind(this)); + } + + if ( info.help ) { + var help = document.createElement('span'); + help.className = 'help'; + help.innerHTML = info.help; + el.appendChild(help); + } } menu.appendChild(el); @@ -183,7 +212,8 @@ FFZ.menu_pages.settings = { name: "Settings", icon: constants.GEAR, - sort_order: 99999 + sort_order: 99999, + wide: true }; @@ -195,8 +225,6 @@ FFZ.prototype._setting_update = function(e) { if ( ! e ) e = window.event; - this.log("Storage Event", e); - if ( ! e.key || e.key.substr(0, 12) !== "ffz_setting_" ) return; diff --git a/src/socket.js b/src/socket.js index 4638bce5..cc7c9dde 100644 --- a/src/socket.js +++ b/src/socket.js @@ -36,6 +36,13 @@ FFZ.prototype.ws_create = function() { if ( user ) f.ws_send("setuser", user.login); + // Join the right channel if we're in the dashboard. + if ( f.is_dashboard ) { + var match = location.pathname.match(/\/([^\/]+)/); + if ( match ) + f.ws_send("sub", match[1]); + } + // Send the current rooms. for(var room_id in f.rooms) f.rooms.hasOwnProperty(room_id) && f.ws_send("sub", room_id); diff --git a/src/ui/about_page.js b/src/ui/about_page.js index 03987a54..db730f62 100644 --- a/src/ui/about_page.js +++ b/src/ui/about_page.js @@ -37,6 +37,18 @@ FFZ.menu_pages.about = { heading.innerHTML = content; container.appendChild(heading); + var clicks = 0, head = heading.querySelector("h1"); + head && head.addEventListener("click", function() { + head.style.cursor = "pointer"; + clicks++; + if ( clicks >= 3 ) { + clicks = 0; + var el = document.querySelector(".app-main") || document.querySelector(".ember-chat-container"); + el && el.classList.toggle('ffz-flip'); + } + setTimeout(function(){clicks=0;head.style.cursor=""},2000); + }); + // Advertising var btn_container = document.createElement('div'), diff --git a/src/ui/dark.js b/src/ui/dark.js index 80f226f9..db8c0655 100644 --- a/src/ui/dark.js +++ b/src/ui/dark.js @@ -17,9 +17,10 @@ FFZ.settings_info.dark_twitch = { type: "boolean", value: false, - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, - name: "Dark Twitch Beta", + name: "Dark Twitch", help: "Apply a dark background to channels and other related pages for easier viewing.", on_update: function(val) { @@ -28,14 +29,14 @@ FFZ.settings_info.dark_twitch = { document.body.classList.toggle("ffz-dark", val); - var model = App.__container__.lookup('controller:settings').get('model'); + var model = window.App ? App.__container__.lookup('controller:settings').get('model') : undefined; if ( val ) { this._load_dark_css(); - this.settings.set('twitch_chat_dark', model.get('darkMode')); - model.set('darkMode', true); + model && this.settings.set('twitch_chat_dark', model.get('darkMode')); + model && model.set('darkMode', true); } else - model.set('darkMode', this.settings.twitch_chat_dark); + model && model.set('darkMode', this.settings.twitch_chat_dark); } }; @@ -50,7 +51,7 @@ FFZ.prototype.setup_dark = function() { document.body.classList.toggle("ffz-dark", this.settings.dark_twitch); if ( this.settings.dark_twitch ) - App.__container__.lookup('controller:settings').set('model.darkMode', true); + window.App && App.__container__.lookup('controller:settings').set('model.darkMode', true); if ( this.settings.dark_twitch ) this._load_dark_css(); diff --git a/src/ui/menu.js b/src/ui/menu.js index 0798533d..43879a13 100644 --- a/src/ui/menu.js +++ b/src/ui/menu.js @@ -1,5 +1,8 @@ var FFZ = window.FrankerFaceZ, - constants = require('../constants'); + constants = require('../constants'), + utils = require('../utils'), + + TWITCH_BASE = "http://static-cdn.jtvnw.net/emoticons/v1/"; // -------------------- @@ -23,6 +26,8 @@ FFZ.prototype.setup_menu = function() { delete f._popup_kill; } }); + + document.body.classList.toggle("ffz-menu-replace", this.settings.replace_twitch_menu); } @@ -108,27 +113,31 @@ FFZ.prototype.build_ui_popup = function(view) { jQuery(link).tipsy(); - link.addEventListener("click", this._ui_change_page.bind(this, view, menu, sub_container, key)); + link.addEventListener("click", this._ui_change_page.bind(this, view, inner, menu, sub_container, key)); el.appendChild(link); menu.appendChild(el); } // Render Current Page - this._ui_change_page(view, menu, sub_container, this._last_page || "channel"); + this._ui_change_page(view, inner, menu, sub_container, this._last_page || "channel"); // Add the menu to the DOM. this._popup = container; - sub_container.style.maxHeight = Math.max(100, view.$().height() - 162) + "px"; + sub_container.style.maxHeight = Math.max(200, view.$().height() - 172) + "px"; view.$('.chat-interface').append(container); } -FFZ.prototype._ui_change_page = function(view, menu, container, page) { +FFZ.prototype._ui_change_page = function(view, inner, menu, container, page) { this._last_page = page; container.innerHTML = ""; container.setAttribute('data-page', page); + // Allow settings to be wide. We need to know if chat is stand-alone. + var app = document.querySelector(".app-main") || document.querySelector(".ember-chat-container"); + inner.style.maxWidth = (!FFZ.menu_pages[page].wide || (typeof FFZ.menu_pages[page].wide == "function" && !FFZ.menu_pages[page].wide.bind(this)())) ? "" : (app.offsetWidth < 640 ? (app.offsetWidth-40) : 600) + "px"; + var els = menu.querySelectorAll('li.active'); for(var i=0; i < els.length; i++) els[i].classList.remove('active'); @@ -143,55 +152,6 @@ FFZ.prototype._ui_change_page = function(view, menu, container, page) { } -// -------------------- -// Favorites Page -// -------------------- - -FFZ.prototype._tokenize_message = function(message, room_id) { - var lc = App.__container__.lookup('controller:line'), - rc = App.__container__.lookup('controller:room'), - room = this.rooms[room_id], - user = this.get_user(); - - if ( ! lc || ! rc || ! room ) - return [message]; - - rc.set('model', room.room); - lc.set('parentController', rc); - - var model = { - from: user && user.login || "FrankerFaceZ", - message: message, - tags: { - emotes: room.room.tmiSession._emotesParser.parseEmotesTag(message) - } - }; - - lc.set('model', model); - - var tokens = lc.get('tokenizedMessage'); - - lc.set('model', null); - rc.set('model', null); - lc.set('parentController', null); - - return tokens; -} - - -/*FFZ.menu_pages.favorites = { - render: function(view, container) { - // Get the current room. - var room_id = view.get('controller.currentRoom.id'); - - - }, - - name: "Favorites", - icon: constants.HEART - };*/ - - // -------------------- // Channel Page // -------------------- @@ -200,10 +160,107 @@ FFZ.menu_pages.channel = { render: function(view, inner) { // Get the current room. var room_id = view.get('controller.currentRoom.id'), - room = this.rooms[room_id]; + room = this.rooms[room_id], + has_product = false; + + // Check for a product. + if ( this.settings.replace_twitch_menu ) { + var product = room.room.get("product"); + if ( product && !product.get("error") ) { + // We have a product, and no error~! + has_product = true; + var is_subscribed = room.room.get("channel.isSubscribed.content"), + icon = room.room.get("badgeSet.subscriber.image"), + + grid = document.createElement("div"), + header = document.createElement("div"), + c = 0; + + // Weird is_subscribed check. Might be more accurate? + is_subscribed = is_subscribed && is_subscribed.length > 0; + + grid.className = "emoticon-grid"; + header.className = "heading"; + if ( icon ) + header.style.backgroundImage = 'url("' + icon + '")'; + + header.innerHTML = 'TwitchSubscriber Emoticons'; + grid.appendChild(header); + + for(var emotes=product.get("emoticons"), i=0; i < emotes.length; i++) { + var emote = emotes[i]; + if ( emote.state !== "active" ) + continue; + + var s = document.createElement('span'), + can_use = is_subscribed || !emote.subscriber_only, + img_set = 'image-set(url("' + TWITCH_BASE + emote.id + '/1.0") 1x, url("' + TWITCH_BASE + emote.id + '/2.0") 2x, url("' + TWITCH_BASE + emote.id + '/3.0") 4x)'; + + s.className = 'emoticon tooltip' + (!can_use ? " locked" : ""); + + s.style.backgroundImage = 'url("' + TWITCH_BASE + emote.id + '/1.0")'; + s.style.backgroundImage = '-webkit-' + img_set; + s.style.backgroundImage = '-moz-' + img_set; + s.style.backgroundImage = '-ms-' + img_set; + s.style.backgroundImage = img_set; + + s.style.width = emote.width + "px"; + s.style.height = emote.height + "px"; + s.title = emote.regex; + if ( can_use ) + s.addEventListener('click', this._add_emote.bind(this, view, emote.regex)); + grid.appendChild(s); + c++; + } + + if ( c > 0 ) + inner.appendChild(grid); + + if ( ! is_subscribed ) { + var sub_message = document.createElement("div"), + nonsub_message = document.createElement("div"), + unlock_text = document.createElement("span"), + sub_link = document.createElement("a"); + + sub_message.className = "subscribe-message"; + nonsub_message.className = "non-subscriber-message"; + sub_message.appendChild(nonsub_message); + + unlock_text.className = "unlock-text"; + unlock_text.innerHTML = "Subscribe to unlock Emoticons"; + nonsub_message.appendChild(unlock_text); + + sub_link.className = "action subscribe-button button primary"; + sub_link.href = product.get("product_url"); + sub_link.innerHTML = 'Subscribe' + product.get("price") + ''; + nonsub_message.appendChild(sub_link); + + inner.appendChild(sub_message); + } else { + var last_content = room.room.get("channel.isSubscribed.content"); + last_content = last_content.length > 0 ? last_content[last_content.length-1] : undefined; + if ( last_content && last_content.purchase_profile && !last_content.purchase_profile.will_renew ) { + var ends_at = utils.parse_date(last_content.access_end || ""); + sub_message = document.createElement("div"), + nonsub_message = document.createElement("div"), + unlock_text = document.createElement("span"), + end_time = ends_at ? Math.floor((ends_at.getTime() - Date.now()) / 1000) : null; + + sub_message.className = "subscribe-message"; + nonsub_message.className = "non-subscriber-message"; + sub_message.appendChild(nonsub_message); + + unlock_text.className = "unlock-text"; + unlock_text.innerHTML = "Subscription expires in " + utils.time_to_string(end_time, true, true); + nonsub_message.appendChild(unlock_text); + inner.appendChild(sub_message); + } + } + } + } // Basic Emote Sets - this._emotes_for_sets(inner, view, room && room.menu_sets || []); + this._emotes_for_sets(inner, view, room && room.menu_sets || [], (this.feature_friday || has_product) ? "Channel Emoticons" : null, "http://cdn.frankerfacez.com/channel/global/devicon.png", "FrankerFaceZ"); // Feature Friday! this._feature_friday_ui(room_id, inner, view); @@ -218,21 +275,29 @@ FFZ.menu_pages.channel = { // Emotes for Sets // -------------------- -FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, btn) { - if ( header != null ) { - var el_header = document.createElement('div'); - el_header.className = 'list-header'; - el_header.appendChild(document.createTextNode(header)); - - if ( btn ) - el_header.appendChild(btn); - - parent.appendChild(el_header); - } - +FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, image, sub_text) { var grid = document.createElement('div'), c = 0; grid.className = 'emoticon-grid'; + if ( header != null ) { + var el_header = document.createElement('div'); + el_header.className = 'heading'; + + if ( sub_text ) { + var s = document.createElement("span"); + s.className = "right"; + s.appendChild(document.createTextNode(sub_text)); + el_header.appendChild(s); + } + + el_header.appendChild(document.createTextNode(header)); + + if ( image ) + el_header.style.backgroundImage = 'url("' + image + '")'; + + grid.appendChild(el_header); + } + for(var i=0; i < sets.length; i++) { var set = this.emote_sets[sets[i]]; if ( ! set || ! set.emotes ) @@ -259,8 +324,8 @@ FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, btn) { } if ( !c ) { - grid.innerHTML = "This channel has no emoticons."; - grid.className = "chat-menu-content ffz-no-emotes center"; + grid.innerHTML += "This channel has no emoticons."; + grid.className = "emoticon-grid ffz-no-emotes center"; } parent.appendChild(grid); diff --git a/src/ui/menu_button.js b/src/ui/menu_button.js index 1aa67c31..b1aa3d7e 100644 --- a/src/ui/menu_button.js +++ b/src/ui/menu_button.js @@ -18,7 +18,7 @@ FFZ.prototype.build_ui_link = function(view) { FFZ.prototype.update_ui_link = function(link) { - var controller = App.__container__.lookup('controller:chat'); + var controller = window.App && App.__container__.lookup('controller:chat'); link = link || document.querySelector('a.ffz-ui-toggle'); if ( !link || !controller ) return; diff --git a/src/ui/my_emotes.js b/src/ui/my_emotes.js index a346e45d..d83fc540 100644 --- a/src/ui/my_emotes.js +++ b/src/ui/my_emotes.js @@ -5,6 +5,12 @@ var FFZ = window.FrankerFaceZ, BANNED_SETS = {"00000turbo":true}, KNOWN_CODES = { + "#-?[\\\\/]": "#-/", + ":-?(?:7|L)": ":-7", + "\\<\\;\\]": "<]", + "\\:-?(S|s)": ":-S", + "\\:-?\\\\": ":-\\", + "\\:\\>\\;": ":>", "B-?\\)": "B-)", "\\:-?[z|Z|\\|]": ":-Z", "\\:-?\\)": ":-)", @@ -12,7 +18,7 @@ var FFZ = window.FrankerFaceZ, "\\:-?(p|P)": ":-P", "\\;-?(p|P)": ";-P", "\\<\\;3": "<3", - "\\:-?(?:\\/|\\\\)(?!\\/)": ":-/", + "\\:-?[\\\\/]": ":-/", "\\;-?\\)": ";-)", "R-?\\)": "R-)", "[o|O](_|\\.)[o|O]": "O.o", @@ -33,7 +39,7 @@ var FFZ = window.FrankerFaceZ, user_sets = user && ffz.users[user.login] && ffz.users[user.login].sets || []; // Remove the 'default' set. - set_ids = set_ids.split(",").removeObject("0") + set_ids = set_ids.split(",").removeObject("0"); if ( ffz.settings.global_emotes_in_menu ) { set_ids.push("0"); @@ -68,6 +74,8 @@ FFZ.prototype.setup_my_emotes = function() { } this._twitch_set_to_channel[0] = "twitch_global"; + this._twitch_set_to_channel[33] = "twitch_tfaces"; + this._twitch_set_to_channel[42] = "twitch_tfaces"; } @@ -151,7 +159,7 @@ FFZ.menu_pages.my_emotes = { return; } - if ( name == "turbo" ) { + if ( name == "turbo" || name == "twitch_tfaces" ) { set.channel = "Twitch Turbo"; set.badge = "//cdn.frankerfacez.com/script/turbo_badge.png"; return; @@ -191,7 +199,7 @@ FFZ.menu_pages.my_emotes = { if ( ! set.channel ) set.channel = name; dn(); - }.bind(this,set,name,dn), 2000); + }.bind(this,set,name,dn), 500); }.bind(this, set, lname, name))); }, handle_promises = function() { @@ -286,11 +294,16 @@ FFZ.menu_pages.my_emotes = { var an = a[1].toLowerCase(), bn = b[1].toLowerCase(); - if ( an === "twitch turbo" || an === "global emoticons" ) - an = "zzz" + an; + if ( an === "twitch turbo" || an === "twitch_tfaces" ) + an = "zza|" + an; + + else if ( an === "global emoticons" ) + an = "zzz|" + an; - if ( bn === "twitch turbo" || bn === "global emoticons" ) - bn = "zzz" + bn; + if ( bn === "twitch turbo" || bn === "twitch_tfaces" ) + bn = "zza|" + bn; + else if ( bn === "global emoticons" ) + bn = "zzz|" + bn; if ( an < bn ) return -1; else if ( an > bn ) return 1; @@ -325,7 +338,7 @@ FFZ.menu_pages.my_emotes = { } else { ems = set.emotes; - title = FFZ.get_capitalization(set.channel); + title = set.channel == "Twitch Turbo" ? set.channel : FFZ.get_capitalization(set.channel); badge = set.badge; } diff --git a/src/ui/notifications.js b/src/ui/notifications.js index 0ef99fbf..bd61547a 100644 --- a/src/ui/notifications.js +++ b/src/ui/notifications.js @@ -20,7 +20,8 @@ FFZ.settings_info.highlight_notifications = { value: false, category: "Chat", - visible: function() { return ! this.has_bttv }, + no_bttv: true, + //visible: function() { return ! this.has_bttv }, name: "Highlight Notifications", help: "Display notifications when a highlighted word appears in chat in an unfocused tab.", diff --git a/src/ui/races.js b/src/ui/races.js index 87b9a6bb..4081e2b5 100644 --- a/src/ui/races.js +++ b/src/ui/races.js @@ -187,14 +187,14 @@ FFZ.prototype.build_race_popup = function() { out += '
| # | Entrant | Time |
|---|
SRL'; - + if ( has_entrant ) out += ' Multitwitch'; - + out += '
'; popup.innerHTML = out; container.appendChild(popup); @@ -284,7 +284,7 @@ FFZ.prototype._update_race = function(not_timer) { tbody.innerHTML += '