oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-27 21:05:53 +00:00
Code Wiki Activity

4.15.0

Browse source 
* Added: New appearance type for chat actions that includes both an icon and text.
* Changed: The emote menu now displays channel avatars rather than sub badges.
* Changed: Emotes unlocked via points or other methods will appear as unlocked on the Channel page of the emote menu, even if you aren't subscribed.
* Changed: Display the number of months someone has been subscribed on the Founder badge. (Closes #694)
* Removed: Setting to not automatically redirect to Squad Stream pages, as Twitch is no longer doing that.
* Fixed: The emote menu now correctly groups emotes with no specific source channel.
* Fixed: The emote menu should no longer display sets as `Set #Number`.
* Fixed: The emote data module constantly trying to load data for a set that does not exist rather than storing that it does not exist.
* Fixed: Cache emote set data from the emote menu for use with tool-tips.
* Fixed: Clicking buttons in the FFZ Control Center's header now prevents dragging from starting.
* Fixed: Remove several Fine instances that were not resolving to anything useful.
* Fixed: Alignment of in-line mod actions.
* Behind the Scenes: Started fresh work on custom viewer cards.
This commit is contained in:
SirStendec 2019-10-28 01:06:02 -04:00
parent 5a235f9847
commit 8cfbc95821
39 changed files with 610 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/modules/chat/emotes.js
View file

@ -13,7 +13,7 @@ import GET_EMOTE from './emote_info.gql';
const MOD_KEY = IS_OSX ? 'metaKey' : 'ctrlKey';
const EXTRA_INVENTORY = [33563];
//const EXTRA_INVENTORY = [33563];
const MODIFIERS = {
59847: {
@ -64,7 +64,7 @@ export default class Emotes extends Module {
this.inject('settings');
this.inject('experiments');
this.twitch_inventory_sets = new Set(EXTRA_INVENTORY);
this.twitch_inventory_sets = new Set; //(EXTRA_INVENTORY);
this.__twitch_emote_to_set = new Map;
this.__twitch_set_to_channel = new Map;
@ -127,7 +127,7 @@ export default class Emotes extends Module {
onEnable() {
// Just in case there's a weird load order going on.
this.on('site:enabled', this.loadTwitchInventory);
// this.on('site:enabled', this.loadTwitchInventory);
this.style = new ManagedStyle('emotes');
@ -146,7 +146,7 @@ export default class Emotes extends Module {
this.socket.on(':command:follow_sets', this.updateFollowSets, this);
this.loadGlobalSets();
this.loadTwitchInventory();
//this.loadTwitchInventory();
}
@ -788,6 +788,21 @@ export default class Emotes extends Module {
}
setTwitchEmoteSet(emote_id, set_id) {
if ( isNaN(emote_id) || ! isFinite(emote_id) )
return;
this.__twitch_emote_to_set.set(emote_id, set_id);
}
setTwitchSetChannel(set_id, channel) {
if ( isNaN(set_id) || ! isFinite(set_id) )
return;
this.__twitch_set_to_channel.set(set_id, channel);
}
getTwitchEmoteSet(emote_id, callback) {
const tes = this.__twitch_emote_to_set;
@ -869,6 +884,9 @@ export default class Emotes extends Module {
return data;
} catch(err) {
if ( err === 'No known Twitch emote set with that ID.' )
return null;
tes.delete(set_id);
}
}
@ -896,6 +914,15 @@ export default class Emotes extends Module {
if ( callback )
callback(data);
}).catch(() => tes.delete(set_id));
}).catch(err => {
if ( err === 'No known Twitch emote set with that ID.' ) {
if ( callback )
callback(null);
return;
}
tes.delete(set_id)
});
}
}