oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-07 14:50:56 +00:00
Code Wiki Activity

3.5.511. Misc Twitch fixes. Add setting to disable custom mod badges. Add API event for highlighted messages. Allow API to remove chat messages.

Browse source
This commit is contained in:
SirStendec 2017-08-16 13:24:55 -04:00
parent 81040f1608
commit aa4f999c29
18 changed files with 689 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ui/my_emotes.js
View file

@ -100,9 +100,9 @@ FFZ.menu_pages.myemotes = {
has_sets: function(view) {
var user = this.get_user(),
controller = utils.ember_lookup('controller:chat'),
tmi = controller && controller.get('currentRoom.tmiSession'),
user_emotes = utils.ember_lookup('service:user-emotes'),
twitch_sets = (user_emotes && user_emotes.allEmotes || {'emoticon_sets': {}})['emoticon_sets'] || {},
ffz_sets = user && this.users[user.login] && this.users[user.login].sets || [],
twitch_sets = (tmi && tmi.getEmotes() || {'emoticon_sets': {}})['emoticon_sets'],
sk = twitch_sets && Object.keys(twitch_sets);
@ -228,8 +228,8 @@ FFZ.menu_pages.myemotes = {
render_lists: function(view, container, favorites_only) {
var controller = utils.ember_lookup('controller:chat'),
tmi = controller && controller.get('currentRoom.tmiSession'),
twitch_sets = (tmi && tmi.getEmotes() || {'emoticon_sets': {}})['emoticon_sets'],
user_emotes = utils.ember_lookup('service:user-emotes'),
twitch_sets = (user_emotes && user_emotes.allEmotes || {'emoticon_sets': {}})['emoticon_sets'] || {},
user = this.get_user(),
ffz_sets = this.getEmotes(user && user.login, null),