From d2f7f26decfe58814340d12f6ffcf6ad9e965df4 Mon Sep 17 00:00:00 2001 From: dank074 Date: Wed, 25 Aug 2021 16:20:32 -0500 Subject: [PATCH] updated packet names --- .../GetFurnitureDataForProductOffer.ts | 4 +- src/events/catalog/CatalogPurchasedEvent.ts | 8 +-- src/views/avatar-editor/AvatarEditorView.tsx | 4 +- .../wardrobe/AvatarEditorWardrobeView.tsx | 4 +- src/views/catalog/CatalogMessageHandler.tsx | 55 ++++++++++--------- src/views/catalog/common/CatalogUtilities.ts | 4 +- .../common/GiftWrappingConfiguration.ts | 4 +- src/views/catalog/reducers/CatalogReducer.tsx | 12 ++-- .../CatalogLayoutFrontpage4View.tsx | 8 +-- .../CatalogLayoutPetPurchaseView.types.ts | 4 +- .../spaces-new/CatalogLayoutSpacesView.tsx | 6 +- .../vip-buy/CatalogLayoutVipBuyView.tsx | 6 +- .../page/offer/CatalogPageOfferView.types.ts | 4 +- .../offers/CatalogPageOffersView.types.ts | 4 +- .../page/product/CatalogProductView.types.ts | 4 +- .../purchase/CatalogPurchaseView.types.ts | 4 +- .../CatalogPurchaseButtonView.types.ts | 4 +- .../CatalogPurchaseGiftButtonView.types.ts | 4 +- src/views/purse/PurseMessageHandler.tsx | 6 +- src/views/toolbar/ToolbarView.tsx | 6 +- 20 files changed, 78 insertions(+), 77 deletions(-) diff --git a/src/api/nitro/session/GetFurnitureDataForProductOffer.ts b/src/api/nitro/session/GetFurnitureDataForProductOffer.ts index eb243c8b..0588835c 100644 --- a/src/api/nitro/session/GetFurnitureDataForProductOffer.ts +++ b/src/api/nitro/session/GetFurnitureDataForProductOffer.ts @@ -1,7 +1,7 @@ -import { CatalogProductOfferData, FurnitureType, IFurnitureData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageProductData, FurnitureType, IFurnitureData } from '@nitrots/nitro-renderer'; import { GetSessionDataManager } from './GetSessionDataManager'; -export function GetFurnitureDataForProductOffer(offer: CatalogProductOfferData): IFurnitureData +export function GetFurnitureDataForProductOffer(offer: CatalogPageMessageProductData): IFurnitureData { if(!offer) return null; diff --git a/src/events/catalog/CatalogPurchasedEvent.ts b/src/events/catalog/CatalogPurchasedEvent.ts index 7e435e22..cf17596e 100644 --- a/src/events/catalog/CatalogPurchasedEvent.ts +++ b/src/events/catalog/CatalogPurchasedEvent.ts @@ -1,18 +1,18 @@ -import { CatalogPurchaseData } from '@nitrots/nitro-renderer'; +import { PurchaseOKMessageOfferData } from '@nitrots/nitro-renderer'; import { CatalogEvent } from './CatalogEvent'; export class CatalogPurchasedEvent extends CatalogEvent { - private _purchase: CatalogPurchaseData; + private _purchase: PurchaseOKMessageOfferData; - constructor(purchase: CatalogPurchaseData) + constructor(purchase: PurchaseOKMessageOfferData) { super(CatalogEvent.PURCHASE_SUCCESS); this._purchase = purchase; } - public get purchase(): CatalogPurchaseData + public get purchase(): PurchaseOKMessageOfferData { return this._purchase; } diff --git a/src/views/avatar-editor/AvatarEditorView.tsx b/src/views/avatar-editor/AvatarEditorView.tsx index 46e19a6c..b8984f08 100644 --- a/src/views/avatar-editor/AvatarEditorView.tsx +++ b/src/views/avatar-editor/AvatarEditorView.tsx @@ -1,4 +1,4 @@ -import { AvatarDirectionAngle, AvatarEditorFigureCategory, FigureSetIdsMessageEvent, UserFigureComposer, UserWardrobePageComposer, UserWardrobePageEvent } from '@nitrots/nitro-renderer'; +import { AvatarDirectionAngle, AvatarEditorFigureCategory, FigureSetIdsMessageEvent, GetWardrobeMessageComposer, UserFigureComposer, UserWardrobePageEvent } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; import { GetClubMemberLevel, GetSessionDataManager, LocalizeText } from '../../api'; import { AvatarEditorEvent } from '../../events/avatar-editor'; @@ -208,7 +208,7 @@ export const AvatarEditorView: FC = props => if(!isWardrobeVisible) return; setActiveCategory(null); - SendMessageHook(new UserWardrobePageComposer()); + SendMessageHook(new GetWardrobeMessageComposer()); }, [ isWardrobeVisible ]); useEffect(() => diff --git a/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx b/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx index bf8f42e0..80d0ef23 100644 --- a/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx +++ b/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx @@ -1,4 +1,4 @@ -import { UserWardrobeSaveComposer } from '@nitrots/nitro-renderer'; +import { SaveWardrobeOutfitMessageComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useMemo } from 'react'; import { Button } from 'react-bootstrap'; import { SendMessageHook } from '../../../../hooks'; @@ -33,7 +33,7 @@ export const AvatarEditorWardrobeView: FC = props newFigures[index] = [ figure, gender ]; setSavedFigures(newFigures); - SendMessageHook(new UserWardrobeSaveComposer((index + 1), figure, gender)); + SendMessageHook(new SaveWardrobeOutfitMessageComposer((index + 1), figure, gender)); }, [ figureData, savedFigures, setSavedFigures ]); const figures = useMemo(() => diff --git a/src/views/catalog/CatalogMessageHandler.tsx b/src/views/catalog/CatalogMessageHandler.tsx index 919e2c0c..15a8e606 100644 --- a/src/views/catalog/CatalogMessageHandler.tsx +++ b/src/views/catalog/CatalogMessageHandler.tsx @@ -1,4 +1,5 @@ -import { CatalogApproveNameResultEvent, CatalogClubEvent, CatalogGiftConfigurationEvent, CatalogGroupsEvent, CatalogPageEvent, CatalogPagesEvent, CatalogPurchaseEvent, CatalogPurchaseFailedEvent, CatalogPurchaseUnavailableEvent, CatalogSearchEvent, CatalogSoldOutEvent, CatalogUpdatedEvent, SellablePetPalettesEvent, UserSubscriptionEvent } from '@nitrots/nitro-renderer'; +import { ApproveNameMessageEvent, CatalogPageMessageEvent, CatalogPagesListEvent, CatalogPublishedMessageEvent, GiftWrappingConfigurationEvent, HabboClubOffersMessageEvent, LimitedEditionSoldOutEvent, ProductOfferEvent, PurchaseErrorMessageEvent, PurchaseNotAllowedMessageEvent, PurchaseOKMessageEvent, SellablePetPalettesMessageEvent, UserSubscriptionEvent } from '@nitrots/nitro-renderer'; +import { GuildMembershipsMessageEvent } from '@nitrots/nitro-renderer/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent'; import { FC, useCallback } from 'react'; import { CatalogNameResultEvent, CatalogPurchaseFailureEvent } from '../../events'; import { CatalogPurchasedEvent } from '../../events/catalog/CatalogPurchasedEvent'; @@ -15,7 +16,7 @@ export const CatalogMessageHandler: FC = props => { const { catalogState = null, dispatchCatalogState = null } = useCatalogContext(); - const onCatalogPagesEvent = useCallback((event: CatalogPagesEvent) => + const onCatalogPagesEvent = useCallback((event: CatalogPagesListEvent) => { const parser = event.getParser(); @@ -27,7 +28,7 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - const onCatalogPageEvent = useCallback((event: CatalogPageEvent) => + const onCatalogPageEvent = useCallback((event: CatalogPageMessageEvent) => { const parser = event.getParser(); @@ -39,33 +40,33 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - const onCatalogPurchaseEvent = useCallback((event: CatalogPurchaseEvent) => + const onCatalogPurchaseEvent = useCallback((event: PurchaseOKMessageEvent) => { const parser = event.getParser(); dispatchUiEvent(new CatalogPurchasedEvent(parser.offer)); }, []); - const onCatalogPurchaseFailedEvent = useCallback((event: CatalogPurchaseFailedEvent) => + const onCatalogPurchaseFailedEvent = useCallback((event: PurchaseErrorMessageEvent) => { const parser = event.getParser(); dispatchUiEvent(new CatalogPurchaseFailureEvent(parser.code)); }, []); - const onCatalogPurchaseUnavailableEvent = useCallback((event: CatalogPurchaseUnavailableEvent) => + const onCatalogPurchaseUnavailableEvent = useCallback((event: PurchaseNotAllowedMessageEvent) => { const parser = event.getParser(); }, []); - const onCatalogSoldOutEvent = useCallback((event: CatalogSoldOutEvent) => + const onCatalogSoldOutEvent = useCallback((event: LimitedEditionSoldOutEvent) => { const parser = event.getParser(); dispatchUiEvent(new CatalogPurchaseSoldOutEvent()); }, []); - const onCatalogSearchEvent = useCallback((event: CatalogSearchEvent) => + const onCatalogSearchEvent = useCallback((event: ProductOfferEvent) => { const parser = event.getParser(); @@ -77,7 +78,7 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - const onSellablePetPalettesEvent = useCallback((event: SellablePetPalettesEvent) => + const onSellablePetPalettesEvent = useCallback((event: SellablePetPalettesMessageEvent) => { const parser = event.getParser(); const petPalette = new CatalogPetPalette(parser.productCode, parser.palettes.slice()); @@ -88,14 +89,14 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - const onCatalogApproveNameResultEvent = useCallback((event: CatalogApproveNameResultEvent) => + const onCatalogApproveNameResultEvent = useCallback((event: ApproveNameMessageEvent) => { const parser = event.getParser(); dispatchUiEvent(new CatalogNameResultEvent(parser.result, parser.validationInfo)); }, []); - const onCatalogClubEvent = useCallback((event: CatalogClubEvent) => + const onCatalogClubEvent = useCallback((event: HabboClubOffersMessageEvent) => { const parser = event.getParser(); @@ -107,7 +108,7 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - const onCatalogGroupsEvent = useCallback((event: CatalogGroupsEvent) => + const onCatalogGroupsEvent = useCallback((event: GuildMembershipsMessageEvent) => { const parser = event.getParser(); @@ -137,7 +138,7 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - const onCatalogUpdatedEvent = useCallback((event: CatalogUpdatedEvent) => + const onCatalogUpdatedEvent = useCallback((event: CatalogPublishedMessageEvent) => { dispatchCatalogState({ type: CatalogActions.RESET_STATE, @@ -145,7 +146,7 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - const onCatalogGiftConfigurationEvent = useCallback((event: CatalogGiftConfigurationEvent) => + const onCatalogGiftConfigurationEvent = useCallback((event: GiftWrappingConfigurationEvent) => { const parser = event.getParser(); @@ -157,20 +158,20 @@ export const CatalogMessageHandler: FC = props => }); }, [ dispatchCatalogState ]); - CreateMessageHook(CatalogPagesEvent, onCatalogPagesEvent); - CreateMessageHook(CatalogPageEvent, onCatalogPageEvent); - CreateMessageHook(CatalogPurchaseEvent, onCatalogPurchaseEvent); - CreateMessageHook(CatalogPurchaseFailedEvent, onCatalogPurchaseFailedEvent); - CreateMessageHook(CatalogPurchaseUnavailableEvent, onCatalogPurchaseUnavailableEvent); - CreateMessageHook(CatalogSoldOutEvent, onCatalogSoldOutEvent); - CreateMessageHook(CatalogSearchEvent, onCatalogSearchEvent); - CreateMessageHook(CatalogGroupsEvent, onCatalogGroupsEvent); - CreateMessageHook(SellablePetPalettesEvent, onSellablePetPalettesEvent); - CreateMessageHook(CatalogApproveNameResultEvent, onCatalogApproveNameResultEvent); - CreateMessageHook(CatalogClubEvent, onCatalogClubEvent); + CreateMessageHook(CatalogPagesListEvent, onCatalogPagesEvent); + CreateMessageHook(CatalogPageMessageEvent, onCatalogPageEvent); + CreateMessageHook(PurchaseOKMessageEvent, onCatalogPurchaseEvent); + CreateMessageHook(PurchaseErrorMessageEvent, onCatalogPurchaseFailedEvent); + CreateMessageHook(PurchaseNotAllowedMessageEvent, onCatalogPurchaseUnavailableEvent); + CreateMessageHook(LimitedEditionSoldOutEvent, onCatalogSoldOutEvent); + CreateMessageHook(ProductOfferEvent, onCatalogSearchEvent); + CreateMessageHook(GuildMembershipsMessageEvent, onCatalogGroupsEvent); + CreateMessageHook(SellablePetPalettesMessageEvent, onSellablePetPalettesEvent); + CreateMessageHook(ApproveNameMessageEvent, onCatalogApproveNameResultEvent); + CreateMessageHook(HabboClubOffersMessageEvent, onCatalogClubEvent); CreateMessageHook(UserSubscriptionEvent, onUserSubscriptionEvent); - CreateMessageHook(CatalogUpdatedEvent, onCatalogUpdatedEvent); - CreateMessageHook(CatalogGiftConfigurationEvent, onCatalogGiftConfigurationEvent); + CreateMessageHook(CatalogPublishedMessageEvent, onCatalogUpdatedEvent); + CreateMessageHook(GiftWrappingConfigurationEvent, onCatalogGiftConfigurationEvent); return null; } diff --git a/src/views/catalog/common/CatalogUtilities.ts b/src/views/catalog/common/CatalogUtilities.ts index cd2e5d91..a45bb7a7 100644 --- a/src/views/catalog/common/CatalogUtilities.ts +++ b/src/views/catalog/common/CatalogUtilities.ts @@ -1,4 +1,4 @@ -import { CatalogPageOfferData, ICatalogPageData, ICatalogPageParser, IFurnitureData, SellablePetPaletteData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData, ICatalogPageData, ICatalogPageParser, IFurnitureData, SellablePetPaletteData } from '@nitrots/nitro-renderer'; import { GetConfiguration, GetProductDataForLocalization, GetRoomEngine } from '../../../api'; export interface ICatalogOffers @@ -12,7 +12,7 @@ export interface ICatalogSearchResult furniture: IFurnitureData[]; } -export function GetOfferName(offer: CatalogPageOfferData): string +export function GetOfferName(offer: CatalogPageMessageOfferData): string { const productData = GetProductDataForLocalization(offer.localizationId); diff --git a/src/views/catalog/common/GiftWrappingConfiguration.ts b/src/views/catalog/common/GiftWrappingConfiguration.ts index 1b6d890c..9d29b8c8 100644 --- a/src/views/catalog/common/GiftWrappingConfiguration.ts +++ b/src/views/catalog/common/GiftWrappingConfiguration.ts @@ -1,4 +1,4 @@ -import { CatalogGiftConfigurationParser } from '@nitrots/nitro-renderer'; +import { GiftWrappingConfigurationParser } from '@nitrots/nitro-renderer'; export class GiftWrappingConfiguration { @@ -9,7 +9,7 @@ export class GiftWrappingConfiguration private _ribbonTypes: number[] = null; private _defaultStuffTypes: number[] = null; - constructor(parser: CatalogGiftConfigurationParser) + constructor(parser: GiftWrappingConfigurationParser) { this._isEnabled = parser.isEnabled; this._price = parser.price; diff --git a/src/views/catalog/reducers/CatalogReducer.tsx b/src/views/catalog/reducers/CatalogReducer.tsx index 67352f0a..89888cc9 100644 --- a/src/views/catalog/reducers/CatalogReducer.tsx +++ b/src/views/catalog/reducers/CatalogReducer.tsx @@ -1,4 +1,4 @@ -import { CatalogClubOfferData, CatalogGiftConfigurationParser, CatalogGroupData, CatalogPageOfferData, ICatalogPageData, ICatalogPageParser } from '@nitrots/nitro-renderer'; +import { CatalogGroupData, CatalogPageMessageOfferData, ClubOfferData, GiftWrappingConfigurationParser, ICatalogPageData, ICatalogPageParser } from '@nitrots/nitro-renderer'; import { Reducer } from 'react'; import { CatalogPetPalette } from '../common/CatalogPetPalette'; import { ICatalogOffers, ICatalogSearchResult, SetOffersToNodes } from '../common/CatalogUtilities'; @@ -11,11 +11,11 @@ export interface ICatalogState offerRoot: ICatalogOffers; currentTab: ICatalogPageData; pageParser: ICatalogPageParser; - activeOffer: CatalogPageOfferData; + activeOffer: CatalogPageMessageOfferData; searchResult: ICatalogSearchResult; groups: CatalogGroupData[]; petPalettes: CatalogPetPalette[]; - clubOffers: CatalogClubOfferData[]; + clubOffers: ClubOfferData[]; subscriptionInfo: SubscriptionInfo; giftConfiguration: GiftWrappingConfiguration; } @@ -28,13 +28,13 @@ export interface ICatalogAction offerRoot?: ICatalogOffers; currentTab?: ICatalogPageData; pageParser?: ICatalogPageParser; - activeOffer?: CatalogPageOfferData; + activeOffer?: CatalogPageMessageOfferData; searchResult?: ICatalogSearchResult; groups?: CatalogGroupData[]; petPalette?: CatalogPetPalette; - clubOffers?: CatalogClubOfferData[]; + clubOffers?: ClubOfferData[]; subscriptionInfo?: SubscriptionInfo; - giftConfiguration?: CatalogGiftConfigurationParser; + giftConfiguration?: GiftWrappingConfigurationParser; } } diff --git a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx b/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx index a70950f1..4d8ab252 100644 --- a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx +++ b/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx @@ -1,4 +1,4 @@ -import { CatalogFrontPageItem } from '@nitrots/nitro-renderer'; +import { FrontPageItem } from '@nitrots/nitro-renderer'; import { FC, useCallback, useMemo } from 'react'; import { CreateLinkEvent, GetConfiguration } from '../../../../../../api'; import { CatalogLayoutFrontpage4ViewProps } from './CatalogLayoutFrontpage4View.types'; @@ -12,14 +12,14 @@ export const CatalogLayoutFrontpage4View: FC = return GetConfiguration('image.library.url'); }, []); - const selectItem = useCallback((item: CatalogFrontPageItem) => + const selectItem = useCallback((item: FrontPageItem) => { switch(item.type) { - case CatalogFrontPageItem.ITEM_CATALOGUE_PAGE: + case FrontPageItem.ITEM_CATALOGUE_PAGE: CreateLinkEvent(`catalog/open/${ item.catalogPageLocation }`); return; - case CatalogFrontPageItem.ITEM_PRODUCT_OFFER: + case FrontPageItem.ITEM_PRODUCT_OFFER: CreateLinkEvent(`catalog/open/${ item.productOfferId }`); return; } diff --git a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.types.ts b/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.types.ts index 1f8d240f..070edca1 100644 --- a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.types.ts +++ b/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.types.ts @@ -1,8 +1,8 @@ -import { CatalogPageOfferData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer'; export interface CatalogLayoutPetPurchaseViewProps { - offer: CatalogPageOfferData; + offer: CatalogPageMessageOfferData; pageId: number; extra?: string; } diff --git a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx b/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx index fad3f828..c2c15a26 100644 --- a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx +++ b/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx @@ -1,4 +1,4 @@ -import { CatalogPageOfferData, IFurnitureData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData, IFurnitureData } from '@nitrots/nitro-renderer'; import { FC, useEffect, useState } from 'react'; import { GetSessionDataManager, LocalizeText } from '../../../../../../api'; import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../common/CatalogUtilities'; @@ -14,7 +14,7 @@ export const CatalogLayoutSpacesView: FC = props = const { roomPreviewer = null, pageParser = null } = props; const { catalogState } = useCatalogContext(); const { activeOffer = null } = catalogState; - const [ groups, setGroups ] = useState([]); + const [ groups, setGroups ] = useState([]); const [ activeGroupIndex, setActiveGroupIndex ] = useState(-1); const groupNames = [ 'floors', 'walls', 'views' ]; @@ -23,7 +23,7 @@ export const CatalogLayoutSpacesView: FC = props = { if(!pageParser) return; - const groupedOffers: CatalogPageOfferData[][] = [ [], [], [] ]; + const groupedOffers: CatalogPageMessageOfferData[][] = [ [], [], [] ]; for(const offer of pageParser.offers) { diff --git a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx index fd2e89cf..d7e2bbc6 100644 --- a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx +++ b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx @@ -1,4 +1,4 @@ -import { CatalogClubOfferData, CatalogPurchaseComposer, CatalogRequestVipOffersComposer } from '@nitrots/nitro-renderer'; +import { CatalogPurchaseComposer, CatalogRequestVipOffersComposer, ClubOfferData } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { Button } from 'react-bootstrap'; import { LocalizeText } from '../../../../../../api'; @@ -15,9 +15,9 @@ export const CatalogLayoutVipBuyView: FC = props = { const { catalogState = null } = useCatalogContext(); const { pageParser = null, clubOffers = null, subscriptionInfo = null } = catalogState; - const [ pendingOffer, setPendingOffer ] = useState(null); + const [ pendingOffer, setPendingOffer ] = useState(null); - const getOfferText = useCallback((offer: CatalogClubOfferData) => + const getOfferText = useCallback((offer: ClubOfferData) => { let offerText = ''; diff --git a/src/views/catalog/views/page/offer/CatalogPageOfferView.types.ts b/src/views/catalog/views/page/offer/CatalogPageOfferView.types.ts index c2abfe17..c2bc146f 100644 --- a/src/views/catalog/views/page/offer/CatalogPageOfferView.types.ts +++ b/src/views/catalog/views/page/offer/CatalogPageOfferView.types.ts @@ -1,7 +1,7 @@ -import { CatalogPageOfferData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer'; export interface CatalogPageOfferViewProps { isActive: boolean; - offer: CatalogPageOfferData; + offer: CatalogPageMessageOfferData; } diff --git a/src/views/catalog/views/page/offers/CatalogPageOffersView.types.ts b/src/views/catalog/views/page/offers/CatalogPageOffersView.types.ts index 2d720e24..9f7945d0 100644 --- a/src/views/catalog/views/page/offers/CatalogPageOffersView.types.ts +++ b/src/views/catalog/views/page/offers/CatalogPageOffersView.types.ts @@ -1,6 +1,6 @@ -import { CatalogPageOfferData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer'; export interface CatalogPageOffersViewProps { - offers: CatalogPageOfferData[]; + offers: CatalogPageMessageOfferData[]; } diff --git a/src/views/catalog/views/page/product/CatalogProductView.types.ts b/src/views/catalog/views/page/product/CatalogProductView.types.ts index b11dfc8a..e059ecf5 100644 --- a/src/views/catalog/views/page/product/CatalogProductView.types.ts +++ b/src/views/catalog/views/page/product/CatalogProductView.types.ts @@ -1,9 +1,9 @@ -import { CatalogProductOfferData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageProductData } from '@nitrots/nitro-renderer'; import { MouseEventHandler } from 'react'; export interface CatalogProductViewProps { isActive: boolean; - product: CatalogProductOfferData; + product: CatalogPageMessageProductData; onMouseEvent?: MouseEventHandler; } diff --git a/src/views/catalog/views/page/purchase/CatalogPurchaseView.types.ts b/src/views/catalog/views/page/purchase/CatalogPurchaseView.types.ts index c4ccca6f..b697acd0 100644 --- a/src/views/catalog/views/page/purchase/CatalogPurchaseView.types.ts +++ b/src/views/catalog/views/page/purchase/CatalogPurchaseView.types.ts @@ -1,8 +1,8 @@ -import { CatalogPageOfferData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer'; export interface CatalogPurchaseViewProps { - offer: CatalogPageOfferData; + offer: CatalogPageMessageOfferData; pageId: number; extra?: string; disabled?: boolean; diff --git a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.types.ts b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.types.ts index 674ac376..cf6d64af 100644 --- a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.types.ts +++ b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.types.ts @@ -1,9 +1,9 @@ -import { CatalogPageOfferData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer'; export interface CatalogPurchaseButtonViewProps { className?: string; - offer: CatalogPageOfferData; + offer: CatalogPageMessageOfferData; pageId: number; extra?: string; quantity?: number; diff --git a/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.types.ts b/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.types.ts index a5ef65e7..53d4daf5 100644 --- a/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.types.ts +++ b/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.types.ts @@ -1,9 +1,9 @@ -import { CatalogPageOfferData } from '@nitrots/nitro-renderer'; +import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer'; export interface CatalogPurchaseGiftButtonViewProps { className?: string; - offer: CatalogPageOfferData; + offer: CatalogPageMessageOfferData; pageId: number; extra?: string; quantity?: number; diff --git a/src/views/purse/PurseMessageHandler.tsx b/src/views/purse/PurseMessageHandler.tsx index c993a821..5ff4558f 100644 --- a/src/views/purse/PurseMessageHandler.tsx +++ b/src/views/purse/PurseMessageHandler.tsx @@ -1,4 +1,4 @@ -import { UserCreditsEvent, UserCurrencyEvent, UserCurrencyUpdateEvent, UserSubscriptionEvent, UserSubscriptionParser } from '@nitrots/nitro-renderer'; +import { ActivityPointNotificationMessageEvent, UserCreditsEvent, UserCurrencyEvent, UserSubscriptionEvent, UserSubscriptionParser } from '@nitrots/nitro-renderer'; import { FC, useCallback } from 'react'; import { CreateMessageHook } from '../../hooks/messages/message-event'; import { usePurseContext } from './context/PurseContext'; @@ -26,7 +26,7 @@ export const PurseMessageHandler: FC = props => purse.notify(); }, [ purse ]); - const onUserCurrencyUpdateEvent = useCallback((event: UserCurrencyUpdateEvent) => + const onUserCurrencyUpdateEvent = useCallback((event: ActivityPointNotificationMessageEvent) => { const parser = event.getParser(); @@ -57,7 +57,7 @@ export const PurseMessageHandler: FC = props => CreateMessageHook(UserCreditsEvent, onUserCreditsEvent); CreateMessageHook(UserCurrencyEvent, onUserCurrencyEvent); - CreateMessageHook(UserCurrencyUpdateEvent, onUserCurrencyUpdateEvent); + CreateMessageHook(ActivityPointNotificationMessageEvent, onUserCurrencyUpdateEvent); CreateMessageHook(UserSubscriptionEvent, onUserSubscriptionEvent); return null; diff --git a/src/views/toolbar/ToolbarView.tsx b/src/views/toolbar/ToolbarView.tsx index 7445958f..3f2918e7 100644 --- a/src/views/toolbar/ToolbarView.tsx +++ b/src/views/toolbar/ToolbarView.tsx @@ -1,4 +1,4 @@ -import { Dispose, DropBounce, EaseOut, JumpBy, Motions, NitroToolbarAnimateIconEvent, Queue, UserFigureEvent, UserInfoDataParser, UserInfoEvent, Wait } from '@nitrots/nitro-renderer'; +import { Dispose, DropBounce, EaseOut, FigureUpdateEvent, JumpBy, Motions, NitroToolbarAnimateIconEvent, Queue, UserInfoDataParser, UserInfoEvent, Wait } from '@nitrots/nitro-renderer'; import { FC, useCallback, useState } from 'react'; import { GetRoomSession, GetRoomSessionManager, GoToDesktop } from '../../api'; import { AvatarEditorEvent, CatalogEvent, FriendListEvent, InventoryEvent, NavigatorEvent, RoomWidgetCameraEvent } from '../../events'; @@ -35,14 +35,14 @@ export const ToolbarView: FC = props => CreateMessageHook(UserInfoEvent, onUserInfoEvent); - const onUserFigureEvent = useCallback((event: UserFigureEvent) => + const onUserFigureEvent = useCallback((event: FigureUpdateEvent) => { const parser = event.getParser(); setUserFigure(parser.figure); }, []); - CreateMessageHook(UserFigureEvent, onUserFigureEvent); + CreateMessageHook(FigureUpdateEvent, onUserFigureEvent); const onUnseenItemTrackerUpdateEvent = useCallback((event: UnseenItemTrackerUpdateEvent) => {