Merge branch 'dev' of https://git.krews.org/nitro/nitro-renderer into dev

src/nitro/communication/NitroMessages.ts

@@ -92,8 +92,8 @@ import { MarketPlaceOffersEvent } from './messages/incoming/marketplace/Marketpl
 import { MarketplaceOwnOffersEvent } from './messages/incoming/marketplace/MarketplaceOwnOffersEvent';
 import { UserBannedMessageEvent } from './messages/incoming/moderation';
 import { ModeratorCautionEvent } from './messages/incoming/moderation/ModeratorCautionEvent';
+import { ModeratorInitMessageEvent } from './messages/incoming/modtool/ModeratorInitMessageEvent';
 import { ModtoolCallForHelpTopicsEvent } from './messages/incoming/modtool/ModtoolCallForHelpTopicsEvent';
-import { ModtoolMainEvent } from './messages/incoming/modtool/ModtoolMainEvent';
 import { ModtoolReceivedRoomsUserEvent } from './messages/incoming/modtool/ModtoolReceivedRoomsUserEvent';
 import { ModtoolRoomChatlogEvent } from './messages/incoming/modtool/ModtoolRoomChatlogEvent';
 import { ModtoolRoomInfoEvent } from './messages/incoming/modtool/ModtoolRoomInfoEvent';
@@ -322,14 +322,14 @@ import { TradingOpenComposer } from './messages/outgoing/inventory/trading/Tradi
 import { TradingUnacceptComposer } from './messages/outgoing/inventory/trading/TradingUnacceptComposer';
 import { GetPromoArticlesComposer } from './messages/outgoing/landingview/GetPromoArticlesComposer';
 import { CommunityGoalVoteMessageComposer } from './messages/outgoing/landingview/votes/CommunityGoalVoteMessageComposer';
-import { ModtoolChangeRoomSettingsComposer } from './messages/outgoing/modtool/ModtoolChangeRoomSettingsComposer';
+import { ModerateRoomMessageComposer } from './messages/outgoing/modtool/ModerateRoomMessageComposer';
-import { ModtoolEventAlertComposer } from './messages/outgoing/modtool/ModtoolEventAlertComposer';
+import { ModeratorActionMessageComposer } from './messages/outgoing/modtool/ModeratorActionMessageComposer';
+import { ModMessageMessageComposer } from './messages/outgoing/modtool/ModMessageMessageComposer';
 import { ModtoolRequestRoomChatlogComposer } from './messages/outgoing/modtool/ModtoolRequestRoomChatlogComposer';
 import { ModtoolRequestRoomInfoComposer } from './messages/outgoing/modtool/ModtoolRequestRoomInfoComposer';
 import { ModtoolRequestUserChatlogComposer } from './messages/outgoing/modtool/ModtoolRequestUserChatlogComposer';
 import { ModtoolRequestUserInfoComposer } from './messages/outgoing/modtool/ModtoolRequestUserInfoComposer';
 import { ModtoolRequestUserRoomsComposer } from './messages/outgoing/modtool/ModtoolRequestUserRoomsComposer';
-import { ModtoolRoomAlertComposer } from './messages/outgoing/modtool/ModtoolRoomAlertComposer';
 import { ModtoolSanctionAlertComposer } from './messages/outgoing/modtool/ModtoolSanctionAlertComposer';
 import { ModtoolSanctionBanComposer } from './messages/outgoing/modtool/ModtoolSanctionBanComposer';
 import { ModtoolSanctionKickComposer } from './messages/outgoing/modtool/ModtoolSanctionKickComposer';
@@ -671,7 +671,7 @@ export class NitroMessages implements IMessageConfiguration
         this._events.set(IncomingHeader.MODTOOL_ROOM_CHATLOG, ModtoolRoomChatlogEvent);
         this._events.set(IncomingHeader.MODERATION_USER_INFO, ModtoolUserInfoEvent);
         this._events.set(IncomingHeader.MODERATION_TOPICS, ModtoolCallForHelpTopicsEvent);
