From 6c76d688b52f3ab66455d4b9bc43bbafd2929509 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Tue, 21 Mar 2023 01:38:58 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?-=20GetRecentMessage=EC=97=90=EC=84=9C=20keepRecent=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=98=A4=EB=8F=99=EC=9E=91=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=20=20-=20=EC=99=9C=20=EC=9D=B4=EA=B1=B8=20=EB=84=A3=EC=97=88?=
 =?UTF-8?q?=EB=8A=94=EC=A7=80=20=EC=83=9D=EA=B0=81=ED=95=B4=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9C..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/API/Message/GetRecentMessage.php |   4 -
 hwe/ts/components/MessagePanel.vue         | 123 +++++++++++----------
 hwe/ts/components/MessagePlate.vue         |  10 +-
 hwe/ts/defs/API/Message.ts                 |   1 -
 hwe/ts/msg.ts                              |  13 ---
 5 files changed, 73 insertions(+), 78 deletions(-)

diff --git a/hwe/sammo/API/Message/GetRecentMessage.php b/hwe/sammo/API/Message/GetRecentMessage.php
index 09218325..43bcf716 100644
--- a/hwe/sammo/API/Message/GetRecentMessage.php
+++ b/hwe/sammo/API/Message/GetRecentMessage.php
@@ -83,7 +83,6 @@ class GetRecentMessage extends \sammo\BaseAPI
 
     $result = [];
     $result['result'] = true;
-    $result['keepRecent'] = false;
     $nextSequence = $reqSequence;
     $minSequence = $reqSequence;
     $lastType = null;
@@ -139,9 +138,6 @@ class GetRecentMessage extends \sammo\BaseAPI
 
     if ($lastType !== null) {
       array_pop($result[$lastType]);
-      $result['keepRecent'] = true;
-    } else if ($reqSequence <= 0) {
-      $result['keepRecent'] = true;
     }
 
     $result['sequence'] = $nextSequence;
diff --git a/hwe/ts/components/MessagePanel.vue b/hwe/ts/components/MessagePanel.vue
index 21e21f1b..da1dd289 100644
--- a/hwe/ts/components/MessagePanel.vue
+++ b/hwe/ts/components/MessagePanel.vue
@@ -47,16 +47,19 @@
         <div>메시지가 없습니다.</div>
       </template>
       <div v-else class="MessageList">
-        <MessagePlate
-          v-for="msg of messagePublic"
-          :key="msg.id"
-          :modelValue="msg"
-          :generalID="generalID"
-          :generalName="generalName"
-          :nationID="nationID"
-          :permissionLevel="permissionLevel"
-          @setTarget="setTarget"
-        ></MessagePlate>
+        <template v-for="msg of messagePublic" :key="msg.id">
+          <MessagePlate
+            v-if="!msg.option.hide"
+            :modelValue="msg"
+            :generalID="generalID"
+            :generalName="generalName"
+            :nationID="nationID"
+            :permissionLevel="permissionLevel"
+            :deleted="deletedMessage.has(msg.id)"
+            @setTarget="setTarget"
+            @request-refresh="tryRefresh"
+          ></MessagePlate>
+        </template>
         <div class="d-grid Actions">
           <button type="button" class="btn btn-dark only-mobile" @click="foldMessage($event, 'public')">접기</button>
           <button type="button" class="btn btn-secondary" @click="loadOldMessage($event, 'public')">
@@ -79,16 +82,19 @@
         <div>메시지가 없습니다.</div>
       </template>
       <div v-else class="MessageList">
