Sync renderer safety push

packages/events/src/session/RoomSessionChatEvent.ts

@@ -21,6 +21,7 @@ export class RoomSessionChatEvent extends RoomSessionEvent
     private _objectId: number;
     private _message: string;
     private _chatType: number;
+    private _chatColours: string;
     private _links: string[];
     private _extraParam: number;
     private _style: number;
@@ -28,8 +29,11 @@ export class RoomSessionChatEvent extends RoomSessionEvent
     private _prefixColor: string;
     private _prefixIcon: string;
     private _prefixEffect: string;
+    private _prefixFont: string;
+    private _nickIcon: string;
+    private _displayOrder: string;
 
-    constructor(type: string, session: IRoomSession, objectId: number, message: string, chatType: number, style: number = 0, chatColours: string[], links: string[] = null, extraParam: number = -1, prefixText: string = '', prefixColor: string = '', prefixIcon: string = '', prefixEffect: string = '')
+    constructor(type: string, session: IRoomSession, objectId: number, message: string, chatType: number, style: number = 0, chatColours: string = '', links: string[] = null, extraParam: number = -1, prefixText: string = '', prefixColor: string = '', prefixIcon: string = '', prefixEffect: string = '', prefixFont: string = '', nickIcon: string = '', displayOrder: string = 'icon-prefix-name')
     {
         super(type, session);
 
@@ -44,6 +48,9 @@ export class RoomSessionChatEvent extends RoomSessionEvent
         this._prefixColor = prefixColor;
         this._prefixIcon = prefixIcon;
         this._prefixEffect = prefixEffect;
+        this._prefixFont = prefixFont;
+        this._nickIcon = nickIcon;
+        this._displayOrder = displayOrder;
     }
 
     public get objectId(): number
@@ -76,7 +83,7 @@ export class RoomSessionChatEvent extends RoomSessionEvent
         return this._style;
     }
 
-	public get chatColours(): string[]
+	public get chatColours(): string
     {
         return this._chatColours;
     }
@@ -100,4 +107,19 @@ export class RoomSessionChatEvent extends RoomSessionEvent
     {
         return this._prefixEffect;
     }
+
+    public get prefixFont(): string
+    {
+        return this._prefixFont;
+    }
+
+    public get nickIcon(): string
+    {
+        return this._nickIcon;
+    }
+
+    public get displayOrder(): string
+    {
+        return this._displayOrder;
+    }
 }

packages/events/src/session/RoomSessionUserFigureUpdateEvent.ts

@@ -12,6 +12,13 @@ export class RoomSessionUserFigureUpdateEvent extends RoomSessionEvent {
   private _backgroundId: number | null;
   private _standId: number | null;
   private _overlayId: number | null;
+  private _nickIcon: string;
+  private _prefixText: string;
+  private _prefixColor: string;
+  private _prefixIcon: string;
+  private _prefixEffect: string;
+  private _prefixFont: string;
+  private _displayOrder: string;
 
   constructor(
     session: IRoomSession,
@@ -22,7 +29,14 @@ export class RoomSessionUserFigureUpdateEvent extends RoomSessionEvent {
     achievementScore: number,
     backgroundId: number | null,
     standId: number | null,
-    overlayId: number | null
+    overlayId: number | null,
+    nickIcon: string = '',
+    prefixText: string = '',
+    prefixColor: string = '',
+    prefixIcon: string = '',
+    prefixEffect: string = '',
+    prefixFont: string = '',
+    displayOrder: string = 'icon-prefix-name'
   ) {
     super(RoomSessionUserFigureUpdateEvent.USER_FIGURE, session);
 
@@ -34,6 +48,13 @@ export class RoomSessionUserFigureUpdateEvent extends RoomSessionEvent {
     this._backgroundId = backgroundId;
     this._standId = standId;
     this._overlayId = overlayId;
+    this._nickIcon = nickIcon;
+    this._prefixText = prefixText;
+    this._prefixColor = prefixColor;
+    this._prefixIcon = prefixIcon;
+    this._prefixEffect = prefixEffect;
+    this._prefixFont = prefixFont;
+    this._displayOrder = displayOrder;
   }
 
   public get roomIndex(): number {
@@ -67,4 +88,32 @@ export class RoomSessionUserFigureUpdateEvent extends RoomSessionEvent {
   public get overlayId(): number | null {
     return this._overlayId;
   }
-}
+
+  public get nickIcon(): string {
+    return this._nickIcon;
+  }
+
+  public get prefixText(): string {
+    return this._prefixText;
+  }
+
+  public get prefixColor(): string {
+    return this._prefixColor;
+  }
+
+  public get prefixIcon(): string {
+    return this._prefixIcon;
+  }
+
+  public get prefixEffect(): string {
+    return this._prefixEffect;
+  }
+
+  public get prefixFont(): string {
+    return this._prefixFont;
+  }
+
+  public get displayOrder(): string {
+    return this._displayOrder;
+  }
+}