From baafd13cd67af0436ec2ff7dd9605170ca6bbcbd Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 4 Dec 2019 14:36:15 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EA=B0=84=EB=A7=8C=EB=A3=8C=EB=90=9C?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=A0=84=EB=8B=AC=20=ED=95=98=EC=A7=80?=
 =?UTF-8?q?=20=EB=AA=BB=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/AppWindow.ts                        |  1 -
 .../components/messages.component.html          |  4 +++-
 .../messenger/components/messages.component.ts  | 17 +++++++++++++----
 .../src/lib/models/info.ts                      | 13 +++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
index ab45380d..7293ec1b 100644
--- a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
@@ -98,7 +98,6 @@ export class AppWindow {
         // }
       });
       this.window.on(ElectronBrowserWindowChannel.Focus, e => {
-        console.log(e);
         this.window.flashFrame(false);
       });
     }
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 d7d90dc1..2d7b9239 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
@@ -172,7 +172,7 @@
     >
       <ucap-chat-messages
         [messages]="eventList"
-        [eventInfoStatus]="eventInfoStatus$ | async"
+        [eventInfoStatus]="eventInfoStatus"
         [eventRemain]="eventRemain$ | async"
         [userInfos]="userInfoList"
         [loginRes]="loginRes"
@@ -248,12 +248,14 @@
       </button>
       <button
         mat-menu-item
+        *ngIf="isForwardableMessage(message, eventInfoStatus.validFileBaseSeq)"
         (click)="onClickMessageContextMenu('REPLAY', message)"
       >
         대화 전달
       </button>
       <button
         mat-menu-item
+        *ngIf="isForwardableMessage(message, eventInfoStatus.validFileBaseSeq)"
         (click)="onClickMessageContextMenu('REPLAY_TO_ME', message)"
       >
         대화 나에게 전달
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
index b9f92382..f8c4d5a9 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
@@ -31,6 +31,7 @@ import {
   isRecalled,
   isCopyable,
   isRecallable,
+  isForwardable,
   InfoResponse,
   EventJson,
   FileEventJson,
@@ -144,7 +145,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
   userInfoList: UserInfo[];
   userInfoListSubscription: Subscription;
   eventListProcessing$: Observable<boolean>;
-  eventInfoStatus$: Observable<InfoResponse>;
+  eventInfoStatus: InfoResponse;
+  eventInfoStatusSubscription: Subscription;
   sessionVerInfo: VersionInfo2Response;
 
   eventRemain$: Observable<boolean>;
@@ -155,6 +157,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
   isRecalledMessage = isRecalled;
   isCopyableMessage = isCopyable;
   isRecallableMessage = isRecallable;
+  isForwardableMessage = isForwardable;
 
   /** Timer 대화방의 대화 삭제를 위한 interval */
   interval: any;
@@ -253,9 +256,12 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
       )
       .subscribe();
 
-    this.eventInfoStatus$ = this.store.pipe(
-      select(AppStore.MessengerSelector.EventSelector.infoStatus)
-    );
+    this.eventInfoStatusSubscription = this.store
+      .pipe(
+        select(AppStore.MessengerSelector.EventSelector.infoStatus),
+        tap(res => (this.eventInfoStatus = res))
+      )
+      .subscribe();
 
     this.interval = setInterval(() => {
       if (!!this.roomInfo && !!this.roomInfo.isTimeRoom) {
@@ -277,6 +283,9 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
     if (!!this.eventListSubscription) {
       this.eventListSubscription.unsubscribe();
     }
+    if (!!this.eventInfoStatusSubscription) {
+      this.eventInfoStatusSubscription.unsubscribe();
+    }
 
     clearInterval(this.interval);
   }
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 25e274c2..4ee754b1 100644
--- a/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts
+++ b/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts
@@ -32,3 +32,16 @@ export function isRecallable(event: Info<any>, userSeq: number): boolean {
     event.senderSeq === userSeq && event.type !== EventType.RecalledMessage
   );
 }
+
+export function isForwardable(event: Info, expiredFileStdSeq: number): boolean {
+  if (event.type === EventType.File) {
+    if (!!expiredFileStdSeq && expiredFileStdSeq <= event.seq) {
+      // valid..
+      return true;
+    } else {
+      // expired..
+      return false;
+    }
+  }
+  return true;
+}