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.27.1

Browse source 
* 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.
This commit is contained in:
SirStendec 2021-07-01 12:45:15 -04:00
parent fc5b33a904
commit 3b4ecfaa23
2 changed files with 5 additions and 4 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.27.0", "version": "4.27.1",
"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",

7
src/sites/twitch-twilight/modules/chat/emote_menu.jsx
View file

@ -1680,6 +1680,7 @@ export default class EmoteMenu extends Module {
products = user && user.subscriptionProducts, products = user && user.subscriptionProducts,
local_sets = user && props.channel_data?.channel?.localEmoteSets, local_sets = user && props.channel_data?.channel?.localEmoteSets,
is_following = user && user.self?.follower != null, is_following = user && user.self?.follower != null,
follower_locked = ! is_following && (props.user_id && user?.id != props.user_id),
bits = user?.cheer?.badgeTierEmotes; bits = user?.cheer?.badgeTierEmotes;
const follower_sets = new Set(); 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', is_points = TWITCH_POINTS_SETS.includes(int_id) || owner?.login === 'channel_points',
chan = is_follower ? user : is_points ? null : owner, chan = is_follower ? user : is_points ? null : owner,
set_data = data[set_id], 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 ) /*if ( chan )
t.emotes.setTwitchSetChannel(set_id, { 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 // If we're not following, we can't use the emote
// so lock it. // so lock it.
if ( ! is_following ) if ( follower_locked )
locks[set_id] = { locks[set_id] = {
set_id, set_id,
id: 'follower', id: 'follower',
@ -2000,7 +2001,7 @@ export default class EmoteMenu extends Module {
animSrcSet: getTwitchEmoteSrcSet(id, true), animSrcSet: getTwitchEmoteSrcSet(id, true),
favorite: is_fav, favorite: is_fav,
hidden: twitch_hidden.includes(id), hidden: twitch_hidden.includes(id),
locked: ! is_following, locked: follower_locked,
lock_icon: 'heart' lock_icon: 'heart'
}; };