4.67.2

* Fixed: FFZ not correctly loading on dashboard pages.

package.json

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

src/modules/chat/emotes.js

@@ -869,7 +869,10 @@ export default class Emotes extends Module {
 					});
 
 				if ( msg )
-					chat.addNotice('*', `[FFZ] ${msg}`);
+					chat.addNotice('*', {
+						icon: 'ffz-i-zreknarf',
+						message: msg
+					}); // `[FFZ] ${msg}`);
 			}
 		}
 	}

src/sites/base.js

@@ -1,13 +1,14 @@
 'use strict';
 
-import Module from 'utilities/module';
+import Module, { GenericModule } from 'utilities/module';
 
 let last_site = 0;
 let last_call = 0;
 
 export default class BaseSite extends Module {
-	constructor(...args) {
-		super(...args);
+
+	constructor(name, parent) {
+		super(name, parent);
 		this._id = `_ffz$${last_site++}`;
 
 		//this.inject('settings');
@@ -32,7 +33,7 @@ export default class BaseSite extends Module {
 		if ( react?.Component && react.createElement )
 			return this._react = react;
 
-		react = this.resolve('web_munch')?.getModule?.('react');
+		react = this.resolve('site.web_munch')?.getModule?.('react');
 		if ( react?.Component && react.createElement )
 			return this._react = react;
 	}
@@ -42,7 +43,12 @@ export default class BaseSite extends Module {
 		if ( 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) {

src/sites/twitch-twilight/modules/chat/line.js

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

src/utilities/module.ts

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