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.67.2

Browse source 
* Fixed: FFZ not correctly loading on dashboard pages.
This commit is contained in:
SirStendec 2024-01-24 12:12:08 -05:00
parent e8bb25f982
commit f89938ba5a
5 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "frankerfacez", "name": "frankerfacez",
"author": "Dan Salvato LLC", "author": "Dan Salvato LLC",
"version": "4.67.1", "version": "4.67.2",
"description": "FrankerFaceZ is a Twitch enhancement suite.", "description": "FrankerFaceZ is a Twitch enhancement suite.",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",

7
src/modules/chat/emotes.js
View file

@ -869,7 +869,10 @@ export default class Emotes extends Module {
}); });
if ( msg ) if ( msg )
chat.addNotice('*', `[FFZ] ${msg}`); chat.addNotice('*', {
icon: 'ffz-i-zreknarf',
message: msg
}); // `[FFZ] ${msg}`);
} }
} }
} }
@ -2462,4 +2465,4 @@ function determineSetType(set) {
return EmoteTypes.BitsTier; return EmoteTypes.BitsTier;
return EmoteTypes.Global; return EmoteTypes.Global;
} }

18
src/sites/base.js
View file

@ -1,13 +1,14 @@
'use strict'; 'use strict';
import Module from 'utilities/module'; import Module, { GenericModule } from 'utilities/module';
let last_site = 0; let last_site = 0;
let last_call = 0; let last_call = 0;
export default class BaseSite extends Module { export default class BaseSite extends Module {
constructor(...args) {
super(...args); constructor(name, parent) {
super(name, parent);
this._id = `_ffz$${last_site++}`; this._id = `_ffz$${last_site++}`;
//this.inject('settings'); //this.inject('settings');
@ -32,7 +33,7 @@ export default class BaseSite extends Module {
if ( react?.Component && react.createElement ) if ( react?.Component && react.createElement )
return this._react = react; return this._react = react;
react = this.resolve('web_munch')?.getModule?.('react'); react = this.resolve('site.web_munch')?.getModule?.('react');
if ( react?.Component && react.createElement ) if ( react?.Component && react.createElement )
return this._react = react; return this._react = react;
} }
@ -42,7 +43,12 @@ export default class BaseSite extends Module {
if ( react ) if ( react )
return Promise.resolve(react); return Promise.resolve(react);
return this.resolve('web_munch').findModule('react'); const munch = this.resolve('site.web_munch');
if ( munch )
return munch.findModule('react');
return this.waitFor('site.web_munch:registered')
.then(() => this.findReact());
} }
awaitElement(selector, parent, timeout = 60000) { awaitElement(selector, parent, timeout = 60000) {
@ -122,4 +128,4 @@ export default class BaseSite extends Module {
}); });
}); });
} }
} }

2
src/sites/twitch-twilight/modules/chat/line.js
View file

@ -111,7 +111,7 @@ export default class ChatLine extends Module {
message: text, message: text,
id: msg.id, id: msg.id,
user: msg.user, user: msg.user,
room: msg.room, roomLogin: msg.roomLogin,
roomID: msg.roomID roomID: msg.roomID
}); });

4
src/utilities/module.ts
View file

@ -56,7 +56,7 @@ export enum State {
}; };
export type ModuleEvents = { export type ModuleEvents = {
':registered': [], ':registered': [module: GenericModule],
':loaded': [module: GenericModule], ':loaded': [module: GenericModule],
':unloaded': [module: GenericModule], ':unloaded': [module: GenericModule],
':enabled': [module: GenericModule], ':enabled': [module: GenericModule],
@ -197,7 +197,7 @@ export class Module<
State.Disabled : State.Enabled; State.Disabled : State.Enabled;
this._time('instance'); this._time('instance');
(this as any).emit(':registered'); (this as any).emit(':registered', this);
} }