From 80cb55ea2c28c65f0c3394b4b1f35c3d2f0243e5 Mon Sep 17 00:00:00 2001 From: dank074 Date: Wed, 20 Oct 2021 23:02:20 -0500 Subject: [PATCH 1/3] missed a message --- src/nitro/communication/NitroMessages.ts | 3 ++- .../messages/incoming/IncomingHeader.ts | 1 + .../moderation/ModeratorToolPreferencesEvent.ts | 16 ++++++++++++++++ .../messages/incoming/moderation/index.ts | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts index 52a759af..0a3f2956 100644 --- a/src/nitro/communication/NitroMessages.ts +++ b/src/nitro/communication/NitroMessages.ts @@ -90,7 +90,7 @@ 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 { CfhChatlogEvent, IssueDeletedMessageEvent, IssueInfoMessageEvent, IssuePickFailedMessageEvent, ModeratorActionResultMessageEvent, ModeratorInitMessageEvent, ModeratorMessageEvent, ModeratorRoomInfoEvent, ModeratorUserInfoEvent, RoomChatlogEvent, RoomVisitsEvent, UserBannedMessageEvent, UserChatlogEvent } from './messages/incoming/moderation'; +import { CfhChatlogEvent, IssueDeletedMessageEvent, IssueInfoMessageEvent, IssuePickFailedMessageEvent, ModeratorActionResultMessageEvent, ModeratorInitMessageEvent, ModeratorMessageEvent, ModeratorRoomInfoEvent, ModeratorToolPreferencesEvent, ModeratorUserInfoEvent, RoomChatlogEvent, RoomVisitsEvent, UserBannedMessageEvent, UserChatlogEvent } from './messages/incoming/moderation'; import { ModeratorCautionEvent } from './messages/incoming/moderation/ModeratorCautionEvent'; import { NavigatorCategoriesEvent } from './messages/incoming/navigator/NavigatorCategoriesEvent'; import { NavigatorCollapsedEvent } from './messages/incoming/navigator/NavigatorCollapsedEvent'; @@ -669,6 +669,7 @@ export class NitroMessages implements IMessageConfiguration this._events.set(IncomingHeader.ISSUE_PICK_FAILED, IssuePickFailedMessageEvent); this._events.set(IncomingHeader.MODERATOR_ACTION_RESULT, ModeratorActionResultMessageEvent); this._events.set(IncomingHeader.MODERATOR_MESSAGE, ModeratorMessageEvent); + this._events.set(IncomingHeader.MODERATOR_TOOL_PREFERENCES, ModeratorToolPreferencesEvent); // MYSTERY BOX this._events.set(IncomingHeader.MYSTERY_BOX_KEYS, MysteryBoxKeysEvent); diff --git a/src/nitro/communication/messages/incoming/IncomingHeader.ts b/src/nitro/communication/messages/incoming/IncomingHeader.ts index 1e2f36ea..713f9102 100644 --- a/src/nitro/communication/messages/incoming/IncomingHeader.ts +++ b/src/nitro/communication/messages/incoming/IncomingHeader.ts @@ -221,6 +221,7 @@ export class IncomingHeader public static ISSUE_INFO = 3609; public static ISSUE_PICK_FAILED = 3150; public static CFH_CHATLOG = 607; + public static MODERATOR_TOOL_PREFERENCES = 1576; public static LOVELOCK_FURNI_START = 3753; public static LOVELOCK_FURNI_FRIEND_COMFIRMED = 382; public static LOVELOCK_FURNI_FINISHED = 770; diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts new file mode 100644 index 00000000..3dd6f913 --- /dev/null +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts @@ -0,0 +1,16 @@ +import { ModeratorToolPreferencesMessageParser } from '../..'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; + +export class ModeratorToolPreferencesEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, ModeratorToolPreferencesMessageParser); + } + + public getParser(): ModeratorToolPreferencesMessageParser + { + return this.parser as ModeratorToolPreferencesMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/moderation/index.ts b/src/nitro/communication/messages/incoming/moderation/index.ts index 22c4cfea..34640aef 100644 --- a/src/nitro/communication/messages/incoming/moderation/index.ts +++ b/src/nitro/communication/messages/incoming/moderation/index.ts @@ -11,6 +11,7 @@ export * from './ModeratorCautionEvent'; export * from './ModeratorInitMessageEvent'; export * from './ModeratorMessageEvent'; export * from './ModeratorRoomInfoEvent'; +export * from './ModeratorToolPreferencesEvent'; export * from './ModeratorUserInfoData'; export * from './ModeratorUserInfoEvent'; export * from './ModRoomData'; From 9637be200815232a691614ca25504b3a4b5c26fe Mon Sep 17 00:00:00 2001 From: dank074 Date: Wed, 20 Oct 2021 23:35:02 -0500 Subject: [PATCH 2/3] removed duplicate packets --- .../incoming/help/CallForHelpCategoryData.ts | 44 ------------------- .../incoming/help/CfhTopicsInitEvent.ts | 16 ------- .../messages/incoming/help/index.ts | 2 - .../communication/messages/incoming/index.ts | 1 + .../parser/help/CfhTopicsInitMessageParser.ts | 31 ------------- .../messages/parser/help/index.ts | 1 - 6 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 src/nitro/communication/messages/incoming/help/CallForHelpCategoryData.ts delete mode 100644 src/nitro/communication/messages/incoming/help/CfhTopicsInitEvent.ts delete mode 100644 src/nitro/communication/messages/parser/help/CfhTopicsInitMessageParser.ts diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpCategoryData.ts b/src/nitro/communication/messages/incoming/help/CallForHelpCategoryData.ts deleted file mode 100644 index f82e6dd2..00000000 --- a/src/nitro/communication/messages/incoming/help/CallForHelpCategoryData.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { IMessageDataWrapper } from '../../../../../core'; - -export class CallForHelpCategoryData -{ - private _name: string; - private _topics: CallForHelpTopicData[]; - - constructor(wrapper: IMessageDataWrapper) - { - this._topics = []; - this._name = wrapper.readString(); - const count = wrapper.readInt(); - let i = 0; - while(i < count) - { - const name = wrapper.readString(); - const id = wrapper.readInt(); - const unknown = wrapper.readString(); - this._topics.push({ - name, - id, - consequence: unknown - }); - i++; - } - - } - - public get topics(): CallForHelpTopicData[] - { - return this._topics; - } - - public get name(): string - { - return this._name; - } -} - -interface CallForHelpTopicData { - name: string; - id: number; - consequence: string; -} diff --git a/src/nitro/communication/messages/incoming/help/CfhTopicsInitEvent.ts b/src/nitro/communication/messages/incoming/help/CfhTopicsInitEvent.ts deleted file mode 100644 index 730a8197..00000000 --- a/src/nitro/communication/messages/incoming/help/CfhTopicsInitEvent.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; -import { CfhTopicsInitMessageParser } from '../../parser/help/CfhTopicsInitMessageParser'; - -export class CfhTopicsInitEvent extends MessageEvent implements IMessageEvent -{ - constructor(callBack: Function) - { - super(callBack, CfhTopicsInitMessageParser); - } - - public getParser(): CfhTopicsInitMessageParser - { - return this.parser as CfhTopicsInitMessageParser; - } -} diff --git a/src/nitro/communication/messages/incoming/help/index.ts b/src/nitro/communication/messages/incoming/help/index.ts index af7e99c6..b0bcb133 100644 --- a/src/nitro/communication/messages/incoming/help/index.ts +++ b/src/nitro/communication/messages/incoming/help/index.ts @@ -1,4 +1,2 @@ -export * from './CallForHelpCategoryData'; export * from './CallForHelpResultMessageEvent'; -export * from './CfhTopicsInitEvent'; export * from './TalentTrackEvent'; diff --git a/src/nitro/communication/messages/incoming/index.ts b/src/nitro/communication/messages/incoming/index.ts index 351fbb79..68200572 100644 --- a/src/nitro/communication/messages/incoming/index.ts +++ b/src/nitro/communication/messages/incoming/index.ts @@ -2,6 +2,7 @@ export * from './advertisement'; export * from './availability'; export * from './avatar'; export * from './bots'; +export * from './callforhelp'; export * from './camera'; export * from './catalog'; export * from './client'; diff --git a/src/nitro/communication/messages/parser/help/CfhTopicsInitMessageParser.ts b/src/nitro/communication/messages/parser/help/CfhTopicsInitMessageParser.ts deleted file mode 100644 index 03e7a6e1..00000000 --- a/src/nitro/communication/messages/parser/help/CfhTopicsInitMessageParser.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; -import { CallForHelpCategoryData } from '../../incoming/help/CallForHelpCategoryData'; - -export class CfhTopicsInitMessageParser implements IMessageParser -{ - private _callForHelpCategories: CallForHelpCategoryData[]; - - public flush(): boolean - { - return true; - } - - public parse(wrapper: IMessageDataWrapper): boolean - { - this._callForHelpCategories = []; - const count = wrapper.readInt(); - let i = 0; - while(i < count) - { - this._callForHelpCategories.push(new CallForHelpCategoryData(wrapper)); - i++; - } - - return true; - } - - public get callForHelpCategories(): CallForHelpCategoryData[] - { - return this._callForHelpCategories; - } -} diff --git a/src/nitro/communication/messages/parser/help/index.ts b/src/nitro/communication/messages/parser/help/index.ts index a7967304..66126c4c 100644 --- a/src/nitro/communication/messages/parser/help/index.ts +++ b/src/nitro/communication/messages/parser/help/index.ts @@ -1,4 +1,3 @@ export * from './CallForHelpResultMessageParser'; -export * from './CfhTopicsInitMessageParser'; export * from './common'; export * from './TalentTrackParser'; From 82af0976bfec077327686dd5ea6d94521ee800c5 Mon Sep 17 00:00:00 2001 From: dank074 Date: Wed, 20 Oct 2021 23:40:14 -0500 Subject: [PATCH 3/3] fixed dumb --- .../messages/incoming/callforhelp/CallForHelpCategoryData.ts | 2 +- .../messages/incoming/callforhelp/CallForHelpTopicData.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nitro/communication/messages/incoming/callforhelp/CallForHelpCategoryData.ts b/src/nitro/communication/messages/incoming/callforhelp/CallForHelpCategoryData.ts index 6f3bee4c..5ed8dd07 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CallForHelpCategoryData.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CallForHelpCategoryData.ts @@ -19,7 +19,7 @@ export class CallForHelpCategoryData implements INamed, IDisposable { this._topics.push(new CallForHelpTopicData(wrapper)); - count++; + count--; } } diff --git a/src/nitro/communication/messages/incoming/callforhelp/CallForHelpTopicData.ts b/src/nitro/communication/messages/incoming/callforhelp/CallForHelpTopicData.ts index 29bb124d..c41c3630 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CallForHelpTopicData.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CallForHelpTopicData.ts @@ -24,7 +24,7 @@ export class CallForHelpTopicData implements INamed return this._id; } - public get _Str_26337(): string + public get consequence(): string { return this._consequence; }