Fix stuff

- Migrate to new IRIS endpoint
- Fix query

Author: NyCodeGHG

bot/src/main/kotlin/commands/CurrentRideCommand.kt

@@ -59,11 +59,8 @@ suspend fun RegenbogenICEExtension.currentRideCommand() =
             val details = detailsDeferred.await() ?: return@async defaultText
             val id = details.stops[index].station.id
 
-            val url = marudor.hafas.detailsRedirect(details.journeyId)
-            val response = client.get(url)
             val marudorUrl = marudor.buildUrl {
-                takeFrom(response.headers[HttpHeaders.Location]!!)
-                pathSegments = encodedPathSegments // small hack to encode path
+                path("/details/", "${details.train.type} ${details.train.number}", details.departure.scheduledTime.toString())
                 parameters.append("stop", id)
             }
             "[$defaultText]($marudorUrl)"
@@ -86,7 +83,7 @@ suspend fun RegenbogenICEExtension.currentRideCommand() =
                 )
             }
             val details = scope.async {
-                marudor.hafas.details("${currentTrip.trainType} ${currentTrip.trainNumber}")
+                marudor.journeys.details("${currentTrip.trainType} ${currentTrip.trainNumber}")
             }
             val originText =
                 scope.fetchMarudorUrlAsync(stops, details, 0)

bot/src/main/kotlin/presence/RailTrackPresence.kt

@@ -16,10 +16,9 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.sync.withPermit
-import org.litote.kmongo.and
-import org.litote.kmongo.eq
-import org.litote.kmongo.`in`
-import org.litote.kmongo.newId
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.litote.kmongo.*
 import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration.Companion.seconds
 
@@ -42,12 +41,12 @@ class RailTrackPresence(private val kord: Kord, database: Database) : CoroutineS
                     kord.editPresence {
                         watching("${trip.displayName} to ${trip.destinationStation}")
                     }
-                    checkNotifications()
                 } else {
                     kord.editPresence {
                         listening("Einfahrtgeräusche")
                     }
                 }
+                checkNotifications()
                 delay(30.seconds)
             }
         }
@@ -63,13 +62,8 @@ class RailTrackPresence(private val kord: Kord, database: Database) : CoroutineS
                     semaphore.withPermit {
                         val (days, embeds) = buildNotificationMessage(user, notifications)
                             ?: return@launch
-                        val existingNotification =
-                            sentNotifications.findOne(
-                                and(
-                                    SentNotification::user eq user,
-                                    SentNotification::days `in` days,
-                                )
-                            )
+                        val query = """{"${'$'}and": [{"user": ${user.value}}, {"days": {"${'$'}in": ${Json.encodeToString(days)}}}]}""".trimIndent()
+                        val existingNotification = sentNotifications.findOne(query)
                         runCatching {
                             val channel = kord.getUser(user)?.getDmChannelOrNull() ?: return@launch
                             if (existingNotification != null) {

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ ktor-client-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json",
 ktor-client-resources = { module = "io.ktor:ktor-client-resources", version.ref = "ktor" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.0" }
-marudor = { module = "dev.schlaubi:marudor-client-jvm", version = "1.0-20220712.004353-5" }
+marudor = { module = "dev.schlaubi:marudor-client-jvm", version = "1.0-SNAPSHOT" }
 regenbogen-ice = { module = "dev.schlaubi:regenbogen-ice-client-jvm", version = "1.0-20220715.093651-3" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }