oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-30 06:28:31 +00:00
Code Wiki Activity

Rough support for the updated BetterTTV. It's kind of messy, so I'll investigate a better way to hook into it with less chance of breaking.

Browse source 
Other minor changes.
This commit is contained in:
SirStendec 2015-03-30 00:52:18 -04:00
parent a0ab653e8f
commit 216a82aa5a
10 changed files with 205 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ember/line.js
View file

@ -234,7 +234,7 @@ FFZ.prototype.setup_line = function() {
var end = performance.now();
if ( end - start > 5 )
f.log("Tokenizing Message Took Too Long - " + (end-start) + "ms - " + JSON.stringify(tokens));
f.log("Tokenizing Message Took Too Long - " + (end-start) + "ms", tokens, false, true);
} catch(err) {
try {
@ -399,22 +399,14 @@ FFZ.prototype.setup_line = function() {
set = f.emote_sets[set_id],
emote = set ? set.emotes[id] : null,
set_name = set.id,
set_type = "FFZ Channel";
set_name = set ? (set.title || set.id) : "Unknown FFZ Set",
set_type = (set && set.title) ? "FrankerFaceZ" : "FFZ Channel";
if ( set.id == "global" ) {
set_name = "FrankerFaceZ Global";
set_type = null;
} else if ( set.id == "globalevent" ) {
set_name = "FrankerFaceZ Event";
set_type = null;
} else if ( f.feature_friday && set.id == f.feature_friday.set )
if ( set && f.feature_friday && set.id == f.feature_friday.set )
set_name = "Feature Friday - " + f.feature_friday.channel;
img.title = data_to_tooltip({
code: emote.hidden ? "???" : emote.name,
code: emote ? (emote.hidden ? "???" : emote.name) : name,
set: set_name,
set_type: set_type
});
@ -426,7 +418,7 @@ FFZ.prototype.setup_line = function() {
var duration = performance.now() - start;
if ( duration > 5 )
f.log("Line Took Too Long - " + duration + "ms - " + el.innerHTML);
f.log("Line Took Too Long - " + duration + "ms", el.innerHTML, false, true);
} catch(err) {
try {