resolve name conflicts

This commit is contained in:
dank074 2021-10-20 19:49:47 -05:00
parent 82f6fb86b2
commit 80906ebc23
4 changed files with 6 additions and 7 deletions

View File

@ -1,4 +1,3 @@
export class ChatlineData export class ChatlineData
{ {
private readonly _timestamp: string; private readonly _timestamp: string;

View File

@ -1,7 +1,7 @@
import { IDisposable } from '../../../../../core/common/disposable/IDisposable'; import { IDisposable } from '../../../../../core/common/disposable/IDisposable';
import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper';
export class RoomData implements IDisposable export class ModRoomData implements IDisposable
{ {
private _exists:boolean; private _exists:boolean;
private _name:string; private _name:string;

View File

@ -1,6 +1,6 @@
import { IDisposable } from '../../../../../core/common/disposable/IDisposable'; import { IDisposable } from '../../../../../core/common/disposable/IDisposable';
import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper';
import { RoomData } from './RoomData'; import { ModRoomData } from './ModRoomData';
export class RoomModerationData implements IDisposable export class RoomModerationData implements IDisposable
{ {
@ -9,7 +9,7 @@ export class RoomModerationData implements IDisposable
private _ownerInRoom:boolean; private _ownerInRoom:boolean;
private _ownerId:number; private _ownerId:number;
private _ownerName:string; private _ownerName:string;
private _room:RoomData; private _room:ModRoomData;
private _disposed:boolean; private _disposed:boolean;
constructor(k:IMessageDataWrapper) constructor(k:IMessageDataWrapper)
@ -19,7 +19,7 @@ export class RoomModerationData implements IDisposable
this._ownerInRoom = k.readBoolean(); this._ownerInRoom = k.readBoolean();
this._ownerId = k.readInt(); this._ownerId = k.readInt();
this._ownerName = k.readString(); this._ownerName = k.readString();
this._room = new RoomData(k); this._room = new ModRoomData(k);
} }
public get flatId():number public get flatId():number
@ -47,7 +47,7 @@ export class RoomModerationData implements IDisposable
return this._ownerName; return this._ownerName;
} }
public get room():RoomData public get room():ModRoomData
{ {
return this._room; return this._room;
} }

View File

@ -13,8 +13,8 @@ export * from './ModeratorMessageEvent';
export * from './ModeratorRoomInfoEvent'; export * from './ModeratorRoomInfoEvent';
export * from './ModeratorUserInfoData'; export * from './ModeratorUserInfoData';
export * from './ModeratorUserInfoEvent'; export * from './ModeratorUserInfoEvent';
export * from './ModRoomData';
export * from './RoomChatlogEvent'; export * from './RoomChatlogEvent';
export * from './RoomData';
export * from './RoomModerationData'; export * from './RoomModerationData';
export * from './RoomVisitData'; export * from './RoomVisitData';
export * from './RoomVisitsData'; export * from './RoomVisitsData';