From 82f6fb86b2c09cca1c09efebfc3c90e09e555809 Mon Sep 17 00:00:00 2001 From: dank074 Date: Wed, 20 Oct 2021 19:42:31 -0500 Subject: [PATCH] oops missed some stuff --- src/nitro/communication/NitroMessages.ts | 5 ++- .../communication/messages/incoming/index.ts | 1 - .../ModeratorMessageEvent.ts | 2 +- .../messages/incoming/moderation/index.ts | 1 + .../messages/incoming/notifications/index.ts | 1 - .../callforhelp/CfhTopicsInitMessageParser.ts | 2 +- .../communication/messages/parser/index.ts | 1 - .../notifications/ModeratorMessageParser.ts | 35 ------------------- .../messages/parser/notifications/index.ts | 1 - 9 files changed, 5 insertions(+), 44 deletions(-) rename src/nitro/communication/messages/incoming/{notifications => moderation}/ModeratorMessageEvent.ts (83%) delete mode 100644 src/nitro/communication/messages/parser/notifications/ModeratorMessageParser.ts diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts index ba8949e3..52a759af 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, ModeratorRoomInfoEvent, ModeratorUserInfoEvent, RoomChatlogEvent, RoomVisitsEvent, UserBannedMessageEvent, UserChatlogEvent } from './messages/incoming/moderation'; +import { CfhChatlogEvent, IssueDeletedMessageEvent, IssueInfoMessageEvent, IssuePickFailedMessageEvent, ModeratorActionResultMessageEvent, ModeratorInitMessageEvent, ModeratorMessageEvent, ModeratorRoomInfoEvent, 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'; @@ -104,7 +104,6 @@ import { NavigatorSearchEvent } from './messages/incoming/navigator/NavigatorSea import { NavigatorSettingsEvent } from './messages/incoming/navigator/NavigatorSettingsEvent'; import { BotErrorEvent } from './messages/incoming/notifications/BotErrorEvent'; import { HabboBroadcastMessageEvent } from './messages/incoming/notifications/HabboBroadcastMessageEvent'; -import { ModeratorMessageEvent } from './messages/incoming/notifications/ModeratorMessageEvent'; import { MOTDNotificationEvent } from './messages/incoming/notifications/MOTDNotificationEvent'; import { NotificationDialogMessageEvent } from './messages/incoming/notifications/NotificationDialogMessageEvent'; import { PetLevelNotificationEvent } from './messages/incoming/notifications/PetLevelNotificationEvent'; @@ -669,6 +668,7 @@ export class NitroMessages implements IMessageConfiguration this._events.set(IncomingHeader.ISSUE_INFO, IssueInfoMessageEvent); this._events.set(IncomingHeader.ISSUE_PICK_FAILED, IssuePickFailedMessageEvent); this._events.set(IncomingHeader.MODERATOR_ACTION_RESULT, ModeratorActionResultMessageEvent); + this._events.set(IncomingHeader.MODERATOR_MESSAGE, ModeratorMessageEvent); // MYSTERY BOX this._events.set(IncomingHeader.MYSTERY_BOX_KEYS, MysteryBoxKeysEvent); @@ -693,7 +693,6 @@ export class NitroMessages implements IMessageConfiguration this._events.set(IncomingHeader.ACHIEVEMENT_NOTIFICATION, AchievementNotificationMessageEvent); this._events.set(IncomingHeader.INFO_FEED_ENABLE, InfoFeedEnableMessageEvent); this._events.set(IncomingHeader.CLUB_GIFT_NOTIFICATION, ClubGiftNotificationEvent); - this._events.set(IncomingHeader.MODERATOR_MESSAGE, ModeratorMessageEvent); this._events.set(IncomingHeader.ACTIVITY_POINT_NOTIFICATION, ActivityPointNotificationMessageEvent); this._events.set(IncomingHeader.BOT_ERROR, BotErrorEvent); this._events.set(IncomingHeader.PET_LEVEL_NOTIFICATION, PetLevelNotificationEvent); diff --git a/src/nitro/communication/messages/incoming/index.ts b/src/nitro/communication/messages/incoming/index.ts index 39f22de2..351fbb79 100644 --- a/src/nitro/communication/messages/incoming/index.ts +++ b/src/nitro/communication/messages/incoming/index.ts @@ -24,7 +24,6 @@ export * from './inventory/trading'; export * from './landingview'; export * from './marketplace'; export * from './moderation'; -export * from './modtool'; export * from './mysterybox'; export * from './navigator'; export * from './notifications'; diff --git a/src/nitro/communication/messages/incoming/notifications/ModeratorMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts similarity index 83% rename from src/nitro/communication/messages/incoming/notifications/ModeratorMessageEvent.ts rename to src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts index 3e6f1c67..58103ccf 100644 --- a/src/nitro/communication/messages/incoming/notifications/ModeratorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; -import { ModeratorMessageParser } from '../../parser/notifications/ModeratorMessageParser'; +import { ModeratorMessageParser } from '../../parser/moderation/ModeratorMessageParser'; export class ModeratorMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/index.ts b/src/nitro/communication/messages/incoming/moderation/index.ts index 35c0383b..3427e82c 100644 --- a/src/nitro/communication/messages/incoming/moderation/index.ts +++ b/src/nitro/communication/messages/incoming/moderation/index.ts @@ -9,6 +9,7 @@ export * from './IssuePickFailedMessageEvent'; export * from './ModeratorActionResultMessageEvent'; export * from './ModeratorCautionEvent'; export * from './ModeratorInitMessageEvent'; +export * from './ModeratorMessageEvent'; export * from './ModeratorRoomInfoEvent'; export * from './ModeratorUserInfoData'; export * from './ModeratorUserInfoEvent'; diff --git a/src/nitro/communication/messages/incoming/notifications/index.ts b/src/nitro/communication/messages/incoming/notifications/index.ts index 59453798..467abb76 100644 --- a/src/nitro/communication/messages/incoming/notifications/index.ts +++ b/src/nitro/communication/messages/incoming/notifications/index.ts @@ -6,7 +6,6 @@ export * from './ClubGiftNotificationEvent'; export * from './HabboBroadcastMessageEvent'; export * from './HotelWillShutdownEvent'; export * from './InfoFeedEnableMessageEvent'; -export * from './ModeratorMessageEvent'; export * from './MOTDNotificationEvent'; export * from './NotificationDialogMessageEvent'; export * from './PetLevelNotificationEvent'; diff --git a/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts b/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts index f2ef9856..87884dbc 100644 --- a/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts +++ b/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper } from '../../../../../core'; -import { CallForHelpCategoryData } from '../modtool'; +import { CallForHelpCategoryData } from '../../incoming/callforhelp/CallForHelpCategoryData'; import { IMessageParser } from './../../../../../core'; export class CfhTopicsInitMessageParser implements IMessageParser diff --git a/src/nitro/communication/messages/parser/index.ts b/src/nitro/communication/messages/parser/index.ts index 598c2b67..8cac1987 100644 --- a/src/nitro/communication/messages/parser/index.ts +++ b/src/nitro/communication/messages/parser/index.ts @@ -16,7 +16,6 @@ export * from './inventory'; export * from './landingview'; export * from './marketplace'; export * from './moderation'; -export * from './modtool'; export * from './mysterybox'; export * from './navigator'; export * from './notifications'; diff --git a/src/nitro/communication/messages/parser/notifications/ModeratorMessageParser.ts b/src/nitro/communication/messages/parser/notifications/ModeratorMessageParser.ts deleted file mode 100644 index 5ef14012..00000000 --- a/src/nitro/communication/messages/parser/notifications/ModeratorMessageParser.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; - -export class ModeratorMessageParser implements IMessageParser -{ - private _message: string; - private _link: string; - - public flush(): boolean - { - this._message = null; - this._link = null; - - return true; - } - - public parse(wrapper: IMessageDataWrapper): boolean - { - if(!wrapper) return false; - - this._message = wrapper.readString(); - this._link = wrapper.readString(); - - return true; - } - - public get message(): string - { - return this._message; - } - - public get link(): string - { - return this._link; - } -} diff --git a/src/nitro/communication/messages/parser/notifications/index.ts b/src/nitro/communication/messages/parser/notifications/index.ts index 3837191f..3716cd8d 100644 --- a/src/nitro/communication/messages/parser/notifications/index.ts +++ b/src/nitro/communication/messages/parser/notifications/index.ts @@ -5,7 +5,6 @@ export * from './ClubGiftNotificationParser'; export * from './HabboBroadcastMessageParser'; export * from './HotelWillShutdownParser'; export * from './InfoFeedEnableMessageParser'; -export * from './ModeratorMessageParser'; export * from './MOTDNotificationParser'; export * from './NotificationDialogMessageParser'; export * from './PetLevelNotificationParser';