From 23a06fc88fa5c19fdca9ef061194340e946794f9 Mon Sep 17 00:00:00 2001
From: Last2014 <info@last2014.com>
Date: Fri, 1 May 2026 22:06:04 +0900
Subject: [PATCH] =?UTF-8?q?Chg:=20=E6=99=82=E5=A0=B1=E3=81=AE=E6=99=82?=
 =?UTF-8?q?=E5=88=BB=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=82=92HH:mm=E3=81=8B=E3=82=89H:mm=E3=81=AB=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=20/=20Feat:=20=E7=B7=8A=E6=80=A5=E5=9C=B0=E9=9C=87=E9=80=9F?=
 =?UTF-8?q?=E5=A0=B1=EF=BC=88=E8=AD=A6=E5=A0=B1=EF=BC=89=E8=A7=A3=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja.yaml                 |  4 ++++
 src/feature/earthquakeNotice.ts | 18 ++++++++++++++++++
 src/feature/timeNotice.ts       |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/locales/ja.yaml b/locales/ja.yaml
index e455ad2..813145d 100644
--- a/locales/ja.yaml
+++ b/locales/ja.yaml
@@ -50,6 +50,10 @@ eewNotice: |
   📍震源地: {{ epicenter }}
   💪マグニチュード: {{ magnitude }}
   🪨深さ: {{ depth }}{{ areas }}
+eewCancelNotice: |
+  ### ==緊急地震速報（警報）**解除**==
+  {{ isTest }}
+  ⏰発表時刻: {{ announceTime }}
 hnyNotice: |
   あけましておめでとうございます。今年は、{{ year }}年です。
 commandNotFound: |
diff --git a/src/feature/earthquakeNotice.ts b/src/feature/earthquakeNotice.ts
index 43da366..3e43130 100644
--- a/src/feature/earthquakeNotice.ts
+++ b/src/feature/earthquakeNotice.ts
@@ -237,6 +237,24 @@ const processMessage = async (message: any) => {
         {
           console.log("緊急地震速報（警報）を受信しました");
 
+          if (message.cancelled) {
+            const response = await client.request("ueuse/create", {
+              text: i18next.t("eewCancelNotice", {
+                isTest: message.test
+                  ? "⚒️これは**テストです。**"
+                  : "🚨これは**テストではありません。**",
+                announceTime: format(new Date(message.issue.time), "yyyy年M月d日 H:mm:ss"),
+              }),
+            });
+
+            if (!response.success) {
+              console.warn("ユーズの作成に失敗しました:", response.error_code);
+              break;
+            }
+
+            console.log("緊急地震速報（警報）解除情報を投稿:", response.uniqid);
+          }
+
           const kindMessages: Record<string, string> = {
             "10": "⏳主要動は、**未到達と予測**されています。",
             "11": "🫨主要動が、**既に到達していると予測**されています。",
diff --git a/src/feature/timeNotice.ts b/src/feature/timeNotice.ts
index 1f8e7e4..f3141cf 100644
--- a/src/feature/timeNotice.ts
+++ b/src/feature/timeNotice.ts
@@ -8,7 +8,7 @@ console.log("時報の投稿を行います");
 
 try {
   const response = await client.request("ueuse/create", {
-    text: i18next.t("timeNotice", { time: format(new Date(), "HH:mm") }),
+    text: i18next.t("timeNotice", { time: format(new Date(), "H:mm") }),
   });
 
   if (!response.success) {