Fix type coercion in cache queries

kordlib · Nov 23, 2020 · 4933bf8 · 4933bf8
1 parent 70cb4d9
commit 4933bf8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 16 deletions.
diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/behavior/GuildBehavior.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/behavior/GuildBehavior.kt
@@ -7,6 +7,7 @@ import com.gitlab.kordlib.common.entity.optional.Optional
 import com.gitlab.kordlib.common.exception.RequestException
 import com.gitlab.kordlib.core.Kord
 import com.gitlab.kordlib.core.cache.data.*
+import com.gitlab.kordlib.core.cache.idEq
 import com.gitlab.kordlib.core.catchDiscordError
 import com.gitlab.kordlib.core.entity.*
 import com.gitlab.kordlib.core.entity.channel.*
@@ -100,7 +101,7 @@ interface GuildBehavior : Entity, Strategizable {
      * This property is not resolvable through REST and will always use [KordCache] instead.
      */
     val presences: Flow<Presence>
-        get() = kord.cache.query<PresenceData> { PresenceData::guildId eq id.value }
+        get() = kord.cache.query<PresenceData> { idEq(PresenceData::guildId, id) }
                 .asFlow()
                 .map { Presence(it, kord) }
 
@@ -149,7 +150,7 @@ interface GuildBehavior : Entity, Strategizable {
      */
     val voiceStates: Flow<VoiceState>
         get() = kord.cache
-                .query<VoiceStateData> { VoiceStateData::guildId eq id.value }
+                .query<VoiceStateData> { idEq( VoiceStateData::guildId, id) }
                 .asFlow()
                 .map { VoiceState(it, kord) }
 

diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/behavior/MemberBehavior.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/behavior/MemberBehavior.kt
@@ -6,6 +6,7 @@ import com.gitlab.kordlib.common.exception.RequestException
 import com.gitlab.kordlib.core.Kord
 import com.gitlab.kordlib.core.cache.data.PresenceData
 import com.gitlab.kordlib.core.cache.data.VoiceStateData
+import com.gitlab.kordlib.core.cache.idEq
 import com.gitlab.kordlib.core.entity.*
 import com.gitlab.kordlib.core.exception.EntityNotFoundException
 import com.gitlab.kordlib.core.supplier.EntitySupplier
@@ -139,8 +140,8 @@ interface MemberBehavior : Entity, UserBehavior {
      */
     suspend fun getPresenceOrNull(): Presence? {
         val data = kord.cache.query<PresenceData> {
-            PresenceData::userId eq id.value
-            PresenceData::guildId eq guildId.value
+            idEq(PresenceData::userId, id)
+            idEq(PresenceData::guildId, guildId)
         }.singleOrNull() ?: return null
 
         return Presence(data, kord)
@@ -170,8 +171,8 @@ interface MemberBehavior : Entity, UserBehavior {
      */
     suspend fun getVoiceStateOrNull(): VoiceState? {
         val data = kord.cache.query<VoiceStateData> {
-            VoiceStateData::userId eq id.value
-            VoiceStateData::guildId eq guildId.value
+            idEq(VoiceStateData::userId, id)
+            idEq(VoiceStateData::guildId, guildId)
         }.singleOrNull() ?: return null
 
         return VoiceState(data, kord)

diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/behavior/channel/VoiceChannelBehavior.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/behavior/channel/VoiceChannelBehavior.kt
@@ -7,6 +7,7 @@ import com.gitlab.kordlib.common.exception.RequestException
 import com.gitlab.kordlib.core.Kord
 import com.gitlab.kordlib.core.cache.data.ChannelData
 import com.gitlab.kordlib.core.cache.data.VoiceStateData
+import com.gitlab.kordlib.core.cache.idEq
 import com.gitlab.kordlib.core.entity.VoiceState
 import com.gitlab.kordlib.core.entity.channel.Channel
 import com.gitlab.kordlib.core.entity.channel.VoiceChannel
@@ -37,7 +38,7 @@ interface VoiceChannelBehavior : GuildChannelBehavior {
      * [terminal operators](https://kotlinlang.org/docs/reference/coroutines/flow.html#terminal-flow-operators) instead.
      */
     val voiceStates: Flow<VoiceState>
-        get() = kord.cache.query<VoiceStateData> { VoiceStateData::channelId eq id.value }
+        get() = kord.cache.query<VoiceStateData> { idEq(VoiceStateData::channelId, id) }
                 .asFlow()
                 .map { VoiceState(it, kord) }
 

diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/cache/Query.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/cache/Query.kt
@@ -7,7 +7,7 @@ import com.gitlab.kordlib.common.entity.optional.OptionalSnowflake
 import com.gitlab.kordlib.common.entity.optional.optionalSnowflake
 import kotlin.reflect.KProperty1
 
-fun <T : Any> QueryBuilder<T>.idEq(property: KProperty1<T, Snowflake>, value: Snowflake?) {
+fun <T : Any> QueryBuilder<T>.idEq(property: KProperty1<T, Snowflake?>, value: Snowflake?) {
     property.eq(value)
 }
 
@@ -19,3 +19,17 @@ fun <T : Any> QueryBuilder<T>.idEq(property: KProperty1<T, OptionalSnowflake>, v
 fun <T : Any> QueryBuilder<T>.idEq(property: KProperty1<T, Optional<String>>, value: String?) {
     property.eq(Optional(value))
 }
+
+fun <T : Any> QueryBuilder<T>.idGt(property: KProperty1<T, Snowflake>, value: Snowflake) {
+    property.gt(value)
+}
+
+@JvmName("stringEq")
+fun <T : Any> QueryBuilder<T>.idEq(property: KProperty1<T, String?>, value: String?) {
+    property.eq(value)
+}
+
+@JvmName("booleanEq")
+fun <T : Any> QueryBuilder<T>.idEq(property: KProperty1<T, Boolean?>, value: Boolean?) {
+    property.eq(value)
+}
diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/gateway/handler/GuildEventHandler.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/gateway/handler/GuildEventHandler.kt
@@ -94,7 +94,7 @@ internal class GuildEventHandler(
     }
 
     private suspend fun handle(event: GuildDelete, shard: Int) = with(event.guild) {
-        val query = cache.query<GuildData> { GuildData::id eq id }
+        val query = cache.query<GuildData> { idEq(GuildData::id, id) }
 
         val old = query.asFlow().map { Guild(it, kord) }.singleOrNull()
         query.remove()
@@ -124,7 +124,7 @@ internal class GuildEventHandler(
 
         val emojis = data.map { GuildEmoji(it, kord) }
 
-        cache.query<GuildData> { GuildData::id eq guildId.value }.update {
+        cache.query<GuildData> { idEq(GuildData::id, guildId) }.update {
             it.copy(emojis = emojis.map { emoji -> emoji.id })
         }
 
@@ -150,7 +150,7 @@ internal class GuildEventHandler(
 
     private suspend fun handle(event: GuildMemberRemove, shard: Int) = with(event.member) {
         val userData = UserData.from(user)
-        cache.query<UserData> { UserData::id eq userData.id }.remove()
+        cache.query<UserData> { idEq(UserData::id, userData.id) }.remove()
         val user = User(userData, kord)
 
         coreFlow.emit(MemberLeaveEvent(user, guildId, shard))
@@ -216,7 +216,7 @@ internal class GuildEventHandler(
     private suspend fun handle(event: PresenceUpdate, shard: Int) = with(event.presence) {
         val data = PresenceData.from(this.guildId.value!!, this)
 
-        val old = cache.query<PresenceData> { PresenceData::id eq data.id }
+        val old = cache.query<PresenceData> { idEq(PresenceData::id,  data.id) }
                 .asFlow().map { Presence(it, kord) }.singleOrNull()
 
         cache.put(data)

diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/gateway/handler/UserEventHandler.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/gateway/handler/UserEventHandler.kt
@@ -5,6 +5,7 @@ import com.gitlab.kordlib.cache.api.put
 import com.gitlab.kordlib.cache.api.query
 import com.gitlab.kordlib.core.Kord
 import com.gitlab.kordlib.core.cache.data.UserData
+import com.gitlab.kordlib.core.cache.idEq
 import com.gitlab.kordlib.core.entity.User
 import com.gitlab.kordlib.core.event.user.UserUpdateEvent
 import com.gitlab.kordlib.core.gateway.MasterGateway
@@ -31,7 +32,7 @@ internal class UserEventHandler(
     private suspend fun handle(event: UserUpdate, shard: Int) {
         val data = UserData.from(event.user)
 
-        val old = cache.query<UserData> { UserData::id eq data.id }
+        val old = cache.query<UserData> { idEq(UserData::id, data.id) }
                 .asFlow().map { User(it, kord) }.singleOrNull()
 
         cache.put(data)

diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/gateway/handler/VoiceEventHandler.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/gateway/handler/VoiceEventHandler.kt
@@ -6,6 +6,7 @@ import com.gitlab.kordlib.cache.api.query
 import com.gitlab.kordlib.common.entity.optional.optional
 import com.gitlab.kordlib.core.Kord
 import com.gitlab.kordlib.core.cache.data.*
+import com.gitlab.kordlib.core.cache.idEq
 import com.gitlab.kordlib.core.entity.VoiceState
 import com.gitlab.kordlib.core.event.guild.VoiceServerUpdateEvent
 import com.gitlab.kordlib.core.event.user.VoiceStateUpdateEvent
@@ -35,7 +36,7 @@ internal class VoiceEventHandler(
     private suspend fun handle(event: VoiceStateUpdate, shard: Int) {
         val data = VoiceStateData.from(event.voiceState.guildId.value!!, event.voiceState)
 
-        val old = cache.query<VoiceStateData> { VoiceStateData::id eq data.id }
+        val old = cache.query<VoiceStateData> { idEq(VoiceStateData::id, data.id) }
                 .asFlow().map { VoiceState(it, kord) }.singleOrNull()
 
         cache.put(data)

diff --git a/core/src/main/kotlin/com/gitlab/kordlib/core/supplier/CacheEntitySupplier.kt b/core/src/main/kotlin/com/gitlab/kordlib/core/supplier/CacheEntitySupplier.kt
@@ -9,6 +9,7 @@ import com.gitlab.kordlib.core.Kord
 import com.gitlab.kordlib.core.any
 import com.gitlab.kordlib.core.cache.data.*
 import com.gitlab.kordlib.core.cache.idEq
+import com.gitlab.kordlib.core.cache.idGt
 import com.gitlab.kordlib.core.entity.*
 import com.gitlab.kordlib.core.entity.channel.Channel
 import com.gitlab.kordlib.core.entity.channel.GuildChannel
@@ -114,7 +115,7 @@ class CacheEntitySupplier(private val kord: Kord) : EntitySupplier {
 
     override fun getChannelPins(channelId: Snowflake): Flow<Message> = cache.query<MessageData> {
         idEq(MessageData::channelId, channelId)
-        MessageData::pinned eq true
+        idEq(MessageData::pinned, true)
     }.asFlow().map { Message(it, kord) }
 
     override suspend fun getGuildOrNull(id: Snowflake): Guild? {
@@ -152,7 +153,7 @@ class CacheEntitySupplier(private val kord: Kord) : EntitySupplier {
         require(limit > 0) { "At least 1 item should be requested, but got $limit." }
         return cache.query<MessageData> {
             idEq(MessageData::channelId, channelId)
-            MessageData::id lt messageId
+            idGt(MessageData::id, messageId)
         }.asFlow().map { Message(it, kord) }.take(limit)
     }