moved packets around

src/nitro/communication/NitroMessages.ts

@@ -90,15 +90,8 @@ import { MarketplaceItemStatsEvent } from './messages/incoming/marketplace/Marke
 import { MarketplaceMakeOfferResult } from './messages/incoming/marketplace/MarketplaceMakeOfferResult';
 import { MarketPlaceOffersEvent } from './messages/incoming/marketplace/MarketplaceOffersEvent';
 import { MarketplaceOwnOffersEvent } from './messages/incoming/marketplace/MarketplaceOwnOffersEvent';
-import { UserBannedMessageEvent } from './messages/incoming/moderation';
+import { ModeratorInitMessageEvent, ModtoolCallForHelpTopicsEvent, ModtoolReceivedRoomsUserEvent, ModtoolRoomChatlogEvent, ModtoolRoomInfoEvent, ModtoolUserChatlogEvent, ModtoolUserInfoEvent, 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 { ModtoolReceivedRoomsUserEvent } from './messages/incoming/modtool/ModtoolReceivedRoomsUserEvent';
-import { ModtoolRoomChatlogEvent } from './messages/incoming/modtool/ModtoolRoomChatlogEvent';
-import { ModtoolRoomInfoEvent } from './messages/incoming/modtool/ModtoolRoomInfoEvent';
-import { ModtoolUserChatlogEvent } from './messages/incoming/modtool/ModtoolUserChatlogEvent';
-import { ModtoolUserInfoEvent } from './messages/incoming/modtool/ModtoolUserInfoEvent';
 import { NavigatorCategoriesEvent } from './messages/incoming/navigator/NavigatorCategoriesEvent';
 import { NavigatorCollapsedEvent } from './messages/incoming/navigator/NavigatorCollapsedEvent';
 import { NavigatorEventCategoriesEvent } from './messages/incoming/navigator/NavigatorEventCategoriesEvent';
@@ -322,20 +315,20 @@ 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 { DefaultSanctionMessageComposer } from './messages/outgoing/modtool/DefaultSanctionMessageComposer';
-import { GetModeratorRoomInfoMessageComposer } from './messages/outgoing/modtool/GetModeratorRoomInfoMessageComposer';
-import { GetModeratorUserInfoMessageComposer } from './messages/outgoing/modtool/GetModeratorUserInfoMessageComposer';
-import { GetRoomChatlogMessageComposer } from './messages/outgoing/modtool/GetRoomChatlogMessageComposer';
-import { GetRoomVisitsMessageComposer } from './messages/outgoing/modtool/GetRoomVisitsMessageComposer';
-import { GetUserChatlogMessageComposer } from './messages/outgoing/modtool/GetUserChatlogMessageComposer';
-import { ModAlertMessageComposer } from './messages/outgoing/modtool/ModAlertMessageComposer';
-import { ModBanMessageComposer } from './messages/outgoing/modtool/ModBanMessageComposer';
-import { ModerateRoomMessageComposer } from './messages/outgoing/modtool/ModerateRoomMessageComposer';
-import { ModeratorActionMessageComposer } from './messages/outgoing/modtool/ModeratorActionMessageComposer';
-import { ModKickMessageComposer } from './messages/outgoing/modtool/ModKickMessageComposer';
-import { ModMessageMessageComposer } from './messages/outgoing/modtool/ModMessageMessageComposer';
-import { ModMuteMessageComposer } from './messages/outgoing/modtool/ModMuteMessageComposer';
-import { ModTradingLockMessageComposer } from './messages/outgoing/modtool/ModTradingLockMessageComposer';
+import { DefaultSanctionMessageComposer } from './messages/outgoing/moderation/DefaultSanctionMessageComposer';
+import { GetModeratorRoomInfoMessageComposer } from './messages/outgoing/moderation/GetModeratorRoomInfoMessageComposer';
+import { GetModeratorUserInfoMessageComposer } from './messages/outgoing/moderation/GetModeratorUserInfoMessageComposer';
+import { GetRoomChatlogMessageComposer } from './messages/outgoing/moderation/GetRoomChatlogMessageComposer';
+import { GetRoomVisitsMessageComposer } from './messages/outgoing/moderation/GetRoomVisitsMessageComposer';
+import { GetUserChatlogMessageComposer } from './messages/outgoing/moderation/GetUserChatlogMessageComposer';
+import { ModAlertMessageComposer } from './messages/outgoing/moderation/ModAlertMessageComposer';
+import { ModBanMessageComposer } from './messages/outgoing/moderation/ModBanMessageComposer';
+import { ModerateRoomMessageComposer } from './messages/outgoing/moderation/ModerateRoomMessageComposer';
+import { ModeratorActionMessageComposer } from './messages/outgoing/moderation/ModeratorActionMessageComposer';
+import { ModKickMessageComposer } from './messages/outgoing/moderation/ModKickMessageComposer';
+import { ModMessageMessageComposer } from './messages/outgoing/moderation/ModMessageMessageComposer';
+import { ModMuteMessageComposer } from './messages/outgoing/moderation/ModMuteMessageComposer';
+import { ModTradingLockMessageComposer } from './messages/outgoing/moderation/ModTradingLockMessageComposer';
 import { ConvertGlobalRoomIdMessageComposer } from './messages/outgoing/navigator/ConvertGlobalRoomIdComposer';
 import { NavigatorCategoriesComposer } from './messages/outgoing/navigator/NavigatorCategoriesComposer';
 import { NavigatorCategoryListModeComposer } from './messages/outgoing/navigator/NavigatorCategoryListModeComposer';

src/nitro/communication/messages/incoming/moderation/CfhChatlogData.ts

@@ -0,0 +1,45 @@
+import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper';
+import { ChatRecordData } from '../../parser/moderation/utils/ChatRecordData';
+
+export class CfhChatlogData
+{
+    private _callId: number;
+    private _callerUserId: number;
+    private _reportedUserId: number;
+    private _chatRecordId: number;
+    private _chatRecord: ChatRecordData
+
+    constructor(k:IMessageDataWrapper)
+    {
+        this._callId = k.readInt();
+        this._callerUserId = k.readInt();
+        this._reportedUserId = k.readInt();
+        this._chatRecordId = k.readInt();
+        this._chatRecord = new ChatRecordData(k);
+    }
+
+    public get callId(): number
+    {
+        return this._callId;
+    }
+
+    public get callerUserId(): number
+    {
+        return this._callerUserId;
+    }
+
+    public get reportedUserId(): number
+    {
+        return this._reportedUserId;
+    }
+
+    public get chatRecordId(): number
+    {
+        return this._chatRecordId;
+    }
+
+    public get chatRecord(): ChatRecordData
+    {
+        return this._chatRecord;
+    }
+}

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

@@ -1,6 +1,6 @@
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModeratorInitMessageParser } from '../../parser/modtool/ModeratorInitMessageParser';
+import { ModeratorInitMessageParser } from '../../parser/moderation/ModeratorInitMessageParser';
 
 export class ModeratorInitMessageEvent extends MessageEvent implements IMessageEvent
 {

src/nitro/communication/messages/incoming/moderation/ModtoolCallForHelpTopicsEvent.ts

@@ -1,6 +1,6 @@
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModtoolCFHTopicsParser } from '../../parser/modtool/ModtoolCFHTopicsParser';
+import { ModtoolCFHTopicsParser } from '../../parser/moderation/ModtoolCFHTopicsParser';
 
 export class ModtoolCallForHelpTopicsEvent extends MessageEvent implements IMessageEvent
 {

src/nitro/communication/messages/incoming/moderation/ModtoolReceivedRoomsUserEvent.ts

@@ -1,6 +1,6 @@
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModtoolRoomUsersParser } from '../../parser/modtool/ModtoolRoomUsersParser';
+import { ModtoolRoomUsersParser } from '../../parser/moderation/ModtoolRoomUsersParser';
 
 export class ModtoolReceivedRoomsUserEvent extends MessageEvent implements IMessageEvent
 {

src/nitro/communication/messages/incoming/moderation/ModtoolRoomChatlogEvent.ts

@@ -1,6 +1,6 @@
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModtoolRoomChatlogParser } from '../../parser/modtool/ModtoolRoomChatlogParser';
+import { ModtoolRoomChatlogParser } from '../../parser/moderation/ModtoolRoomChatlogParser';
 
 export class ModtoolRoomChatlogEvent extends MessageEvent implements IMessageEvent
 {

src/nitro/communication/messages/incoming/moderation/ModtoolRoomInfoEvent.ts

@@ -1,6 +1,6 @@
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModtoolRoomInfoParser } from '../../parser/modtool/ModtoolRoomInfoParser';
+import { ModtoolRoomInfoParser } from '../../parser/moderation/ModtoolRoomInfoParser';
 
 export class ModtoolRoomInfoEvent extends MessageEvent implements IMessageEvent
 {

src/nitro/communication/messages/incoming/moderation/ModtoolUserChatlogEvent.ts

@@ -1,6 +1,6 @@
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModtoolUserChatlogParser } from '../../parser/modtool/ModtoolUserChatlogParser';
+import { ModtoolUserChatlogParser } from '../../parser/moderation/ModtoolUserChatlogParser';
 
 export class ModtoolUserChatlogEvent extends MessageEvent implements IMessageEvent
 {

src/nitro/communication/messages/incoming/moderation/ModtoolUserInfoEvent.ts

@@ -1,6 +1,6 @@
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { ModtoolUserInfoParser } from '../../parser/modtool/ModtoolUserInfoParser';
+import { ModtoolUserInfoParser } from '../../parser/moderation/ModtoolUserInfoParser';
 
 export class ModtoolUserInfoEvent extends MessageEvent implements IMessageEvent
 {

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

@@ -1,3 +1,11 @@
+export * from './CfhChatlogData';
 export * from './INamed';
 export * from './ModeratorCautionEvent';
+export * from './ModeratorInitMessageEvent';
+export * from './ModtoolCallForHelpTopicsEvent';
+export * from './ModtoolReceivedRoomsUserEvent';
+export * from './ModtoolRoomChatlogEvent';
+export * from './ModtoolRoomInfoEvent';
+export * from './ModtoolUserChatlogEvent';
+export * from './ModtoolUserInfoEvent';
 export * from './UserBannedMessageEvent';

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

@@ -1,7 +0,0 @@
-export * from './ModeratorInitMessageEvent';
-export * from './ModtoolCallForHelpTopicsEvent';
-export * from './ModtoolReceivedRoomsUserEvent';
-export * from './ModtoolRoomChatlogEvent';
-export * from './ModtoolRoomInfoEvent';
-export * from './ModtoolUserChatlogEvent';
-export * from './ModtoolUserInfoEvent';

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

@@ -16,7 +16,7 @@ export * from './helper';
 export * from './inventory';
 export * from './landingview';
 export * from './marketplace';
-export * from './modtool';
+export * from './moderation';
 export * from './navigator';
 export * from './OutgoingHeader';
 export * from './pet';

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

@@ -1,2 +1,10 @@
 export * from './ModerationCautionParser';
+export * from './ModeratorInitMessageParser';
+export * from './ModtoolCFHTopicsParser';
+export * from './ModtoolRoomChatlogParser';
+export * from './ModtoolRoomInfoParser';
+export * from './ModtoolRoomUsersParser';
+export * from './ModtoolUserChatlogParser';
+export * from './ModtoolUserInfoParser';
 export * from './UserBannedMessageParser';
+export * from './utils';

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

@@ -1,8 +0,0 @@
-export * from './ModeratorInitMessageParser';
-export * from './ModtoolCFHTopicsParser';
-export * from './ModtoolRoomChatlogParser';
-export * from './ModtoolRoomInfoParser';
-export * from './ModtoolRoomUsersParser';
-export * from './ModtoolUserChatlogParser';
-export * from './ModtoolUserInfoParser';
-export * from './utils';