oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-15 17:46:55 +00:00
Code Wiki Activity

4.20.86

Browse source 
* Fixed: Issue with emotes not appearing when the Large Emotes option is enabled but an emote has no high-DPI image available.
This commit is contained in:
SirStendec 2021-03-24 13:03:29 -04:00
parent c03c2e48b5
commit a6dc58562c
3 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "frankerfacez", "name": "frankerfacez",
"author": "Dan Salvato LLC", "author": "Dan Salvato LLC",
"version": "4.20.85", "version": "4.20.86",
"description": "FrankerFaceZ is a Twitch enhancement suite.", "description": "FrankerFaceZ is a Twitch enhancement suite.",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",

31
src/modules/chat/tokenizers.jsx
View file

@ -1143,22 +1143,23 @@ export const CheerEmotes = {
// ============================================================================ // ============================================================================
const render_emote = (token, createElement, wrapped) => { const render_emote = (token, createElement, wrapped) => {
const hover = token.anim === 2; const hover = token.anim === 2,
big = token.big && token.can_big;
let src, srcSet, hoverSrc, hoverSrcSet, normalSrc, normalSrcSet; let src, srcSet, hoverSrc, hoverSrcSet, normalSrc, normalSrcSet;
if ( token.anim === 1 && token.animSrc ) { if ( token.anim === 1 && token.animSrc ) {
src = token.big ? token.animSrc2 : token.animSrc; src = big ? token.animSrc2 : token.animSrc;
srcSet = token.big ? token.animSrcSet2 : token.animSrcSet; srcSet = big ? token.animSrcSet2 : token.animSrcSet;
} else { } else {
src = token.big ? token.src2 : token.src; src = big ? token.src2 : token.src;
srcSet = token.big ? token.srcSet2 : token.srcSet; srcSet = big ? token.srcSet2 : token.srcSet;
} }
if ( hover && token.animSrc ) { if ( hover && token.animSrc ) {
normalSrc = src; normalSrc = src;
normalSrcSet = srcSet; normalSrcSet = srcSet;
hoverSrc = token.big ? token.animSrc2 : token.animSrc; hoverSrc = big ? token.animSrc2 : token.animSrc;
hoverSrcSet = token.big ? token.animSrcSet2 : token.animSrcSet; hoverSrcSet = big ? token.animSrcSet2 : token.animSrcSet;
} }
const mods = token.modifiers || [], ml = mods.length, const mods = token.modifiers || [], ml = mods.length,
@ -1221,22 +1222,23 @@ export const AddonEmotes = {
}, },
render(token, createElement, wrapped) { render(token, createElement, wrapped) {
const hover = token.anim === 2; const hover = token.anim === 2,
big = token.big && token.can_big;
let src, srcSet, hoverSrc, hoverSrcSet, normalSrc, normalSrcSet; let src, srcSet, hoverSrc, hoverSrcSet, normalSrc, normalSrcSet;
if ( token.anim === 1 && token.animSrc ) { if ( token.anim === 1 && token.animSrc ) {
src = token.big ? token.animSrc2 : token.animSrc; src = big ? token.animSrc2 : token.animSrc;
srcSet = token.big ? token.animSrcSet2 : token.animSrcSet; srcSet = big ? token.animSrcSet2 : token.animSrcSet;
} else { } else {
src = token.big ? token.src2 : token.src; src = big ? token.src2 : token.src;
srcSet = token.big ? token.srcSet2 : token.srcSet; srcSet = big ? token.srcSet2 : token.srcSet;
} }
if ( hover && token.animSrc ) { if ( hover && token.animSrc ) {
normalSrc = src; normalSrc = src;
normalSrcSet = srcSet; normalSrcSet = srcSet;
hoverSrc = token.big ? token.animSrc2 : token.animSrc; hoverSrc = big ? token.animSrc2 : token.animSrc;
hoverSrcSet = token.big ? token.animSrcSet2 : token.animSrcSet; hoverSrcSet = big ? token.animSrcSet2 : token.animSrcSet;
} }
const mods = token.modifiers || [], ml = mods.length, const mods = token.modifiers || [], ml = mods.length,
@ -1716,6 +1718,7 @@ export const TwitchEmotes = {
src2, src2,
srcSet2, srcSet2,
big, big,
can_big: true,
text: text.slice(e_start - t_start, e_end - t_start).join(''), text: text.slice(e_start - t_start, e_end - t_start).join(''),
modifiers: [] modifiers: []
}); });

10
src/sites/twitch-twilight/modules/chat/index.js
View file

@ -420,6 +420,16 @@ export default class ChatHook extends Module {
} }
}); });
this.settings.add('chat.points.auto-rewards', {
default: false,
ui: {
path: 'Chat > Channel Points >> Behavior',
title: 'Automatically claim bonus rewards.',
component: 'setting-check-box',
force_seen: true
}
});
this.settings.add('chat.pin-resubs', { this.settings.add('chat.pin-resubs', {
default: false, default: false,
ui: { ui: {