From 7184d49367710489b8930ad87c57c328adb0aac5 Mon Sep 17 00:00:00 2001
From: na2na <49822810+na2na-p@users.noreply.github.com>
Date: Thu, 5 May 2022 18:55:54 +0900
Subject: [PATCH] =?UTF-8?q?eew=E3=81=AE=E6=9C=80=E7=B5=82=E5=A0=B1?=
 =?UTF-8?q?=E3=82=92=E6=8B=BE=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=82=E3=81=9F=E3=81=A0=E3=81=97=E3=81=BE=E3=81=A0?=
 =?UTF-8?q?=E8=A9=A6=E9=A8=93=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/earthquake/index.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/earthquake/index.ts b/src/modules/earthquake/index.ts
index 4711c92..f304b5e 100644
--- a/src/modules/earthquake/index.ts
+++ b/src/modules/earthquake/index.ts
@@ -112,7 +112,7 @@ export default class extends Module {
 							}\n\`\`\``;
 					}
         }
-        if (rawDataJSON.type == "eew" && false) { // これ使わなさそうだしとりあえず入らないようにした
+        if (rawDataJSON.type == "eew") { // これ使わなさそうだしとりあえず入らないようにした
           const data: 緊急地震速報 = {
             type: rawDataJSON.type,
             time: new Date(parseInt(rawDataJSON.time)),
@@ -126,9 +126,10 @@ export default class extends Module {
             index: rawDataJSON.index,
           };
 
-          if (data.report == "1") {
-            this.message =
-              `**TEST TEST TEST TEST**\n地震かも？\n\n緊急地震速報\n${data.time.toLocaleString()}\n\n第${data.report}報\n震源地: ${data.epicenter}\n震源の深さ: ${data.depth}\n地震の規模(M): ${data.magnitude}\n緯度: ${data.latitude}\n経度: ${data.longitude}\n予想される最大震度(？): ${data.intensity}\n`;
+          if (data.report == "final") { //  && data.index >= this.thresholdVal - 1
+						const timeString = `${data.time.getFullYear()}-${(data.time.getMonth() +
+							1).toString().padStart(2, '0')}-${data.time.getDate().toString().padStart(2, '0')} ${data.time.getHours().toString().padStart(2, '0')}:${data.time.getMinutes().toString().padStart(2, '0')}:${data.time.getSeconds().toString().padStart(2, '0')}`;
+            this.message = `\`\`\`\n緊急地震速報(最終報)\n${timeString}\n震源地: ${data.epicenter}\n震源の深さ: ${data.depth}km\n最大震度: ${this.earthquakeIntensityIndex[data.index + 1]}\nマグニチュード: ${data.magnitude}\n\`\`\``;
           }
         }