From a6dc58562cab73d8080b3ed8aecaaffa4aef7a76 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Wed, 24 Mar 2021 13:03:29 -0400
Subject: [PATCH] 4.20.86

* Fixed: Issue with emotes not appearing when the Large Emotes option is enabled but an emote has no high-DPI image available.
---
 package.json                                  |  2 +-
 src/modules/chat/tokenizers.jsx               | 31 ++++++++++---------
 .../twitch-twilight/modules/chat/index.js     | 10 ++++++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 050574ac..36e6ee4e 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frankerfacez",
   "author": "Dan Salvato LLC",
-  "version": "4.20.85",
+  "version": "4.20.86",
   "description": "FrankerFaceZ is a Twitch enhancement suite.",
   "private": true,
   "license": "Apache-2.0",
diff --git a/src/modules/chat/tokenizers.jsx b/src/modules/chat/tokenizers.jsx
index 1f4447d2..3d78814c 100644
--- a/src/modules/chat/tokenizers.jsx
+++ b/src/modules/chat/tokenizers.jsx
@@ -1143,22 +1143,23 @@ export const CheerEmotes = {
 // ============================================================================
 
 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;
 
 	if ( token.anim === 1 && token.animSrc ) {
-		src = token.big ? token.animSrc2 : token.animSrc;
-		srcSet = token.big ? token.animSrcSet2 : token.animSrcSet;
+		src = big ? token.animSrc2 : token.animSrc;
+		srcSet = big ? token.animSrcSet2 : token.animSrcSet;
 	} else {
-		src = token.big ? token.src2 : token.src;
-		srcSet = token.big ? token.srcSet2 : token.srcSet;
+		src = big ? token.src2 : token.src;
+		srcSet = big ? token.srcSet2 : token.srcSet;
 	}
 
 	if ( hover && token.animSrc ) {
 		normalSrc = src;
 		normalSrcSet = srcSet;
-		hoverSrc = token.big ? token.animSrc2 : token.animSrc;
-		hoverSrcSet = token.big ? token.animSrcSet2 : token.animSrcSet;
+		hoverSrc = big ? token.animSrc2 : token.animSrc;
+		hoverSrcSet = big ? token.animSrcSet2 : token.animSrcSet;
 	}
 
 	const mods = token.modifiers || [], ml = mods.length,
@@ -1221,22 +1222,23 @@ export const AddonEmotes = {
 	},
 
 	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;
 
 		if ( token.anim === 1 && token.animSrc ) {
-			src = token.big ? token.animSrc2 : token.animSrc;
-			srcSet = token.big ? token.animSrcSet2 : token.animSrcSet;
+			src = big ? token.animSrc2 : token.animSrc;
+			srcSet = big ? token.animSrcSet2 : token.animSrcSet;
 		} else {
-			src = token.big ? token.src2 : token.src;
-			srcSet = token.big ? token.srcSet2 : token.srcSet;
+			src = big ? token.src2 : token.src;
+			srcSet = big ? token.srcSet2 : token.srcSet;
 		}
 
 		if ( hover && token.animSrc ) {
 			normalSrc = src;
 			normalSrcSet = srcSet;
-			hoverSrc = token.big ? token.animSrc2 : token.animSrc;
-			hoverSrcSet = token.big ? token.animSrcSet2 : token.animSrcSet;
+			hoverSrc = big ? token.animSrc2 : token.animSrc;
+			hoverSrcSet = big ? token.animSrcSet2 : token.animSrcSet;
 		}
 
 		const mods = token.modifiers || [], ml = mods.length,
@@ -1716,6 +1718,7 @@ export const TwitchEmotes = {
 					src2,
 					srcSet2,
 					big,
+					can_big: true,
 					text: text.slice(e_start - t_start, e_end - t_start).join(''),
 					modifiers: []
 				});
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index c3ed30f1..87841b8a 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -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', {
 			default: false,
 			ui: {