diff --git a/src/api/nitro/room/widgets/events/RoomWidgetChooserContentEvent.ts b/src/api/nitro/room/widgets/events/RoomWidgetChooserContentEvent.ts index f024d6b9..75ec5f8e 100644 --- a/src/api/nitro/room/widgets/events/RoomWidgetChooserContentEvent.ts +++ b/src/api/nitro/room/widgets/events/RoomWidgetChooserContentEvent.ts @@ -7,23 +7,16 @@ export class RoomWidgetChooserContentEvent extends RoomWidgetUpdateEvent public static FURNI_CHOOSER_CONTENT: string = 'RWCCE_FURNI_CHOOSER_CONTENT'; private _items: RoomObjectItem[]; - private _isModerator: boolean; - constructor(type: string, items: RoomObjectItem[], isModerator: boolean = false) + constructor(type: string, items: RoomObjectItem[]) { super(type); this._items = items; - this._isModerator = isModerator; } public get items(): RoomObjectItem[] { return this._items; } - - public get isModerator(): boolean - { - return this._isModerator; - } } diff --git a/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts index d654a26c..f08406e8 100644 --- a/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts @@ -72,7 +72,7 @@ export class FurniChooserWidgetHandler extends RoomWidgetHandler return (a.name < b.name) ? -1 : 1; }); - this.container.eventDispatcher.dispatchEvent(new RoomWidgetChooserContentEvent(RoomWidgetChooserContentEvent.FURNI_CHOOSER_CONTENT, items, GetSessionDataManager().isModerator)); + this.container.eventDispatcher.dispatchEvent(new RoomWidgetChooserContentEvent(RoomWidgetChooserContentEvent.FURNI_CHOOSER_CONTENT, items)); } private selectRoomObject(message: RoomWidgetRoomObjectMessage): void diff --git a/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx b/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx index cd3cef6c..820b5c2f 100644 --- a/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx @@ -1,5 +1,6 @@ +import { SecurityLevel } from '@nitrots/nitro-renderer'; import { FC, useCallback, useState } from 'react'; -import { LocalizeText, RoomObjectItem, RoomWidgetChooserContentEvent, RoomWidgetRequestWidgetMessage, RoomWidgetUpdateRoomObjectEvent } from '../../../../api'; +import { GetSessionDataManager, LocalizeText, RoomObjectItem, RoomWidgetChooserContentEvent, RoomWidgetRequestWidgetMessage, RoomWidgetUpdateRoomObjectEvent } from '../../../../api'; import { BatchUpdates, UseEventDispatcherHook } from '../../../../hooks'; import { useRoomContext } from '../../RoomContext'; import { ChooserWidgetView } from './ChooserWidgetView'; @@ -8,7 +9,6 @@ export const FurniChooserWidgetView: FC<{}> = props => { const [ isVisible, setIsVisible ] = useState(false); const [ items, setItems ] = useState(null); - const [ isModerator, setIsModerator ] = useState(false); const [ refreshTimeout, setRefreshTimeout ] = useState>(null); const { eventDispatcher = null, widgetHandler = null } = useRoomContext(); @@ -29,7 +29,6 @@ export const FurniChooserWidgetView: FC<{}> = props => BatchUpdates(() => { setItems(event.items); - setIsModerator(event.isModerator); setIsVisible(true); }); }, []); @@ -63,5 +62,5 @@ export const FurniChooserWidgetView: FC<{}> = props => if(!items) return null; - return ; + return ; }