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.19.6

Browse source 
* Added: Display bits emote rewards in the FFZ Emote Menu alongside subscription emotes.
* Changed: 2FA reward emotes are now labelled as such in their tool-tips.
* Changed: Update the style for the chat pause notice at the bottom of chat to match the latest Twitch style and language.
* Fixed: Disabling hosting not working on Mod View.
* Fixed: Emote sets not being sorted correctly in the FFZ Emote Menu when combining multiple sets (such as multiple subscription tiers) into one section.
* API Changed: The `setting-color-box` component now allows you to open the color picker up and not only down.
This commit is contained in:
SirStendec 2020-04-03 19:30:28 -04:00
parent 99eee7396d
commit 30b9a15c0d
12 changed files with 191 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -963,6 +963,9 @@ function determineEmoteType(emote) {
if ( emote.setID == 300238151 )
return EmoteTypes.ChannelPoints;
if ( emote.setID == 300374282 )
return EmoteTypes.TwoFactor;
const id = parseInt(emote.setID, 10);
if ( ! isNaN(id) && isFinite(id) && id >= 5e8 )
return EmoteTypes.BitsTier;
@ -983,6 +986,9 @@ function determineSetType(set) {
if ( TWITCH_PRIME_SETS.includes(id) )
return EmoteTypes.Prime;
if ( id == 300374282 )
return EmoteTypes.TwoFactor;
const owner = set.owner;
if ( owner ) {
if ( owner.id == 139075904 )