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

Sort emoticons. Added a bot.

Browse source
This commit is contained in:
SirStendec 2015-02-27 12:33:13 -05:00
parent 41c93f613e
commit 0aec86a4d8
4 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
script.js
View file

@ -187,7 +187,7 @@ FFZ.prototype.render_badge = function(view) {
// -------------------- // --------------------
FFZ.bttv_known_bots = ["nightbot","moobot","sourbot","xanbot","manabot","mtgbot","ackbot","baconrobot","tardisbot","deejbot","valuebot","stahpbot"]; FFZ.bttv_known_bots = ["nightbot","moobot","sourbot","xanbot","manabot","mtgbot","ackbot","baconrobot","tardisbot","deejbot","valuebot","stahpbot"];
FFZ.known_bots = ["quoteconut", "quoconut", "zenwan", "triiharder", "wobblerbot", "theroflbotr", "acebot"]; FFZ.known_bots = ["quoteconut", "quoconut", "zenwan", "triiharder", "wobblerbot", "theroflbotr", "acebot", "wooferedmilk"];
FFZ.prototype._legacy_add_donors = function(tries) { FFZ.prototype._legacy_add_donors = function(tries) {
@ -239,7 +239,7 @@ FFZ.prototype._legacy_parse_donors = function(data) {
user = this.users[user_id] = this.users[user_id] || {}, user = this.users[user_id] = this.users[user_id] || {},
badges = user.badges = user.badges || {}; badges = user.badges = user.badges || {};
if ( badges[0] ) if ( badges[1] )
continue; continue;
badges[1] = {id:1}; badges[1] = {id:1};
@ -3770,8 +3770,20 @@ FFZ.menu_pages.my_emotes = {
if ( ! data.emoticon_sets.hasOwnProperty(set_id) ) if ( ! data.emoticon_sets.hasOwnProperty(set_id) )
continue; continue;
var set = f._twitch_emote_sets[set_id] = f._twitch_emote_sets[set_id] || {}; var set = f._twitch_emote_sets[set_id] = f._twitch_emote_sets[set_id] || {},
set.emotes = data.emoticon_sets[set_id]; emotes = data.emoticon_sets[set_id];
// Sort Emoticons
emotes.sort(function(a,b) {
var a = (KNOWN_CODES[a.code] ? "000" + KNOWN_CODES[a.code] : a.code).toLowerCase(),
b = (KNOWN_CODES[b.code] ? "000" + KNOWN_CODES[b.code] : b.code).toLowerCase();
if ( a < b ) return -1;
else if ( a > b ) return 1;
return 0;
});
set.emotes = emotes;
set.source = "Twitch"; set.source = "Twitch";
} }
} }

4
script.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
src/badges.js
View file

@ -186,7 +186,7 @@ FFZ.prototype.render_badge = function(view) {
// -------------------- // --------------------
FFZ.bttv_known_bots = ["nightbot","moobot","sourbot","xanbot","manabot","mtgbot","ackbot","baconrobot","tardisbot","deejbot","valuebot","stahpbot"]; FFZ.bttv_known_bots = ["nightbot","moobot","sourbot","xanbot","manabot","mtgbot","ackbot","baconrobot","tardisbot","deejbot","valuebot","stahpbot"];
FFZ.known_bots = ["quoteconut", "quoconut", "zenwan", "triiharder", "wobblerbot", "theroflbotr", "acebot"]; FFZ.known_bots = ["quoteconut", "quoconut", "zenwan", "triiharder", "wobblerbot", "theroflbotr", "acebot", "wooferedmilk"];
FFZ.prototype._legacy_add_donors = function(tries) { FFZ.prototype._legacy_add_donors = function(tries) {
@ -238,7 +238,7 @@ FFZ.prototype._legacy_parse_donors = function(data) {
user = this.users[user_id] = this.users[user_id] || {}, user = this.users[user_id] = this.users[user_id] || {},
badges = user.badges = user.badges || {}; badges = user.badges = user.badges || {};
if ( badges[0] ) if ( badges[1] )
continue; continue;
badges[1] = {id:1}; badges[1] = {id:1};

16
src/ui/my_emotes.js
View file

@ -106,8 +106,20 @@ FFZ.menu_pages.my_emotes = {
if ( ! data.emoticon_sets.hasOwnProperty(set_id) ) if ( ! data.emoticon_sets.hasOwnProperty(set_id) )
continue; continue;
var set = f._twitch_emote_sets[set_id] = f._twitch_emote_sets[set_id] || {}; var set = f._twitch_emote_sets[set_id] = f._twitch_emote_sets[set_id] || {},
set.emotes = data.emoticon_sets[set_id]; emotes = data.emoticon_sets[set_id];
// Sort Emoticons
emotes.sort(function(a,b) {
var a = (KNOWN_CODES[a.code] ? "000" + KNOWN_CODES[a.code] : a.code).toLowerCase(),
b = (KNOWN_CODES[b.code] ? "000" + KNOWN_CODES[b.code] : b.code).toLowerCase();
if ( a < b ) return -1;
else if ( a > b ) return 1;
return 0;
});
set.emotes = emotes;
set.source = "Twitch"; set.source = "Twitch";
} }
} }