From 3b4ecfaa2338f8d0ef5215722ddc6140c1987140 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Thu, 1 Jul 2021 12:45:15 -0400
Subject: [PATCH] 4.27.1

* Fixed: Check to see if follower emotes belong to the channel of the logged in user when determining if the emotes should be considered locked.
---
 package.json                                          | 2 +-
 src/sites/twitch-twilight/modules/chat/emote_menu.jsx | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 9f1808f6..f8180c4f 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frankerfacez",
   "author": "Dan Salvato LLC",
-  "version": "4.27.0",
+  "version": "4.27.1",
   "description": "FrankerFaceZ is a Twitch enhancement suite.",
   "private": true,
   "license": "Apache-2.0",
diff --git a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
index 191fd109..800b3019 100644
--- a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
+++ b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
@@ -1680,6 +1680,7 @@ export default class EmoteMenu extends Module {
 					products = user && user.subscriptionProducts,
 					local_sets = user && props.channel_data?.channel?.localEmoteSets,
 					is_following = user && user.self?.follower != null,
+					follower_locked = ! is_following && (props.user_id && user?.id != props.user_id),
 					bits = user?.cheer?.badgeTierEmotes;
 
 				const follower_sets = new Set();
@@ -1717,7 +1718,7 @@ export default class EmoteMenu extends Module {
 							is_points = TWITCH_POINTS_SETS.includes(int_id) || owner?.login === 'channel_points',
 							chan = is_follower ? user : is_points ? null : owner,
 							set_data = data[set_id],
-							is_current_bits = is_bits && owner && owner.id == props?.channel_data?.user?.id;
+							is_current_bits = is_bits && owner && owner.id == user?.id;
 
 						/*if ( chan )
 							t.emotes.setTwitchSetChannel(set_id, {
@@ -1967,7 +1968,7 @@ export default class EmoteMenu extends Module {
 
 							// If we're not following, we can't use the emote
 							// so lock it.
-							if ( ! is_following )
+							if ( follower_locked )
 								locks[set_id] = {
 									set_id,
 									id: 'follower',
@@ -2000,7 +2001,7 @@ export default class EmoteMenu extends Module {
 									animSrcSet: getTwitchEmoteSrcSet(id, true),
 									favorite: is_fav,
 									hidden: twitch_hidden.includes(id),
-									locked: ! is_following,
+									locked: follower_locked,
 									lock_icon: 'heart'
 								};