From 1eefb1dc8bcf6576f2b9d6b82192d9e9b7e27462 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Wed, 26 Sep 2018 17:35:22 -0400 Subject: [PATCH] 4.0.0-rc12.23 Fixed: Twitch updated the raid chat UI, breaking the option to stop automatically joining raids. --- src/main.js | 2 +- src/sites/twitch-twilight/modules/channel.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.js b/src/main.js index 41f3dafe..af225732 100644 --- a/src/main.js +++ b/src/main.js @@ -100,7 +100,7 @@ class FrankerFaceZ extends Module { FrankerFaceZ.Logger = Logger; const VER = FrankerFaceZ.version_info = { - major: 4, minor: 0, revision: 0, extra: '-rc12.22', + major: 4, minor: 0, revision: 0, extra: '-rc12.23', commit: __git_commit__, build: __webpack_hash__, toString: () => diff --git a/src/sites/twitch-twilight/modules/channel.js b/src/sites/twitch-twilight/modules/channel.js index dc4b248b..4d6304a3 100644 --- a/src/sites/twitch-twilight/modules/channel.js +++ b/src/sites/twitch-twilight/modules/channel.js @@ -98,7 +98,7 @@ export default class Channel extends Module { old_handle_join = inst.handleJoinRaid; inst.handleJoinRaid = function(event, ...args) { - const raid_id = inst.state && inst.state.raid && inst.state.raid.id; + const raid_id = inst.props && inst.props.raid && inst.props.raid.id; if ( event && event.type && raid_id ) t.joined_raids.add(raid_id); @@ -112,8 +112,8 @@ export default class Channel extends Module { noAutoRaids(inst) { if ( this.settings.get('channel.raids.no-autojoin') ) setTimeout(() => { - if ( inst.state.raid && ! inst.isRaidCreator && inst.hasJoinedCurrentRaid ) { - const id = inst.state.raid.id; + if ( inst.props && inst.props.raid && ! inst.isRaidCreator && inst.hasJoinedCurrentRaid ) { + const id = inst.props.raid.id; if ( this.joined_raids.has(id) ) return;