From 38024b6be4c2fb5118d1163c1333b25f23088042 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 1 Dec 2018 18:36:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EA=B5=90=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=EB=8A=94=20=EC=82=AD=EC=A0=9C=20=ED=95=A0=20=EC=88=98?=
 =?UTF-8?q?=20=EC=97=86=EB=8F=84=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/js/msg.js                 | 2 +-
 hwe/js/templates/message.html | 2 +-
 hwe/sammo/Message.php         | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index f992427e..2001786d 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -518,7 +518,7 @@ function activateMessageForm(){
 jQuery(function($){
 
     //tmp_template.html은 추후 msg.js에 통합될 수 있음
-    var getTemplate = $.get('js/templates/message.html?7',function(obj){
+    var getTemplate = $.get('js/templates/message.html?8',function(obj){
         messageTemplate = obj;
     });
 
diff --git a/hwe/js/templates/message.html b/hwe/js/templates/message.html
index eec06e3e..51b3115e 100644
--- a/hwe/js/templates/message.html
+++ b/hwe/js/templates/message.html
@@ -12,7 +12,7 @@
     </div>
     <div class="msg_body">
         <div class="msg_header">
-            <%if(msgType != 'diplomacy' && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
+            <%if(msgType != 'diplomacy' && msgType != 'diplomacy' && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
                 <button type="button" data-erase_until="<%last5min%>" class="btn btn btn-outline-warning btn-sm btn-delete-msg" style='float:right'>❌</button>
             <%}%>
             <%if(msgType == 'private') {%>
diff --git a/hwe/sammo/Message.php b/hwe/sammo/Message.php
index d88a4445..9774af59 100644
--- a/hwe/sammo/Message.php
+++ b/hwe/sammo/Message.php
@@ -275,6 +275,10 @@ class Message
             return '본인의 메시지만 삭제할 수 있습니다.';
         }
 
+        if($msgObj->msgType == Message::MSGTYPE_DIPLOMACY){
+            return '외교 메시지는 삭제할 수 없습니다.';
+        }
+
         $prev5min = new \DateTime();
         $prev5min->sub(new \DateInterval('PT5M'));