oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-04 11:44:00 +00:00
Code Wiki Activity

4.17.7

Browse source 
* Fixed: Do not submit error reports when add-on development is enabled.
* Fixed: The emote menu not updating appropriately when certain settings changed or data loaded.
* Fixed: The emote menu breaking when the emote menu loaded before emoji data loaded and the 'combined tabs' setting was enabled.
This commit is contained in:
SirStendec 2019-12-13 20:14:55 -05:00
parent 4f0144ed71
commit 00b69a3c66
4 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "frankerfacez",
"author": "Dan Salvato LLC",
"version": "4.17.6",
"version": "4.17.7",
"description": "FrankerFaceZ is a Twitch enhancement suite.",
"license": "Apache-2.0",
"scripts": {

3
src/raven.js
View file

@ -216,6 +216,9 @@ export default class RavenLogger extends Module {
if ( DEBUG )
return false;
if ( this.resolve('addons')?.has_dev )
return false;
return true;
}
};

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

@ -237,7 +237,8 @@ export default class EmoteMenu extends Module {
this.on('chat.emotes:update-default-sets', this.maybeUpdate, this);
this.on('chat.emotes:update-user-sets', this.maybeUpdate, this);
this.on('chat.emotes:update-room-sets', this.maybeUpdate, this);
this.on('chat.emoji:populated', this.updateEmoji, this);
this.on('chat.emotes:change-favorite', this.maybeUpdate, this);
this.on('chat.emoji:populated', this.maybeUpdate, this);
this.chat.context.on('changed:chat.emote-menu.enabled', () =>
this.EmoteMenu.forceUpdate());
@ -245,13 +246,12 @@ export default class EmoteMenu extends Module {
const fup = () => this.MenuWrapper.forceUpdate();
const rebuild = () => {
for(const inst of this.MenuWrapper.instances)
inst.componentWillReceiveProps(inst.props);
inst.rebuildData();
}
this.chat.context.on('changed:chat.fix-bad-emotes', rebuild);
this.chat.context.on('changed:chat.emote-menu.sort-emotes', rebuild);
this.chat.context.on('changed:chat.emote-menu.sort-tiers-last', rebuild);
this.chat.context.on('changed:chat.emote-menu.show-heading', fup);
this.chat.context.on('changed:chat.emote-menu.show-search', fup);
this.chat.context.on('changed:chat.emote-menu.reduced-padding', fup);
@ -333,16 +333,11 @@ export default class EmoteMenu extends Module {
}
maybeUpdate() {
if ( this.chat.context.get('chat.emote-menu.enabled') )
this.EmoteMenu.forceUpdate();
}
if ( ! this.chat.context.get('chat.emote-menu.enabled') )
return;
updateFavorite() {
this.maybeUpdate();
}
updateEmoji() {
this.maybeUpdate();
for(const inst of this.MenuWrapper.instances)
inst.rebuildData();
}
@ -395,6 +390,9 @@ export default class EmoteMenu extends Module {
}
renderTone(data, tone) {
if ( ! data )
return null;
return (<button
key={data.code}
data-tone={tone}
@ -409,8 +407,11 @@ export default class EmoteMenu extends Module {
if ( ! this.state.open )
return null;
const emoji = this.state.emoji,
tones = Object.entries(emoji.variants).map(([tone, emoji]) => this.renderTone(emoji, tone));
const emoji = this.state.emoji;
if ( ! emoji || ! emoji.variants )
return null;
const tones = Object.entries(emoji.variants).map(([tone, emoji]) => this.renderTone(emoji, tone));
return (<div class="tw-absolute tw-balloon tw-balloon--up tw-balloon--right tw-balloon tw-block">
<div class="tw-border-b tw-border-l tw-border-r tw-border-t tw-border-radius-medium tw-c-background-base tw-elevation-1">
@ -421,6 +422,9 @@ export default class EmoteMenu extends Module {
}
renderEmoji(data) { // eslint-disable-line class-methods-use-this
if ( ! data )
return null;
const emoji_x = (data.sheet_x * (t.emoji_size + 2)) + 1,
emoji_y = (data.sheet_y * (t.emoji_size + 2)) + 1,
@ -832,7 +836,10 @@ export default class EmoteMenu extends Module {
tone: t.settings.provider.get('emoji-tone', null)
}
this.componentDidUpdate({});
if ( props.visible )
this.loadData();
this.rebuildData();
this.observing = new Map;
@ -932,25 +939,16 @@ export default class EmoteMenu extends Module {
if ( this.ref )
this.createObserver();
t.on('chat.emotes:change-favorite', this.updateFavorites, this);
window.ffz_menu = this;
}
componentWillUnmount() {
this.destroyObserver();
t.off('chat.emotes:change-favorite', this.updateFavorites, this);
if ( window.ffz_menu === this )
window.ffz_menu = null;
}
updateFavorites() {
const state = this.buildState(this.props, this.state);
this.setState(this.filterState(state.filter, state));
}
pickTone(tone) {
tone = tone || null;
t.settings.provider.set('emoji-tone', tone);
@ -1157,7 +1155,7 @@ export default class EmoteMenu extends Module {
categories = {};
for(const emoji of Object.values(t.emoji.emoji)) {
if ( ! emoji.has[style] || emoji.category === 'Skin Tones' )
if ( ! emoji || ! emoji.has[style] || emoji.category === 'Skin Tones' )
continue;
if ( emoji.variants ) {
@ -1296,9 +1294,10 @@ export default class EmoteMenu extends Module {
continue;
const set_id = emote_set.id,
int_id = parseInt(set_id, 10),
owner = emote_set.owner,
is_bits = parseInt(emote_set.id, 10) > 5e8,
is_points = TWITCH_POINTS_SETS.includes(set_id) || owner?.login === 'channel_points',
is_points = TWITCH_POINTS_SETS.includes(int_id) || owner?.login === 'channel_points',
chan = is_points ? null : owner,
set_data = data[set_id];
@ -1354,7 +1353,7 @@ export default class EmoteMenu extends Module {
owner: null
});*/
} else if ( TWITCH_GLOBAL_SETS.includes(set_id) ) {
} else if ( TWITCH_GLOBAL_SETS.includes(int_id) ) {
title = t.i18n.t('emote-menu.global', 'Global Emotes');
key = 'twitch-global';
sort_key = 100;
@ -1365,7 +1364,7 @@ export default class EmoteMenu extends Module {
owner: null
});
} else if ( TWITCH_PRIME_SETS.includes(set_id) ) {
} else if ( TWITCH_PRIME_SETS.includes(int_id) ) {
title = t.i18n.t('emote_menu.prime', 'Prime');
key = 'twitch-prime';
icon = 'crown';
@ -1699,6 +1698,12 @@ export default class EmoteMenu extends Module {
}
rebuildData() {
const state = this.buildState(this.props, this.state);
this.setState(this.filterState(state.filter, state));
}
componentDidUpdate(old_props) {
if ( this.props.visible && ! old_props.visible )
this.loadData();
@ -1708,11 +1713,8 @@ export default class EmoteMenu extends Module {
this.props.user_id !== old_props.user_id ||
this.props.channel_id !== old_props.channel_id ||
this.props.loading !== old_props.loading ||
this.props.error !== old_props.error ) {
const state = this.buildState(this.props, this.state);
this.setState(this.filterState(state.filter, state));
}
this.props.error !== old_props.error )
this.rebuildData();
}
renderError() {
@ -1845,7 +1847,7 @@ export default class EmoteMenu extends Module {
onChange={this.handleFilterChange}
onKeyDown={this.handleKeyDown}
/>
{(no_tabs || is_emoji) && <t.EmojiTonePicker
{(no_tabs || is_emoji) && this.state.has_emoji_tab && <t.EmojiTonePicker
tone={this.state.tone}
choices={this.state.tone_emoji}
pickTone={this.pickTone}

3
src/sites/twitch-twilight/modules/layout.js
View file

@ -261,7 +261,6 @@ export default class Layout extends Module {
}
updatePortraitMode() {
for(const inst of this.RightColumn.instances)
inst.hideOnBreakpoint();
}
}