From b02a2dd77a4fe729aa88dbd9da8dc08ec23d758b Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Tue, 14 Jan 2025 07:01:17 +0000
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=82=B0=E3=83=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=97=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=80=81=E3=82=A2=E3=82=A4?=
 =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=814?=
 =?UTF-8?q?=E3=83=AF=E3=83=B3=E3=83=9E=E3=83=B3=E3=81=A85=E3=83=AF?=
 =?UTF-8?q?=E3=83=B3=E3=83=9E=E3=83=B3=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/webViewInjectjavascript.ts |  1 +
 stateBox/useBusAndTrainData.js | 16 ++++++++--------
 stateBox/useNotifications.tsx  |  4 ++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts
index f8149fe..ffdeebd 100644
--- a/lib/webViewInjectjavascript.ts
+++ b/lib/webViewInjectjavascript.ts
@@ -761,6 +761,7 @@ export const injectJavascriptData: InjectJavascriptData = (
     case "104M":
     case "5210M":
     case "5108M":
+    case "4108M":
     case "110M":
     case "112M":
     case "118M":
diff --git a/stateBox/useBusAndTrainData.js b/stateBox/useBusAndTrainData.js
index f7d4562..f7f0aa4 100644
--- a/stateBox/useBusAndTrainData.js
+++ b/stateBox/useBusAndTrainData.js
@@ -279,14 +279,14 @@ export const BusAndTrainDataProvider = ({ children }) => {
       case "5479D":
         returnArray.push("570D");
         break;
-      case new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum):
-        if (trainList["5" + trainNum.substring(1)])
-          returnArray.push("5" + trainNum.substring(1));
-        break;
-      case new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum):
-        if (trainList["4" + trainNum.substring(1)])
-          returnArray.push("4" + trainNum.substring(1));
-        break;
+    }
+    if(new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum)){
+      if (trainList["5" + trainNum.substring(1)])
+        returnArray.push("5" + trainNum.substring(1));
+    }
+    if(new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum)){
+      if (trainList["4" + trainNum.substring(1)])
+        returnArray.push("4" + trainNum.substring(1));
     }
     if (
       // 列番が4xxDまたは5xxDの場合はxxDの列番を検索
diff --git a/stateBox/useNotifications.tsx b/stateBox/useNotifications.tsx
index bb3ec4c..aae29f2 100644
--- a/stateBox/useNotifications.tsx
+++ b/stateBox/useNotifications.tsx
@@ -36,24 +36,28 @@ async function registerForPushNotificationsAsync() {
   if (Platform.OS === "android") {
     Notifications.setNotificationChannelAsync("default", {
       name: "default",
+      groupId: "default",
       importance: Notifications.AndroidImportance.MAX,
       vibrationPattern: [0, 250, 250, 250],
       lightColor: "#FF231F7C",
     });
     Notifications.setNotificationChannelAsync("運行情報", {
       name: "運行情報",
+      groupId: "運行情報",
       importance: Notifications.AndroidImportance.MAX,
       vibrationPattern: [0, 250, 250, 250],
       lightColor: "#FF231F7C",
     });
     Notifications.setNotificationChannelAsync("遅延速報EX", {
       name: "遅延速報EX",
+      groupId: "遅延速報EX",
       importance: Notifications.AndroidImportance.MAX,
       vibrationPattern: [0, 250, 250, 250],
       lightColor: "#FF231F7C",
     });
     Notifications.setNotificationChannelAsync("怪レい列車BOT", {
       name: "怪レい列車BOT",
+      groupId: "怪レい列車BOT",
       importance: Notifications.AndroidImportance.MAX,
       vibrationPattern: [0, 250, 250, 250],
       lightColor: "#FF231F7C",