-        this._events.set(IncomingHeader.MODERATION_TOOL, ModtoolMainEvent);
+        this._events.set(IncomingHeader.MODERATION_TOOL, ModeratorInitMessageEvent);
         this._events.set(IncomingHeader.MODTOOL_VISITED_ROOMS_USER, ModtoolReceivedRoomsUserEvent);
 
         // MYSTERY BOX
@@ -1220,7 +1220,7 @@ export class NitroMessages implements IMessageConfiguration
 
         // MODTOOL
         this._composers.set(OutgoingHeader.MODTOOL_REQUEST_ROOM_INFO, ModtoolRequestRoomInfoComposer);
-        this._composers.set(OutgoingHeader.MODTOOL_CHANGE_ROOM_SETTINGS, ModtoolChangeRoomSettingsComposer);
+        this._composers.set(OutgoingHeader.MODTOOL_CHANGE_ROOM_SETTINGS, ModerateRoomMessageComposer);
         this._composers.set(OutgoingHeader.MODTOOL_REQUEST_USER_CHATLOG, ModtoolRequestUserChatlogComposer);
         this._composers.set(OutgoingHeader.MODTOOL_REQUEST_ROOM_CHATLOG, ModtoolRequestRoomChatlogComposer);
         this._composers.set(OutgoingHeader.MOD_TOOL_USER_INFO, ModtoolRequestUserInfoComposer);
@@ -1228,10 +1228,10 @@ export class NitroMessages implements IMessageConfiguration
         this._composers.set(OutgoingHeader.MODTOOL_SANCTION_BAN, ModtoolSanctionBanComposer);
         this._composers.set(OutgoingHeader.MODTOOL_SANCTION_KICK, ModtoolSanctionKickComposer);
         this._composers.set(OutgoingHeader.MODTOOL_SANCTION_TRADELOCK, ModtoolSanctionTradelockComposer);
-        this._composers.set(OutgoingHeader.MODTOOL_ALERTEVENT, ModtoolEventAlertComposer);
+        this._composers.set(OutgoingHeader.MODTOOL_ALERTEVENT, ModMessageMessageComposer);
         this._composers.set(OutgoingHeader.MODTOOL_SANCTION_MUTE, ModtoolSanctionMuteComposer);
         this._composers.set(OutgoingHeader.MODTOOL_REQUEST_USER_ROOMS, ModtoolRequestUserRoomsComposer);
-        this._composers.set(OutgoingHeader.MODTOOL_ROOM_ALERT, ModtoolRoomAlertComposer);
+        this._composers.set(OutgoingHeader.MODTOOL_ROOM_ALERT, ModeratorActionMessageComposer);
 
         // SETTINGS
         this._composers.set(OutgoingHeader.USER_SETTINGS_CAMERA, UserSettingsCameraFollowComposer);

src/nitro/communication/messages/incoming/modtool/ModeratorInitMessageEvent.ts

@@ -0,0 +1,16 @@
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { ModeratorInitMessageParser } from '../../parser/modtool/ModeratorInitMessageParser';
+
+export class ModeratorInitMessageEvent extends MessageEvent implements IMessageEvent
+{
+    constructor(callBack: Function)
+    {
+        super(callBack, ModeratorInitMessageParser);
+    }
+
+    public getParser(): ModeratorInitMessageParser
+    {
+        return this.parser as ModeratorInitMessageParser;
+    }
+}

src/nitro/communication/messages/incoming/modtool/ModtoolMainEvent.ts

@@ -1,16 +0,0 @@
-import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModtoolMainParser } from '../../parser/modtool/ModtoolMainParser';
-
-export class ModtoolMainEvent extends MessageEvent implements IMessageEvent
-{
-    constructor(callBack: Function)
-    {
-        super(callBack, ModtoolMainParser);
-    }
-
-    public getParser(): ModtoolMainParser
-    {
-        return this.parser as ModtoolMainParser;
-    }
-}

src/nitro/communication/messages/incoming/modtool/index.ts

@@ -1,5 +1,5 @@
+export * from './ModeratorInitMessageEvent';
 export * from './ModtoolCallForHelpTopicsEvent';