-        <MessagePlate
-          v-for="msg of messageNational"
-          :key="msg.id"
-          :modelValue="msg"
-          :generalID="generalID"
-          :generalName="generalName"
-          :nationID="nationID"
-          :permissionLevel="permissionLevel"
-          @setTarget="setTarget"
-        ></MessagePlate>
+        <template v-for="msg of messageNational" :key="msg.id">
+          <MessagePlate
+            v-if="!msg.option.hide"
+            :modelValue="msg"
+            :generalID="generalID"
+            :generalName="generalName"
+            :nationID="nationID"
+            :permissionLevel="permissionLevel"
+            :deleted="deletedMessage.has(msg.id)"
+            @setTarget="setTarget"
+            @request-refresh="tryRefresh"
+          ></MessagePlate>
+        </template>
         <div class="d-grid Actions">
           <button type="button" class="btn btn-dark only-mobile" @click="foldMessage($event, 'national')">접기</button>
           <button type="button" class="btn btn-secondary" @click="loadOldMessage($event, 'national')">
@@ -116,21 +122,19 @@
         <div>메시지가 없습니다.</div>
       </template>
       <div v-else class="MessageList">
-        <MessagePlate
-          v-for="msg of messagePrivate"
-          :key="msg.id"
-          :modelValue="msg"
-          :generalID="generalID"
-          :generalName="generalName"
-          :nationID="nationID"
-          :permissionLevel="permissionLevel"
-          @response="
-            () => {
-              readLatestMsg('private');
-            }
-          "
-          @setTarget="setTarget"
-        ></MessagePlate>
+        <template v-for="msg of messagePrivate" :key="msg.id">
+          <MessagePlate
+            v-if="!msg.option.hide"
+            :modelValue="msg"
+            :generalID="generalID"
+            :generalName="generalName"
+            :nationID="nationID"
+            :permissionLevel="permissionLevel"
+            :deleted="deletedMessage.has(msg.id)"
+            @setTarget="setTarget"
+            @request-refresh="tryRefresh"
+          ></MessagePlate>
+        </template>
         <div class="d-grid Actions">
           <button type="button" class="btn btn-dark only-mobile" @click="foldMessage($event, 'private')">접기</button>
           <button type="button" class="btn btn-secondary" @click="loadOldMessage($event, 'private')">
@@ -158,21 +162,19 @@
         <div>메시지가 없습니다.</div>
       </template>
       <div v-else class="MessageList">
-        <MessagePlate
-          v-for="msg of messageDiplomacy"
-          :key="msg.id"
-          :modelValue="msg"
-          :generalID="generalID"
-          :generalName="generalName"
-          :nationID="nationID"
-          :permissionLevel="permissionLevel"
-          @response="
-            () => {
-              readLatestMsg('diplomacy');
-            }
-          "
-          @setTarget="setTarget"
-        ></MessagePlate>
+        <template v-for="msg of messageDiplomacy" :key="msg.id">
+          <MessagePlate
+            v-if="!msg.option.hide"
+            :modelValue="msg"
+            :generalID="generalID"
+            :generalName="generalName"
+            :nationID="nationID"
+            :permissionLevel="permissionLevel"
+            :deleted="deletedMessage.has(msg.id)"
+            @setTarget="setTarget"
+            @request-refresh="tryRefresh"
+          ></MessagePlate>
+        </template>
         <div class="d-grid Actions">
           <button type="button" class="btn btn-dark only-mobile" @click="foldMessage($event, 'diplomacy')">접기</button>
           <button type="button" class="btn btn-secondary" @click="loadOldMessage($event, 'diplomacy')">
@@ -244,6 +246,8 @@ const messageNational = ref<MsgItem[]>([]);
 const messagePrivate = ref<MsgItem[]>([]);
 const messageDiplomacy = ref<MsgItem[]>([]);
 
+const deletedMessage = ref(new Set<number>());
+
 const messageIndexedList: Record<MsgType, Ref<MsgItem[]>> = {
   public: messagePublic,
   national: messageNational,
@@ -375,16 +379,21 @@ function processMsg(msg: MsgItem) {
       targetMsg.option.invalid = true;
     })();
   }
