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

4.20.82

Browse source 
* Added: Display a one-time notice to BetterTTV users with FFZ Emotes enabled in that extension that they can disable the setting.
* Changed: Allow users to find `Animated Emotes` by searching for `gif`.
* Changed: Detect BetterTTV and use its `GIF Emotes` setting as the default for `Animated Emotes` if it is installed.
* Fixed: Animated Emotes not displaying animated images in the standalone "Twitch Emotes Menu" extension (which is also packaged with BetterTTV).
This commit is contained in:
SirStendec 2021-03-21 12:50:45 -04:00
parent 6cc5e20a8a
commit d033d64ea7
5 changed files with 67 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/chat/index.js
View file

@ -46,6 +46,7 @@ function formatTerms(data) {
const ERROR_IMAGE = 'https://static-cdn.jtvnw.net/emoticons/v1/58765/2.0';
const EMOTE_CHARS = /[ .,!]/;
const GIF_TERMS = ['gif emotes', 'gif emoticons', 'gifs'];
export default class Chat extends Module {
constructor(...args) {
@ -919,15 +920,24 @@ export default class Chat extends Module {
});
this.settings.add('chat.emotes.animated', {
requires: ['context.bttv.gifs'],
default: null,
process(ctx, val) {
if ( val == null )
val = ctx.get('ffzap.betterttv.gif_emoticons_mode') === 2 ? 1 : 0;
if ( val == null ) {
const temp = ctx.get('ffzap.betterttv.gif_emoticons_mode');
if ( temp == null )
val = ctx.get('context.bttv.gifs');
else
val = temp === 2 ? 1 : 0;
}
return val;
},
ui: {
path: 'Chat > Appearance >> Emotes',
title: 'Animated Emotes',
getExtraTerms: () => GIF_TERMS,
description: 'This controls whether or not animated emotes are allowed to play in chat. When this is `Disabled`, emotes will appear as static images. Setting this to `Enable on Hover` may cause performance issues.',
component: 'setting-select-box',
data: [
@ -949,6 +959,7 @@ export default class Chat extends Module {
ui: {
path: 'Chat > Tooltips >> Emotes',
title: 'Display animated images of emotes.',
getExtraTerms: () => GIF_TERMS,
description: 'If this is not overridden, animated images are only shown in emote tool-tips if [Chat > Appearance >> Emotes > Animated Emotes](~chat.appearance.emotes) is not disabled.',
component: 'setting-check-box'
}