diff --git a/package.json b/package.json index e7c69cb3..9f16cc9e 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.32.4", + "version": "4.32.5", "description": "FrankerFaceZ is a Twitch enhancement suite.", "private": true, "license": "Apache-2.0", diff --git a/src/sites/twitch-twilight/modules/channel.jsx b/src/sites/twitch-twilight/modules/channel.jsx index 6c3594da..3751ae8b 100644 --- a/src/sites/twitch-twilight/modules/channel.jsx +++ b/src/sites/twitch-twilight/modules/channel.jsx @@ -314,12 +314,12 @@ export default class Channel extends Module { } if ( ! el._ffz_cont ) { - const report = el.querySelector('.report-button,button[data-test-selector="video-options-button"],button[data-test-selector="clip-options-button"]'); + const report = el.querySelector('.report-button,button[data-test-selector="video-options-button"],button[data-test-selector="clip-options-button"],button[data-a-target="report-button-more-button"]'); let cont = report && (report.closest('.tw-flex-wrap.tw-justify-content-end') || report.closest('.tw-justify-content-end')); if ( ! cont && report ) { cont = report.parentElement?.parentElement; - if ( cont && cont.parentElement?.childElementCount === 2 ) + if ( cont && cont.parentElement?.childElementCount === 2 && report.dataset.aTarget !== 'report-button-more-button' ) cont = cont.parentElement.firstElementChild; } diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js index 6869381c..2a3a3b12 100644 --- a/src/sites/twitch-twilight/modules/chat/index.js +++ b/src/sites/twitch-twilight/modules/chat/index.js @@ -2120,6 +2120,12 @@ export default class ChatHook extends Module { return old_action.call(i, e); }*/ + const old_announce = this.onAnnouncementEvent; + this.onAnnouncementEvent = function(e) { + console.log('announcement', e); + return old_announce.call(this, e); + } + const old_sub = this.onSubscriptionEvent; this.onSubscriptionEvent = function(e) { @@ -2456,8 +2462,9 @@ export default class ChatHook extends Module { // For certain message types, the message is contained within // a message sub-object. - if ( message.type === t.chat_types.ChannelPointsReward || message.type === t.chat_types.CommunityIntroduction || (message.message?.user & message.message?.badgeDynamicData) ) + if ( message.type === t.chat_types.ChannelPointsReward || message.type === t.chat_types.CommunityIntroduction || (message.message?.user & message.message?.badgeDynamicData) ) { message = message.message; + } if ( original.channel ) { let chan = message.channel = original.channel.toLowerCase(); @@ -2485,10 +2492,12 @@ export default class ChatHook extends Module { this.props.isCurrentUserModerator = true; } - if ( typeof original.action === 'string' ) - message.message = original.action; - else - message.message = original.message.body; + if (! message.message || typeof message.message === 'string') { + if ( typeof original.action === 'string' ) + message.message = original.action; + else + message.message = original.message.body; + } } this.addMessage(original_msg); diff --git a/src/sites/twitch-twilight/modules/directory/index.jsx b/src/sites/twitch-twilight/modules/directory/index.jsx index 0347fb30..42c389b8 100644 --- a/src/sites/twitch-twilight/modules/directory/index.jsx +++ b/src/sites/twitch-twilight/modules/directory/index.jsx @@ -341,7 +341,7 @@ export default class Directory extends SiteModule { const should_hide = bad_tag || (props.streamType === 'rerun' && this.settings.get('directory.hide-vodcasts')) || (props.context != null && props.context !== CARD_CONTEXTS.SingleGameList && this.settings.provider.get('directory.game.blocked-games', []).includes(game)) || - ((props.sourceType === 'PROMOTION' || props.sourceType === 'SPONSORED') && this.settings.get('directory.hide-promoted')); + ((props.isPromotion || props.sourceType === 'COMMUNITY_BOOST' || props.sourceType === 'PROMOTION' || props.sourceType === 'SPONSORED') && this.settings.get('directory.hide-promoted')); let hide_container = el.closest('.tw-tower > div'); if ( ! hide_container )