Tweek filtering bug and update alert time

steviek · Apr 8, 2024 · f697ed9 · f697ed9
1 parent a5dea3e
commit f697ed9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/alerts.json b/alerts.json
@@ -109,7 +109,7 @@
             "SATURDAY",
             "SUNDAY"
           ],
-          "start": "17:00",
+          "start": "20:00",
           "end": "05:00",
           "from": "2024-04-06",
           "to": "2024-06-30"

diff --git a/api/src/commonMain/kotlin/com/sixbynine/transit/path/api/alerts/GithubAlerts.kt b/api/src/commonMain/kotlin/com/sixbynine/transit/path/api/alerts/GithubAlerts.kt
@@ -4,6 +4,7 @@ import com.sixbynine.transit.path.api.Station
 import com.sixbynine.transit.path.time.NewYorkTimeZone
 import com.sixbynine.transit.path.time.now
 import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.LocalTime
@@ -245,8 +246,8 @@ fun Alert.hidesTrain(stationName: String, headSign: String): Boolean {
     return false
 }
 
-fun Alert.hidesTrainNow(stationName: String, headSign: String): Boolean {
-    val dateTime = now().toLocalDateTime(NewYorkTimeZone)
+fun Alert.hidesTrainAt(stationName: String, headSign: String, time: Instant): Boolean {
+    val dateTime = time.toLocalDateTime(NewYorkTimeZone)
     return isActiveAt(dateTime) && hidesTrain(stationName, headSign)
 }
 

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -103,8 +103,8 @@ android {
         applicationId = "com.sixbynine.transit.path"
         minSdk = libs.versions.android.minSdk.get().toInt()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
-        versionCode = 30
-        versionName = "2024.04.07.1"
+        versionCode = 31
+        versionName = "2024.04.07.2"
         resourceConfigurations += setOf("en", "es")
     }
     buildFeatures {

diff --git a/composeApp/src/commonMain/kotlin/com/sixbynine/transit/path/widget/WidgetDataFetcher.kt b/composeApp/src/commonMain/kotlin/com/sixbynine/transit/path/widget/WidgetDataFetcher.kt
@@ -11,7 +11,7 @@ import com.sixbynine.transit.path.api.Stations
 import com.sixbynine.transit.path.api.TrainFilter
 import com.sixbynine.transit.path.api.alerts.GithubAlerts
 import com.sixbynine.transit.path.api.alerts.GithubAlertsRepository
-import com.sixbynine.transit.path.api.alerts.hidesTrainNow
+import com.sixbynine.transit.path.api.alerts.hidesTrainAt
 import com.sixbynine.transit.path.api.isEastOf
 import com.sixbynine.transit.path.api.isInNewJersey
 import com.sixbynine.transit.path.api.isInNewYork
@@ -145,9 +145,10 @@ object WidgetDataFetcher {
                 data[station.pathApiName]
                     ?.filterNot { train ->
                         stationAlerts.any { alert ->
-                            alert.hidesTrainNow(
+                            alert.hidesTrainAt(
                                 stationName = station.pathApiName,
-                                headSign = train.headsign
+                                headSign = train.headsign,
+                                time = train.projectedArrival,
                             )
                         }
                     }

diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.3</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>