mirror of
https://github.com/FrankerFaceZ/FrankerFaceZ.git
synced 2025-06-29 23:58:31 +00:00
Pre dev stream
This commit is contained in:
SirStendec
parent
b184fc74b2
commit
6a62804ec1
26 changed files with 4658 additions and 732 deletions
189
src/tokenize.js
189
src/tokenize.js
|
|
@ -1,5 +1,6 @@
|
|||
var FFZ = window.FrankerFaceZ,
|
||||
utils = require("./utils"),
|
||||
constants = require("./constants"),
|
||||
TWITCH_BASE = "http://static-cdn.jtvnw.net/emoticons/v1/",
|
||||
helpers,
|
||||
|
||||
|
|
@ -10,11 +11,28 @@ var FFZ = window.FrankerFaceZ,
|
|||
SEPARATORS = "[\\s`~<>!-#%-\\x2A,-/:;\\x3F@\\x5B-\\x5D_\\x7B}\\u00A1\\u00A7\\u00AB\\u00B6\\u00B7\\u00BB\\u00BF\\u037E\\u0387\\u055A-\\u055F\\u0589\\u058A\\u05BE\\u05C0\\u05C3\\u05C6\\u05F3\\u05F4\\u0609\\u060A\\u060C\\u060D\\u061B\\u061E\\u061F\\u066A-\\u066D\\u06D4\\u0700-\\u070D\\u07F7-\\u07F9\\u0830-\\u083E\\u085E\\u0964\\u0965\\u0970\\u0AF0\\u0DF4\\u0E4F\\u0E5A\\u0E5B\\u0F04-\\u0F12\\u0F14\\u0F3A-\\u0F3D\\u0F85\\u0FD0-\\u0FD4\\u0FD9\\u0FDA\\u104A-\\u104F\\u10FB\\u1360-\\u1368\\u1400\\u166D\\u166E\\u169B\\u169C\\u16EB-\\u16ED\\u1735\\u1736\\u17D4-\\u17D6\\u17D8-\\u17DA\\u1800-\\u180A\\u1944\\u1945\\u1A1E\\u1A1F\\u1AA0-\\u1AA6\\u1AA8-\\u1AAD\\u1B5A-\\u1B60\\u1BFC-\\u1BFF\\u1C3B-\\u1C3F\\u1C7E\\u1C7F\\u1CC0-\\u1CC7\\u1CD3\\u2010-\\u2027\\u2030-\\u2043\\u2045-\\u2051\\u2053-\\u205E\\u207D\\u207E\\u208D\\u208E\\u2329\\u232A\\u2768-\\u2775\\u27C5\\u27C6\\u27E6-\\u27EF\\u2983-\\u2998\\u29D8-\\u29DB\\u29FC\\u29FD\\u2CF9-\\u2CFC\\u2CFE\\u2CFF\\u2D70\\u2E00-\\u2E2E\\u2E30-\\u2E3B\\u3001-\\u3003\\u3008-\\u3011\\u3014-\\u301F\\u3030\\u303D\\u30A0\\u30FB\\uA4FE\\uA4FF\\uA60D-\\uA60F\\uA673\\uA67E\\uA6F2-\\uA6F7\\uA874-\\uA877\\uA8CE\\uA8CF\\uA8F8-\\uA8FA\\uA92E\\uA92F\\uA95F\\uA9C1-\\uA9CD\\uA9DE\\uA9DF\\uAA5C-\\uAA5F\\uAADE\\uAADF\\uAAF0\\uAAF1\\uABEB\\uFD3E\\uFD3F\\uFE10-\\uFE19\\uFE30-\\uFE52\\uFE54-\\uFE61\\uFE63\\uFE68\\uFE6A\\uFE6B\\uFF01-\\uFF03\\uFF05-\\uFF0A\\uFF0C-\\uFF0F\\uFF1A\\uFF1B\\uFF1F\\uFF20\\uFF3B-\\uFF3D\\uFF3F\\uFF5B\\uFF5D\\uFF5F-\\uFF65]",
|
||||
SPLITTER = new RegExp(SEPARATORS + "*," + SEPARATORS + "*");
|
||||
|
||||
|
||||
try {
|
||||
helpers = window.require && window.require("ember-twitch-chat/helpers/chat-line-helpers");
|
||||
} catch(err) { }
|
||||
|
||||
|
||||
FFZ.SRC_IDS = {},
|
||||
FFZ.src_to_id = function(src) {
|
||||
if ( FFZ.SRC_IDS.hasOwnProperty(src) )
|
||||
return FFZ.SRC_IDS[src];
|
||||
|
||||
var match = /\/emoticons\/v1\/(\d+)\/1\.0/.exec(src),
|
||||
id = match ? parseInt(match[1]) : null;
|
||||
|
||||
if ( id === NaN )
|
||||
id = null;
|
||||
|
||||
FFZ.SRC_IDS[src] = id;
|
||||
return id;
|
||||
};
|
||||
|
||||
|
||||
// ---------------------
|
||||
// Tokenization
|
||||
// ---------------------
|
||||
|
|
@ -41,6 +59,9 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification) {
|
|||
tokens = this._remove_banned(tokens);
|
||||
tokens = this.tokenize_emotes(msgObject.from, room_id, tokens, from_me);
|
||||
|
||||
if ( this.settings.parse_emoji )
|
||||
tokens = this.tokenize_emoji(tokens);
|
||||
|
||||
// Capitalization
|
||||
var display = msgObject.tags && msgObject.tags['display-name'];
|
||||
if ( display && display.length )
|
||||
|
|
@ -53,7 +74,7 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification) {
|
|||
|
||||
for(var i=0; i < tokens.length; i++) {
|
||||
var token = tokens[i];
|
||||
if ( _.isString(token) || ! token.mentionedUser || token.own || msgObject.style === 'whisper' )
|
||||
if ( msgObject.style !== 'whisper' && (_.isString(token) || ! token.mentionedUser || token.own) )
|
||||
continue;
|
||||
|
||||
// We have a mention!
|
||||
|
|
@ -69,7 +90,7 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification) {
|
|||
// Display notifications if that setting is enabled. Also make sure
|
||||
// that we have a chat view because showing a notification when we
|
||||
// can't actually go to it is a bad thing.
|
||||
if ( this._chatv && this.settings.highlight_notifications && ! document.hasFocus() && ! prevent_notification ) {
|
||||
if ( this._chatv && this.settings.highlight_notifications && ! this.embed_in_dash && ! document.hasFocus() && ! prevent_notification ) {
|
||||
var room = this.rooms[room_id] && this.rooms[room_id].room,
|
||||
room_name;
|
||||
|
||||
|
|
@ -86,17 +107,28 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification) {
|
|||
msg = display + ': ' + msg;
|
||||
|
||||
var f = this;
|
||||
this.show_notification(
|
||||
msg,
|
||||
"Twitch Chat Mention in " + room_name,
|
||||
room_id,
|
||||
60000,
|
||||
function() {
|
||||
window.focus();
|
||||
var cont = App.__container__.lookup('controller:chat');
|
||||
room && cont && cont.focusRoom(room);
|
||||
}
|
||||
);
|
||||
if ( msgObject.style === 'whisper' )
|
||||
this.show_notification(
|
||||
msg,
|
||||
"Twitch Chat Whisper",
|
||||
"ffz_whisper_notice",
|
||||
60000,
|
||||
function() {
|
||||
window.focus();
|
||||
}
|
||||
);
|
||||
else
|
||||
this.show_notification(
|
||||
msg,
|
||||
"Twitch Chat Mention in " + room_name,
|
||||
room_id,
|
||||
60000,
|
||||
function() {
|
||||
window.focus();
|
||||
var cont = App.__container__.lookup('controller:chat');
|
||||
room && cont && cont.focusRoom(room);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
break;
|
||||
|
|
@ -129,9 +161,31 @@ FFZ.prototype.tokenize_line = function(user, room, message, no_emotes) {
|
|||
|
||||
|
||||
FFZ.prototype.render_tokens = function(tokens, render_links) {
|
||||
var f = this;
|
||||
return _.map(tokens, function(token) {
|
||||
if ( token.emoticonSrc )
|
||||
return '<img class="emoticon tooltip" src="' + token.emoticonSrc + '" alt="' + token.altText + '" title="' + token.altText + '">';
|
||||
if ( token.emoticonSrc ) {
|
||||
var tooltip;
|
||||
if ( token.ffzEmote ) {
|
||||
var emote_set = f.emote_sets && f.emote_sets[token.ffzEmoteSet],
|
||||
emote = emote_set && emote_set.emoticons && emote_set.emoticons[token.ffzEmote];
|
||||
|
||||
tooltip = emote ? utils.sanitize(f._emote_tooltip(emote)) : token.altText;
|
||||
|
||||
} else if ( token.ffzEmoji ) {
|
||||
var eid = token.ffzEmoji,
|
||||
emoji = f.emoji_data && f.emoji_data[eid];
|
||||
|
||||
tooltip = emoji ? "Emoji: " + token.altText + "\nName: " + emoji.short_name : token.altText;
|
||||
|
||||
} else {
|
||||
var id = FFZ.src_to_id(token.emoticonSrc),
|
||||
data = id && f._twitch_emotes && f._twitch_emotes[id];
|
||||
|
||||
tooltip = data && data.tooltip ? data.tooltip : token.altText;
|
||||
}
|
||||
|
||||
return '<img class="emoticon tooltip" src="' + token.emoticonSrc + '" ' + (token.srcSet ? 'srcset="' + token.srcSet + '" ' : '') + 'alt="' + token.altText + '" title="' + tooltip + '">';
|
||||
}
|
||||
|
||||
if ( token.isLink ) {
|
||||
if ( ! render_links && render_links !== undefined )
|
||||
|
|
@ -142,7 +196,11 @@ FFZ.prototype.render_tokens = function(tokens, render_links) {
|
|||
return '<a href="mailto:' + s + '">' + s + '</a>';
|
||||
|
||||
var n = (s.match(/^https?:\/\//) ? "" : "http://") + s;
|
||||
return '<a href="' + n + '" target="_blank">' + s + '</a>';
|
||||
|
||||
// Check for link data.
|
||||
var data = f._link_data && f._link_data[n] || {};
|
||||
|
||||
return '<a href="' + n + '" class="' + (data.unsafe ? 'unsafe-link' : '') + '" title="' + utils.sanitize(data.tooltip || '') + '" target="_blank">' + s + '</a>';
|
||||
}
|
||||
|
||||
if ( token.mentionedUser )
|
||||
|
|
@ -257,7 +315,7 @@ FFZ.prototype.tokenize_emotes = function(user, room, tokens, do_report) {
|
|||
return tokens;
|
||||
|
||||
// Now that we have all the matching tokens, do crazy stuff.
|
||||
if ( typeof tokens == "string" )
|
||||
if ( typeof tokens === "string" )
|
||||
tokens = [tokens];
|
||||
|
||||
// This is weird stuff I basically copied from the old Twitch code.
|
||||
|
|
@ -269,6 +327,8 @@ FFZ.prototype.tokenize_emotes = function(user, room, tokens, do_report) {
|
|||
var eo = {
|
||||
srcSet: emote.srcSet,
|
||||
emoticonSrc: emote.urls[1] + '" data-ffz-emote="' + encodeURIComponent(JSON.stringify([emote.id, emote.set_id])),
|
||||
ffzEmote: emote.id,
|
||||
ffzEmoteSet: emote.set_id,
|
||||
altText: (emote.hidden ? "???" : emote.name)
|
||||
};
|
||||
|
||||
|
|
@ -301,6 +361,58 @@ FFZ.prototype.tokenize_emotes = function(user, room, tokens, do_report) {
|
|||
}
|
||||
|
||||
|
||||
// ---------------------
|
||||
// Emoji Processing
|
||||
// ---------------------
|
||||
|
||||
FFZ.prototype.tokenize_emoji = function(tokens) {
|
||||
if ( typeof tokens === "string" )
|
||||
tokens = [tokens];
|
||||
|
||||
if ( ! this.emoji_data )
|
||||
return tokens;
|
||||
|
||||
var f = this;
|
||||
|
||||
return _.compact(_.flatten(_.map(tokens, function(token) {
|
||||
if ( _.isObject(token) )
|
||||
return token;
|
||||
|
||||
var tbits = token.split(constants.EMOJI_REGEX), bits = [];
|
||||
while(tbits.length) {
|
||||
// Deal with the unmatched string first.
|
||||
var bit = tbits.shift();
|
||||
bit && bits.push(bit);
|
||||
|
||||
if ( tbits.length ) {
|
||||
// We have an emoji too, so let's handle that.
|
||||
var match = tbits.shift(),
|
||||
variant = tbits.shift();
|
||||
|
||||
if ( variant === '\uFE0E' ) {
|
||||
// Text Variant
|
||||
bits.push(match);
|
||||
|
||||
} else {
|
||||
// Find the right image~!
|
||||
var eid = utils.emoji_to_codepoint(match, variant),
|
||||
data = f.emoji_data[eid],
|
||||
alt = match + (variant || "");
|
||||
|
||||
if ( data ) {
|
||||
data.token.altText = alt;
|
||||
bits.push(data.token);
|
||||
} else
|
||||
bits.push(alt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return bits;
|
||||
})));
|
||||
}
|
||||
|
||||
|
||||
// ---------------------
|
||||
// Mention Parsing
|
||||
// ---------------------
|
||||
|
|
@ -367,4 +479,47 @@ FFZ.prototype.tokenize_mentions = function(tokens) {
|
|||
}
|
||||
|
||||
return new_tokens;
|
||||
}
|
||||
|
||||
|
||||
// ---------------------
|
||||
// Handling Bad Stuff
|
||||
// ---------------------
|
||||
|
||||
FFZ.prototype._deleted_link_click = function(e) {
|
||||
if ( ! this.classList.contains("deleted-link") )
|
||||
return true;
|
||||
|
||||
// Get the URL
|
||||
var href = this.getAttribute('data-url'),
|
||||
link = href,
|
||||
f = FrankerFaceZ.get();
|
||||
|
||||
// Delete Old Stuff
|
||||
this.classList.remove('deleted-link');
|
||||
this.removeAttribute("data-url");
|
||||
this.removeAttribute("title");
|
||||
this.removeAttribute("original-title");
|
||||
|
||||
// Process URL
|
||||
if ( href.indexOf("@") > -1 && (-1 === href.indexOf("/") || href.indexOf("@") < href.indexOf("/")) )
|
||||
href = "mailto:" + href;
|
||||
else if ( ! href.match(/^https?:\/\//) )
|
||||
href = "http://" + href;
|
||||
|
||||
// Set up the Link
|
||||
this.href = href;
|
||||
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();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue