oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-02 16:08:31 +00:00
Code Wiki Activity

4.24.1

Browse source 
* Fixed: The FFZ Emote Menu not replacing the default Twitch emote menu.
This commit is contained in:
SirStendec 2021-06-21 16:39:01 -04:00
parent 2340992977
commit d5478d71cd
2 changed files with 9 additions and 9 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.24.0", "version": "4.24.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",

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

@ -344,7 +344,8 @@ export default class EmoteMenu extends Module {
this.EmoteMenu = this.fine.define( this.EmoteMenu = this.fine.define(
'chat-emote-menu', 'chat-emote-menu',
n => n.subscriptionProductHasEmotes, n => n.getAllEmoteSets && n.getSortedChannelEmotes && n.props?.emotePickerSource,
//n => n.subscriptionProductHasEmotes,
Twilight.CHAT_ROUTES Twilight.CHAT_ROUTES
) )
@ -410,13 +411,12 @@ export default class EmoteMenu extends Module {
const old_render = cls.prototype.render; const old_render = cls.prototype.render;
cls.prototype.render = function() { cls.prototype.render = function() {
if ( ! this.props || ! has(this.props, 'channelOwnerID') || ! t.chat.context.get('chat.emote-menu.enabled') ) { this._ffz_no_scan = false;
this._ffz_no_scan = false;
if ( ! this.props || ! has(this.props, 'channelID') || ! t.chat.context.get('chat.emote-menu.enabled') ) {
return old_render.call(this); return old_render.call(this);
} }
this._ffz_no_scan = true;
return (<t.MenuErrorWrapper visible={this.props.visible}> return (<t.MenuErrorWrapper visible={this.props.visible}>
<t.MenuComponent <t.MenuComponent
source={this.props.emotePickerSource} source={this.props.emotePickerSource}
@ -425,9 +425,9 @@ export default class EmoteMenu extends Module {
channel_data={this.props.channelData} channel_data={this.props.channelData}
emote_data={this.props.emoteSetsData} emote_data={this.props.emoteSetsData}
user_id={this.props.currentUserID} user_id={this.props.currentUserID}
channel_id={this.props.channelOwnerID} channel_id={this.props.channelID}
loading={this.state.gqlLoading} loading={this.props.channelData?.loading || this.props.emoteSetsData?.loading}
error={this.state.gqlError} error={this.props.channelData?.error || this.props.emoteSetsData?.error}
onClickToken={this.props.onClickToken} onClickToken={this.props.onClickToken}
/> />
</t.MenuErrorWrapper>) </t.MenuErrorWrapper>)