-export * from './ModtoolMainEvent';
 export * from './ModtoolReceivedRoomsUserEvent';
 export * from './ModtoolRoomChatlogEvent';
 export * from './ModtoolRoomInfoEvent';

src/nitro/communication/messages/outgoing/modtool/ModMessageMessageComposer.ts

@@ -1,6 +1,6 @@
 import { IMessageComposer } from '../../../../../core/communication/messages/IMessageComposer';
 
-export class ModtoolEventAlertComposer implements IMessageComposer<any>
+export class ModMessageMessageComposer implements IMessageComposer<any>
 {
     private _data: any[] = [];
 
@@ -8,6 +8,8 @@ export class ModtoolEventAlertComposer implements IMessageComposer<any>
     {
         this._data.push(k);
         this._data.push(arg2);
+        this._data.push('');
+        this._data.push('');
         this._data.push(arg3);
         if(arg4 != -1)
         {

src/nitro/communication/messages/outgoing/modtool/ModerateRoomMessageComposer.ts

@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../core/communication/messages/IMessageComposer';
 
-export class ModtoolChangeRoomSettingsComposer implements IMessageComposer<ConstructorParameters<typeof ModtoolChangeRoomSettingsComposer>>
+export class ModerateRoomMessageComposer implements IMessageComposer<ConstructorParameters<typeof ModerateRoomMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof ModtoolChangeRoomSettingsComposer>;
+    private _data: ConstructorParameters<typeof ModerateRoomMessageComposer>;
 
     constructor(roomId: number, lockDoor: number, changeTitle: number, kickUsers: number)
     {

src/nitro/communication/messages/outgoing/modtool/ModeratorActionMessageComposer.ts

@@ -1,7 +1,12 @@
 import { IMessageComposer } from '../../../../../core/communication/messages/IMessageComposer';
 
-export class ModtoolRoomAlertComposer implements IMessageComposer<any>
+export class ModeratorActionMessageComposer implements IMessageComposer<any>
 {
+    public static readonly ACTION_ALERT = 0;
+    public static readonly ACTION_KICK = 1;
+    public static readonly ACTION_MESSAGE = 3;
+    public static readonly ACTION_MESSAGE_AND_SOFT_KICK = 4;
+
     private _data: any[] = [];
 
     constructor(k: number, arg2: string, arg3: string)

src/nitro/communication/messages/outgoing/modtool/index.ts

@@ -1,11 +1,11 @@
-export * from './ModtoolChangeRoomSettingsComposer';
+export * from './ModerateRoomMessageComposer';
-export * from './ModtoolEventAlertComposer';
+export * from './ModeratorActionMessageComposer';
+export * from './ModMessageMessageComposer';
 export * from './ModtoolRequestRoomChatlogComposer';
 export * from './ModtoolRequestRoomInfoComposer';
 export * from './ModtoolRequestUserChatlogComposer';
 export * from './ModtoolRequestUserInfoComposer';
 export * from './ModtoolRequestUserRoomsComposer';
-export * from './ModtoolRoomAlertComposer';
 export * from './ModtoolSanctionAlertComposer';
 export * from './ModtoolSanctionBanComposer';
 export * from './ModtoolSanctionKickComposer';

src/nitro/communication/messages/parser/modtool/ModeratorInitMessageParser.ts

@@ -1,7 +1,7 @@
 import { IMessageDataWrapper, IMessageParser } from '../../../../../core';
 import { ModeratorInitData } from './utils/ModeratorInitData';
 
-export class ModtoolMainParser  implements IMessageParser
+export class ModeratorInitMessageParser  implements IMessageParser
 {
     private _data: ModeratorInitData = null;
     public flush(): boolean

src/nitro/communication/messages/parser/modtool/index.ts

@@ -1,5 +1,5 @@
+export * from './ModeratorInitMessageParser';
 export * from './ModtoolCFHTopicsParser';
-export * from './ModtoolMainParser';
 export * from './ModtoolRoomChatlogParser';
 export * from './ModtoolRoomInfoParser';
 export * from './ModtoolRoomUsersParser';