From 8fdce621e9ecb9086f1a6757708adf2ccbdd96b9 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Thu, 6 Feb 2020 18:07:09 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20209?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messenger/components/messages.component.html     |  4 ++--
 .../src/lib/models/info.ts                           | 12 +++++-------
 .../src/lib/components/message-box.component.html    |  2 +-
 .../src/lib/components/message-box.component.ts      |  3 ++-
 .../src/lib/components/message-box/file.component.ts |  7 ++++---
 .../src/lib/components/messages.component.html       |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
index 474b3ae8..04d87cf1 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
@@ -355,14 +355,14 @@
       </button>
       <button
         mat-menu-item
-        *ngIf="isForwardableMessage(message, eventInfoStatusSubject.value)"
+        *ngIf="isForwardableMessage(message, roomInfoSubject.value)"
         (click)="onClickMessageContextMenu('FORWARD', message)"
       >
         {{ 'chat.forwardEventTo' | translate }}
       </button>
       <button
         mat-menu-item
-        *ngIf="isForwardableMessage(message, eventInfoStatusSubject.value)"
+        *ngIf="isForwardableMessage(message, roomInfoSubject.value)"
         (click)="onClickMessageContextMenu('FORWARD_TO_ME', message)"
       >
         {{ 'chat.forwardEventToMe' | translate }}
diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts b/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts
index c4e9ce20..2e78620b 100644
--- a/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts
+++ b/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts
@@ -1,5 +1,6 @@
 import { EventType } from '../types/event.type';
 import { InfoResponse } from '../protocols/info';
+import { RoomInfo } from '@ucap-webmessenger/protocol-room';
 
 export interface Info<T = {}> {
   // 이벤트SEQ
@@ -38,10 +39,7 @@ export function isRecallable(event: Info<any>, userSeq: number): boolean {
   );
 }
 
-export function isForwardable(
-  event: Info,
-  eventInfoStatus: InfoResponse
-): boolean {
+export function isForwardable(event: Info, roomInfo: RoomInfo): boolean {
   if (
     event.type === EventType.Plan ||
     event.type === EventType.AllimTms ||
@@ -50,9 +48,9 @@ export function isForwardable(
     return false;
   } else if (event.type === EventType.File) {
     if (
-      !!eventInfoStatus &&
-      !!eventInfoStatus.validFileBaseSeq &&
-      eventInfoStatus.validFileBaseSeq <= event.seq
+      !!roomInfo &&
+      !!roomInfo.expiredFileStdSeq &&
+      roomInfo.expiredFileStdSeq <= event.seq
     ) {
       // valid..
       return true;
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html
index a6ab93e7..e3865936 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html
@@ -117,7 +117,7 @@
               </ucap-chat-message-box-mass>
               <ucap-chat-message-box-file
                 *ngSwitchCase="EventType.File"
-                [eventInfoStatus]="eventInfoStatus"
+                [roomInfo]="roomInfo"
                 [message]="message"
                 (save)="onSave($event)"
                 (fileViewer)="onFileViewer($event)"
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts
index 1030f7d7..30ccd8b6 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts
@@ -23,6 +23,7 @@ import {
 import { NGXLogger } from 'ngx-logger';
 import moment from 'moment';
 import { FileDownloadItem } from '@ucap-webmessenger/api';
+import { RoomInfo } from '@ucap-webmessenger/protocol-room';
 
 @Component({
   selector: 'ucap-chat-message-box',
@@ -56,7 +57,7 @@ export class MessageBoxComponent implements OnInit, AfterViewInit {
   profileImage: string;
 
   @Input()
-  eventInfoStatus?: InfoResponse;
+  roomInfo: RoomInfo;
 
   @Input()
   translationSimpleview = false;
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts
index 46cd529b..533602c6 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts
@@ -7,6 +7,7 @@ import {
 import { StatusCode, FileDownloadItem } from '@ucap-webmessenger/api';
 import { FileType } from '@ucap-webmessenger/protocol-file';
 import { NGXLogger } from 'ngx-logger';
+import { RoomInfo } from '@ucap-webmessenger/protocol-room';
 
 @Component({
   selector: 'ucap-chat-message-box-file',
@@ -17,7 +18,7 @@ export class FileComponent implements OnInit {
   @Input()
   message: Info<FileEventJson>;
   @Input()
-  eventInfoStatus: InfoResponse;
+  roomInfo: RoomInfo;
 
   @Output()
   save = new EventEmitter<{
@@ -48,8 +49,8 @@ export class FileComponent implements OnInit {
 
   getExpiredFile() {
     if (
-      !!this.eventInfoStatus &&
-      this.eventInfoStatus.validFileBaseSeq <= this.message.seq
+      !!this.roomInfo &&
+      this.roomInfo.expiredFileStdSeq <= this.message.seq
     ) {
       return false;
     } else {
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
index 716ee27e..137fe12e 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
@@ -66,7 +66,7 @@
         [senderName]="getUserName(message.senderSeq)"
         [profileImageRoot]="profileImageRoot"
         [profileImage]="getUserProfile(message.senderSeq)"
-        [eventInfoStatus]="eventInfoStatus"
+        [roomInfo]="roomInfo"
         [translationSimpleview]="translationSimpleview"
         [unreadCount]="isShowUnreadCount ? getUnreadCount(message) : undefined"
         (openProfile)="onClickOpenProfile($event)"