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

4.19.5

Browse source 
* Added: Support for the new Mod View.
* Fixed: Changes to chat room state not updating room actions correctly.
* Fixed: Chat room state not being detected correctly when the client loads.
This commit is contained in:
SirStendec 2020-03-31 18:14:27 -04:00
parent 0c1e9c5204
commit 99eee7396d
7 changed files with 78 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
import {ColorAdjuster} from 'utilities/color';
import {setChildren} from 'utilities/dom';
import {get, has, make_enum, split_chars, shallow_object_equals, set_equals} from 'utilities/object';
import {get, has, make_enum, split_chars, shallow_object_equals, set_equals, deep_equals} from 'utilities/object';
import {WEBKIT_CSS as WEBKIT} from 'utilities/constants';
import {FFZEvent} from 'utilities/events';
@ -892,6 +892,12 @@ export default class ChatHook extends Module {
inst._ffzInstall();
const channel = inst.joinedChannel,
state = inst.client?.session?.channelstate?.[`#${channel}`]?.roomState;
if ( state )
this.updateChatState(state);
inst.connectHandlers();
inst.props.setChatConnectionAPI({
@ -914,20 +920,19 @@ export default class ChatHook extends Module {
if ( handler )
handler.addMessageHandler(inst.handleMessage);
if ( Array.isArray(inst.buffer) ) {
// We grab this from the chat client now.
/*if ( Array.isArray(inst.buffer) ) {
let i = inst.buffer.length;
const ct = this.chat_types || CHAT_TYPES;
while(i--) {
const msg = inst.buffer[i];
if ( msg && msg.type === ct.RoomState && msg.state ) {
this.chat.context.updateContext({
chat_state: msg.state
});
this.updateChatState(msg.state);
break;
}
}
}
}*/
inst.props.setMessageBufferAPI({
addUpdateHandler: inst.addUpdateHandler,
@ -1105,6 +1110,19 @@ export default class ChatHook extends Module {
}
updateChatState(state) {
const old_state = this.chat.context.get('context.chat_state') || {};
if ( deep_equals(state, old_state) )
return;
this.chat.context.updateContext({
chat_state: state
});
this.input.updateInput();
}
updatePinnedCallouts() {
for(const inst of this.PinnedCallout.instances)
this.onPinnedCallout(inst);
@ -1708,9 +1726,7 @@ export default class ChatHook extends Module {
current = t.chat.context.get('context.channel');
if ( channel && (channel === current || channel === `#${current}`) )
t.chat.context.updateContext({
chat_state: e.state
});
t.updateChatState(e.state);
} catch(err) {
t.log.capture(err, {extra: e});