Modchat/Modjoin: Emit previous level of modchat/modjoin

Dirain1700 · Jun 17, 2023 · 6d6e309 · 6d6e309
1 parent 78dee9c
commit 6d6e309
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Client.ts b/src/Client.ts
@@ -747,15 +747,17 @@ export class Client extends EventEmitter {
                 if (!isRoomNotEmp(room)) return;
                 const modchatLevel = Tools.isModchatHTML(event.join("|"));
                 if (modchatLevel !== false) {
+                    const previousModchatLevel = room.modchat;
                     room.modchat = modchatLevel;
                     this.rooms.cache.set(room.roomid, room);
-                    this.emit(Events.MODCHAT, modchatLevel, room);
+                    this.emit(Events.MODCHAT, room, modchatLevel, previousModchatLevel);
                 }
                 const modjoinLevel = Tools.isModjoinHTML(event.join("|"), room.modchat);
                 if (modjoinLevel !== false) {
+                    const previousModjoinLevel = room.modjoin;
                     room.modjoin = modjoinLevel;
                     this.rooms.cache.set(room.roomid, room);
-                    this.emit(Events.MODJOIN, modjoinLevel, room);
+                    this.emit(Events.MODJOIN, room, modjoinLevel, previousModjoinLevel);
                 } else this.emit(Events.RAW_DATA, event.join("|")!, room);
                 break;
             }

diff --git a/types/Client.d.ts b/types/Client.d.ts
@@ -65,8 +65,8 @@ export interface ClientEvents {
     battleStart: [room: BattleRoom];
     battleEnd: [room: BattleRoom, status: "win" | "tie", winner?: User];
     rawData: [message: string, room: Room];
-    modchat: [modchatLevel: ModchatLevel, room: Room];
-    modjoin: [modjoinLevel: ModchatLevel, room: Room];
+    modchat: [room: Room, modchatLevel: ModchatLevel, previousModchatLevel: ModchatLevel];
+    modjoin: [room: Room, modjoinLevel: ModchatLevel, previousModjoinLevel: ModchatLevel];
     messageCreate: [message: Message<User | Room>];
     messageDelete: [message: Message<User | Room>];
     roomUserAdd: [room: Room, user: User];