diff --git a/package.json b/package.json index 99447bdd..45fa8f95 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.65.1", + "version": "4.66.0", "description": "FrankerFaceZ is a Twitch enhancement suite.", "private": true, "license": "Apache-2.0", diff --git a/src/sites/twitch-twilight/index.js b/src/sites/twitch-twilight/index.js index 378b7adb..0caa66e7 100644 --- a/src/sites/twitch-twilight/index.js +++ b/src/sites/twitch-twilight/index.js @@ -294,7 +294,7 @@ Twilight.KNOWN_MODULES['algolia-search'].use_result = true; Twilight.KNOWN_MODULES['algolia-search'].chunks = 'core'; Twilight.KNOWN_MODULES['user-report'].use_result = true; -Twilight.KNOWN_MODULES['user-report'].chunks = 'core'; +Twilight.KNOWN_MODULES['user-report'].chunks = n => ! n || n.includes('core') || n.includes('common'); Twilight.KNOWN_MODULES['sub-form'].use_result = true; Twilight.KNOWN_MODULES['sub-form'].chunks = 'core'; diff --git a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx index 84d9b771..2d70fa0f 100644 --- a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx +++ b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx @@ -322,6 +322,16 @@ export default class EmoteMenu extends Module { } }); + this.settings.add('chat.emote-menu.tooltips', { + default: true, + ui: { + path: 'Chat > Emote Menu >> Appearance', + title: 'Display emote preview tool-tips in the FFZ Emote Menu.', + component: 'setting-check-box', + description: 'You may wish to disable this for performance reasons.' + } + }); + this.settings.add('chat.emote-menu.show-emoji', { default: true, ui: { @@ -418,6 +428,7 @@ export default class EmoteMenu extends Module { this.chat.context.on('changed:chat.emotes.enabled', rebuild); this.chat.context.on('changed:chat.emote-menu.modifiers', rebuild); this.chat.context.on('changed:chat.emote-menu.show-emoji', rebuild); + this.chat.context.on('changed:chat.emote-menu.tooltips', rebuild); this.chat.context.on('changed:chat.fix-bad-emotes', rebuild); this.chat.context.on('changed:chat.emote-menu.effect-tab', rebuild); this.chat.context.on('changed:chat.emote-menu.sort-emotes', rebuild); @@ -909,7 +920,9 @@ export default class EmoteMenu extends Module { has_modifiers = Array.isArray(modifiers) && modifiers.length > 0, //has_menu = has_modifiers && this.state.open_menu == emote.id, animated = this.props.animated, - hidden = visibility && emote.hidden; + hidden = visibility && emote.hidden, + + tt = t.chat.context.get('chat.emote-menu.tooltips'); let src, srcSet; if ( animated && emote.animSrc ) { @@ -922,7 +935,7 @@ export default class EmoteMenu extends Module { return (