oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-27 21:05:53 +00:00
Code Wiki Activity

4.77.3

Browse source 
* Fixed: Duplicate channel points redemption messages appearing in chat after the latest fix.
* Fixed: Channel points redemption messages not rendering correctly for 7TV users.
This commit is contained in:
SirStendec 2025-03-29 20:01:19 -04:00
parent ddfcf9e17c
commit b6eec59396
1 changed files with 48 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

111
src/sites/twitch-twilight/modules/chat/index.js
View file

@ -1633,50 +1633,14 @@ export default class ChatHook extends Module {
const old_handle = this.handleMessage; const old_handle = this.handleMessage;
this.handleMessage = function(msg) { this.handleMessage = function(msg) {
//t.log.info('reward-message', msg, inst); //t.log.info('reward-message', msg, inst);
if ( t.disable_handling )
return old_handle.call(this, msg);
try { try {
if ( ! inst.props?.channelID || ! msg ) if ( ! inst.props?.channelID || ! msg )
return; return;
// TODO: Refactor this code and the PubSub code to remove code dupe. t.insertChannelPointMessage(msg);
const type = msg.type,
data = msg.data?.redemption,
isAutomaticReward = type === 'automatic-reward-redeemed',
isRedeemed = 'reward-redeemed';
if (!data?.reward || (!isAutomaticReward && !isRedeemed))
return;
if ((isRedeemed && data.user_input) || (isAutomaticReward && data.reward.reward_type !== 'celebration'))
return;
let rewardID;
if (isAutomaticReward)
rewardID = `${inst.props.channelID}:${data.reward.reward_type}`;
else
rewardID = data.reward.id;
const reward = inst.props.rewardMap[rewardID];
if ( ! reward )
return;
if ( t.chat.context.get('chat.filtering.blocked-types').has('ChannelPointsReward') )
return;
inst.addMessage({
id: data.id,
type: t.chat_types.Message,
ffz_type: 'points',
ffz_reward: reward,
ffz_reward_highlight: isHighlightedReward(reward),
messageParts: [],
user: {
id: data.user.id,
login: data.user.login,
displayName: data.user.display_name
},
timestamp: new Date(msg.data.timestamp || data.redeemed_at).getTime()
});
return; return;
} catch(err) { } catch(err) {
@ -1866,33 +1830,54 @@ export default class ChatHook extends Module {
if ( ! message || ! service || message.type !== 'reward-redeemed' || service.props.channelID != data?.channel_id ) if ( ! message || ! service || message.type !== 'reward-redeemed' || service.props.channelID != data?.channel_id )
return; return;
if ( data.user_input ) this.insertChannelPointMessage(message);
return; });
}
const reward = data.reward?.id && get(data.reward.id, service.props.rewardMap); insertChannelPointMessage(msg) {
if ( ! reward ) const service = this.ChatService.first,
return; data = msg?.data?.redemption,
type = msg?.type,
isRedeemed = type === 'reward-redeemed',
isAutomaticReward = type === 'automatic-reward-redeemed';
if ( ! this.chat.context.get('chat.filtering.blocked-types').has('ChannelPointsReward') ) { if ( ! data?.reward || ! service || (!isAutomaticReward && !isRedeemed) || service.props.channelID != data?.channel_id )
const msg = { return;
id: data.id,
type: this.chat_types.Message,
ffz_type: 'points',
ffz_reward: reward,
ffz_reward_highlight: isHighlightedReward(reward),
messageParts: [],
user: {
id: data.user.id,
login: data.user.login,
displayName: data.user.display_name
},
timestamp: new Date(message.data.timestamp || data.redeemed_at).getTime()
};
service.postMessageToCurrentChannel({}, msg); if ((isRedeemed && data.user_input) || (isAutomaticReward && data.reward.reward_type !== 'celebration'))
} return;
//event.preventDefault(); let rewardID;
if (isAutomaticReward)
rewardID = `${inst.props.channelID}:${data.reward.reward_type}`;
else
rewardID = data.reward.id;
const reward = service.props.rewardMap[rewardID];
if ( ! reward )
return;
if ( this.chat.context.get('chat.filtering.blocked-types').has('ChannelPointsReward') )
return;
if ( this.last_points_redeem === data.id )
return;
this.last_points_redeem = data.id;
service.postMessageToCurrentChannel({}, {
id: data.id,
type: this.chat_types.Message,
ffz_type: 'points',
ffz_reward: reward,
ffz_reward_highlight: isHighlightedReward(reward),
messageParts: [],
user: {
id: data.user.id,
login: data.user.login,
displayName: data.user.display_name
},
timestamp: new Date(msg.data.timestamp || data.redeemed_at).getTime()
}); });
} }