' +
+ ' + ')
' +
+ '
' : '') +
+ '' +
+ Intl.t('chat.raids.incomingRaid', {
+ displayName: data.display_name,
+ viewerCount: tags['msg-param-viewerCount'],
+ htmlSafe: true
+ }) +
+ '
' +
+ '';
+
+ } else
+ out = Intl.t('chat.raids.cancelRaid');
+ } else
+ out = utils.sanitize(this.get('systemMsg'));
+
+ } else
out = utils.sanitize(this.get('systemMsg'));
return out ? '' + out + '
' : '';
@@ -1210,11 +1240,51 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
return out;
},
+ ffzUpdateSystemMessage: function() {
+ var msg = this.buildSystemMessageHTML(),
+ el = this.$('.system-msg')[0];
+
+ if ( el )
+ el.outerHTML = msg;
+ else if ( msg ) {
+ el = this.$('.indicator')[0];
+ el.outerHTML = '' + msg;
+ }
+ },
+
ffzUpdateRichContent: function() {
if ( this.get('msgObject.tags.content') )
this.$(".ffz-rich-content").html(this.buildRichContentHTML());
},
+ ffzGetChannel: function() {
+ var login = this.get('msgObject.tags.msg-param-login');
+ if ( ! login )
+ return {
+ loaded: true,
+ errored: true
+ };
+
+ var t = this,
+ channel_info = this._channel_info = this._channel_info || {};
+
+ if ( ! channel_info._started ) {
+ channel_info._started = true;
+ utils.api.get('channels/' + login, {}, {version: 3})
+ .done(function(data) {
+ channel_info.data = data;
+ channel_info.loaded = true;
+ t.isDestroyed || t.ffzUpdateSystemMessage();
+ }).fail(function(data) {
+ channel_info.loaded = true;
+ channel_info.errored = true;
+ t.isDestroyed || t.ffzUpdateSystemMessage();
+ });
+ }
+
+ return channel_info;
+ },
+
ffzGetContent: function(provider_key, info) {
info = info || this.get('msgObject.tags.content.' + provider_key + '.firstObject')
if ( ! info || ! info.data )
diff --git a/src/ember/player.js b/src/ember/player.js
index 412f9623..7c71f82c 100644
--- a/src/ember/player.js
+++ b/src/ember/player.js
@@ -283,7 +283,7 @@ FFZ.prototype.modify_twitch_player = function(player) {
// Add an option to the menu to recreate the player.
var t = this,
- el = this.$('.player-buttons-right #js-settings')[0],
+ el = this.$('.player-buttons-right .pl-flex')[0],
container = el && el.parentElement;
if ( el && ! container.querySelector('.ffz-player-reset') ) {
diff --git a/src/ember/room.js b/src/ember/room.js
index 1972538b..72cb5245 100644
--- a/src/ember/room.js
+++ b/src/ember/room.js
@@ -682,7 +682,7 @@ FFZ.prototype.modify_room_component = function(component) {
actions.accommodatePinnedMessage = function(e) {
var el = t.get('element'),
- chat = el.querySelector('.js-chat-messages');
+ chat = el && el.querySelector('.js-chat-messages');
if ( chat )
chat.dataset.pinned_height = e;
@@ -2069,41 +2069,121 @@ FFZ.prototype._modify_room = function(room) {
if ( highlight_unread ) {
// API Stuff
f.api_trigger('room-recent-highlights', highlight_messages);
- if ( f.settings.recent_highlights && highlight_messages.length ) {
- var old_highlights = this.get('ffz_recent_highlights') || [],
- raw_remove = old_highlights.length + highlight_messages.length > f.settings.recent_highlight_count ?
- Math.max(0, old_highlights.length - f.settings.recent_highlight_count) + highlight_messages.length : 0,
+ if ( f.settings.recent_highlights > 1 )
+ this.ffzAddHighlights(highlight_messages);
+ }
+ },
- to_remove = raw_remove % 2,
- trimmed = old_highlights.slice(to_remove, old_highlights.length).concat(highlight_messages),
- el = f._roomv && f._roomv.get('ffz_recent_el');
- this.set('ffz_recent_highlights', trimmed);
- this.incrementProperty('ffz_recent_highlights_unread', highlight_messages.length);
+ ffzAddHighlights: function(messages) {
+ if ( f.settings.recent_highlights && messages.length ) {
+ var old_highlights = this.get('ffz_recent_highlights') || [],
+ raw_remove = old_highlights.length + messages.length > f.settings.recent_highlight_count ?
+ Math.max(0, old_highlights.length - f.settings.recent_highlight_count) + messages.length : 0,
- if ( el && f._roomv.get('room') === this ) {
- var was_at_bottom = el.scrollTop >= (el.scrollHeight - el.clientHeight);
+ to_remove = raw_remove % 2,
+ trimmed = old_highlights.slice(to_remove, old_highlights.length).concat(messages),
+ el = f._roomv && f._roomv.get('ffz_recent_el');
- while( el.childElementCount && to_remove-- )
- el.removeChild(el.firstElementChild);
+ this.set('ffz_recent_highlights', trimmed);
+ this.incrementProperty('ffz_recent_highlights_unread', messages.length);
- for(var i=0; i < highlight_messages.length; i++)
- el.appendChild(f._build_mod_card_history(highlight_messages[i], null, true));
+ if ( el && f._roomv.get('room') === this ) {
+ var was_at_bottom = el.scrollTop >= (el.scrollHeight - el.clientHeight);
- if ( was_at_bottom )
- el.scrollTop = el.scrollHeight;
+ while( el.childElementCount && to_remove-- )
+ el.removeChild(el.firstElementChild);
- if ( el.dataset.docked ) {
- el = f._roomv.get('ffz_recent_count_el');
- if ( el )
- el.textContent = utils.format_unread(this.get('ffz_recent_highlights_unread'));
- }
+ for(var i=0; i < messages.length; i++)
+ el.appendChild(f._build_mod_card_history(messages[i], null, true));
+ if ( was_at_bottom )
+ el.scrollTop = el.scrollHeight;
+
+ if ( el.dataset.docked ) {
+ el = f._roomv.get('ffz_recent_count_el');
+ if ( el )
+ el.textContent = utils.format_unread(this.get('ffz_recent_highlights_unread'));
}
}
}
},
+
+ ffzHighlightMessage: function(msg_id) {
+ var message = this.ffz_ids && this.ffz_ids[msg_id];
+ if ( ! f.settings.recent_highlights || ! message )
+ return;
+
+ var highlights = this.get('ffz_recent_highlights') || [],
+ high_len = highlights.length,
+ posted = message.date,
+ insert_before = -1;
+
+ for(var i=0; i < high_len; i++) {
+ var msg = highlights[i];
+ if ( msg.tags && msg.tags.id === msg_id )
+ return;
+
+ if ( insert_before === -1 && posted <= msg.date )
+ insert_before = i;
+ }
+
+ var raw_remove = high_len + 1 > f.settings.recent_highlight_count ?
+ Math.max(0, high_len - f.settings.recent_highlight_count) + 1 : 0,
+
+ to_remove = raw_remove % 2,
+ el = f._roomv && f._roomv.get('ffz_recent_el');
+
+ console.log('msg', message);
+ console.log('count', high_len);
+ console.log('to_remove', to_remove);
+ console.log('insert_before', insert_before);
+ console.log('msgs', highlights.slice(0));
+
+ // If we're going to add the element only to remove it, leave.
+ if ( to_remove && insert_before === 0 )
+ return;
+
+ if ( to_remove ) {
+ highlights.splice(0, to_remove);
+ insert_before -= to_remove;
+ high_len = highlights.length;
+ }
+
+ if ( insert_before === -1 )
+ highlights.push(message);
+ else
+ highlights.splice(insert_before, 0, message);
+
+ this.set('ffz_recent_highlights', highlights);
+ this.incrementProperty('ffz_recent_highlights_unread', 1);
+
+ if ( ! el || f._roomv.get('room') !== this )
+ return;
+
+ var was_at_bottom = el.scrollTop >= (el.scrollHeight - el.clientHeight);
+ while ( el.childElementCount && to_remove-- )
+ el.removeChild(el.firstElementChild);
+
+ var msg_line = f._build_mod_card_history(message, null, true)
+
+ if ( insert_before === -1 )
+ el.appendChild(msg_line);
+ else
+ el.insertBefore(msg_line, el.children[insert_before]);
+
+ if ( was_at_bottom )
+ el.scrollTop = el.scrollHeight;
+
+ if ( el.dataset.docked ) {
+ el = f._roomv.get('ffz_recent_count_el');
+ if ( el )
+ el.textContent = utils.format_unread(this.get('ffz_recent_highlights_unread'));
+ }
+ },
+
+
ffzSchedulePendingFlush: function(now) {
// Instead of just blindly looping every x seconds, we want to calculate the time until
// the next message should be displayed, and then set the timeout for that. We'll
@@ -2786,4 +2866,22 @@ FFZ.prototype._modify_room = function(room) {
this.updateWait(0);
}.observes('slowMode')
});
+}
+
+
+// ---------------
+// Socket Stuff
+// ---------------
+
+FFZ.ws_commands.promote_message = function(data) {
+ var channel = data[0],
+ user = data[1],
+ msg_id = data[2],
+
+ ffz_room = this.rooms && this.rooms[channel],
+ room = ffz_room && ffz_room.room,
+ setting = this.settings.recent_highlights;
+
+ if ( room && (setting === 1 || setting === 3) )
+ room.ffzHighlightMessage(msg_id, user);
}
\ No newline at end of file
diff --git a/src/ember/router.js b/src/ember/router.js
index 969d8cca..cbe6643c 100644
--- a/src/ember/router.js
+++ b/src/ember/router.js
@@ -26,6 +26,7 @@ FFZ.prototype.setup_router = function() {
// If we're coming from a page without app-main, make sure we install the
// scroll listener.
f.fix_scroll();
+ f.try_modify_dashboard();
try {
document.body.setAttribute('data-current-path', App.get('currentPath'));
diff --git a/src/main.js b/src/main.js
index e96a2e1a..ef04116e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
// Version
var VER = FFZ.version_info = {
- major: 3, minor: 5, revision: 529,
+ major: 3, minor: 5, revision: 536,
toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
}
diff --git a/src/socket.js b/src/socket.js
index 14c703eb..b1f29cb5 100644
--- a/src/socket.js
+++ b/src/socket.js
@@ -361,7 +361,7 @@ FFZ.prototype._ws_on_hello = function(success, data) {
if ( ! success )
return this.log("Error Saying Hello: " + data);
- this._ws_on_pong(success, data[1]);
+ this._ws_on_pong(false, success, data[1]);
localStorage.ffzClientId = data[0];
this.log("Client ID: " + localStorage.ffzClientId);
diff --git a/src/tokenize.js b/src/tokenize.js
index ad2baff0..75c8e88a 100644
--- a/src/tokenize.js
+++ b/src/tokenize.js
@@ -10,7 +10,7 @@ var FFZ = window.FrankerFaceZ,
HOP = Object.prototype.hasOwnProperty,
- TOOLTIP_VERSION = 3,
+ TOOLTIP_VERSION = 4,
FAV_MARKER = '',
EXPLANATION_WARN = 'This link has been sent to you via a whisper rather than standard chat, and has not been checked or approved of by any moderators or staff members. Please treat this link with caution and do not visit it if you do not trust the sender.', @@ -466,8 +466,6 @@ FFZ.prototype.get_link_info = function(url, no_promises) { li = this.settings.link_info; - console.log('get_link_info', url, info); - if ( ! li || (expires && Date.now() > expires) ) info = this._link_data[url] = null; @@ -563,6 +561,12 @@ FFZ.prototype.render_link_tooltip = function(data, el) { else content = '