+  if (msg.option.overwrite) {
+    (() => {
+      for(const targetID of msg.option.overwrite) {
+        const targetMsg = messageStorage.get(targetID);
+        if (!targetMsg) {
+          continue;
+        }
+        deletedMessage.value.add(targetID);
+        targetMsg.option.invalid = true;
+      }
+    })();
+  }
 }
 
 function updateMsgResponse(response: MsgResponse) {
-  if (!response.keepRecent) {
-    messageStorage.clear();
-    for (const msgList of Object.values(messageIndexedList)) {
-      msgList.value.length = 0;
-    }
-  }
-
   if (response.generalName != generalName.value) {
     emit("request-refresh");
     return;
diff --git a/hwe/ts/components/MessagePlate.vue b/hwe/ts/components/MessagePlate.vue
index 181902d4..a9d53e67 100644
--- a/hwe/ts/components/MessagePlate.vue
+++ b/hwe/ts/components/MessagePlate.vue
@@ -128,7 +128,7 @@
 import type { MsgItem, MsgTarget, MsgType } from "@/defs/API/Message";
 import { parseTime } from "@/util/parseTime";
 import { differenceInMilliseconds, addMinutes } from "date-fns/esm";
-import { computed, ref, toRef, watch, type ComputedRef, type Ref } from "vue";
+import { computed, onMounted, ref, toRef, watch, type ComputedRef, type Ref } from "vue";
 import linkifyStr from "linkify-string";
 import { SammoAPI } from "@/SammoAPI";
 import { isError, isString } from "lodash-es";
@@ -203,11 +203,10 @@ function testDeletable(msg: MsgItem): boolean {
   if (msg.option.action) return false;
   if (msg.src.id != props.generalID) return false;
   if (msg.option.invalid) return false;
-  if (!msg.option.deletable) return false;
+  if (!(msg.option.deletable ?? true)) return false;
 
   const now = new Date();
   const last5min = addMinutes(parseTime(msg.time), 5);
-
   const timeDiff = differenceInMilliseconds(last5min, now);
 
   if (timeDiff <= 0) return false;
@@ -219,6 +218,11 @@ function testDeletable(msg: MsgItem): boolean {
   return true;
 }
 
+onMounted(() => {
+  isValidMsg.value = testValidMsg(msg.value);
+  deletable.value = testDeletable(msg.value);
+});
+
 const nationType: ComputedRef<"local" | "src" | "dest"> = computed(() => {
   if (msg.value.src.nation_id === msg.value.dest?.nation_id) {
     return "local";
diff --git a/hwe/ts/defs/API/Message.ts b/hwe/ts/defs/API/Message.ts
index ad4d928b..fc996e62 100644
--- a/hwe/ts/defs/API/Message.ts
+++ b/hwe/ts/defs/API/Message.ts
@@ -55,7 +55,6 @@ export type MsgResponse = {
   [v in MsgType]: MsgItem[];
 } & {
   result: true;
-  keepRecent: boolean;
   nationID: number;
   generalName: string;
   sequence: number;
diff --git a/hwe/ts/msg.ts b/hwe/ts/msg.ts
index 2cad67a7..de7229fe 100644
--- a/hwe/ts/msg.ts
+++ b/hwe/ts/msg.ts
@@ -227,18 +227,6 @@ function redrawMsg(msgResponse: MsgResponse, addFront: boolean): MsgResponse {
         })
         return obj;
     }
-    function checkClear(obj: MsgResponse): MsgResponse {
-        if (!obj.keepRecent) {
-            $('.msg_plate').detach();
-            lastSequence = undefined;
-            console.log('refresh!');
-            void fetchRecentMsg().then(async (data) => {
-                redrawMsg(data, true);
-            })
-            throw true;
-        }
-        return obj;
-    }
     function registerSequence(obj: MsgResponse): MsgResponse {
         lastSequence = Math.max(lastSequence ?? 0, obj.sequence);
         for (const msgType of ['public', 'private', 'national', 'diplomacy'] as MsgType[]) {
@@ -438,7 +426,6 @@ function redrawMsg(msgResponse: MsgResponse, addFront: boolean): MsgResponse {
 
 
     msgResponse = checkErasable(msgResponse);
-    msgResponse = checkClear(msgResponse);
     msgResponse = registerSequence(msgResponse);
     printTemplate(msgResponse);
     return msgResponse;