diff --git a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt index 6f6d47f..1c6e337 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt @@ -76,9 +76,6 @@ object Bot { CredentialManager.dbPassword ) - // Make sure the database is up-to-date - DB.register() - // Register all the jobs jobs.addAll( listOf( diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt index 55765ee..c9f33e7 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt @@ -53,12 +53,12 @@ class AcceptEditButton() : IEditButton { var found = false transaction { for (pnr in MatchPlanningData.select { - MatchPlanningData.messageid eq (interaction.message.id.value.toLong()) and ( - MatchPlanningData.serverid eq (guild.id.value.toLong())) and ( - MatchPlanningData.channelid eq (interaction.channelId.value.toLong())) + MatchPlanningData.messageid eq (interaction.message.id.value.toString()) and ( + MatchPlanningData.serverid eq (guild.id.value.toString())) and ( + MatchPlanningData.channelid eq (interaction.channelId.value.toString())) }) { mpdd = MatchPlanningDataData( - pnr[MatchPlanningData.id], + pnr[MatchPlanningData.id].value, pnr[MatchPlanningData.serverid], pnr[MatchPlanningData.channelid], pnr[MatchPlanningData.matchtype], diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt index 4f70ab7..3925cd3 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt @@ -50,12 +50,12 @@ class CancelEditButton : IEditButton { var found = false transaction { for (pnr in MatchPlanningData.select { - MatchPlanningData.messageid eq (interaction.message.id.value.toLong()) and ( - MatchPlanningData.serverid eq (guild.id.value.toLong())) and ( - MatchPlanningData.channelid eq (interaction.channelId.value.toLong())) + MatchPlanningData.messageid eq (interaction.message.id.value.toString()) and ( + MatchPlanningData.serverid eq (guild.id.value.toString())) and ( + MatchPlanningData.channelid eq (interaction.channelId.value.toString())) }) { mpdd = MatchPlanningDataData( - pnr[MatchPlanningData.id], + pnr[MatchPlanningData.id].value, pnr[MatchPlanningData.serverid], pnr[MatchPlanningData.channelid], pnr[MatchPlanningData.matchtype], diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt index 3d0e0bd..67b193e 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt @@ -53,12 +53,12 @@ class DeclineEditButton : IEditButton { var found = false transaction { for (pnr in MatchPlanningData.select { - MatchPlanningData.messageid eq (interaction.message.id.value.toLong()) and ( - MatchPlanningData.serverid eq (guild.id.value.toLong())) and ( - MatchPlanningData.channelid eq (interaction.channelId.value.toLong())) + MatchPlanningData.messageid eq (interaction.message.id.value.toString()) and ( + MatchPlanningData.serverid eq (guild.id.value.toString())) and ( + MatchPlanningData.channelid eq (interaction.channelId.value.toString())) }) { mpdd = MatchPlanningDataData( - pnr[MatchPlanningData.id], + pnr[MatchPlanningData.id].value, pnr[MatchPlanningData.serverid], pnr[MatchPlanningData.channelid], pnr[MatchPlanningData.matchtype], diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/DB.kt b/src/main/kotlin/net/moonleay/lilJudd/data/DB.kt index f0711de..b1ff4b7 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/DB.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/DB.kt @@ -19,16 +19,9 @@ package net.moonleay.lilJudd.data -import net.moonleay.lilJudd.data.tables.MatchPlanningData -import net.moonleay.lilJudd.data.tables.PlanningNotifierRoles -import net.moonleay.lilJudd.data.tables.TimePlanningChannels -import net.moonleay.lilJudd.data.tables.TimePlanningMessages import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.SchemaUtils -import org.jetbrains.exposed.sql.transactions.transaction object DB { - private var connected = false //Connect to the provided DB; trows errors, if the DB is not avalible. fun connect(dbDomain: String, dbName: String, dbUser: String, dbPasswd: String) { Database.connect( @@ -37,18 +30,5 @@ object DB { user = dbUser, password = dbPasswd ) - connected = true - } - - fun register() { - if (!connected) - return - // Register tables here - transaction { - SchemaUtils.create(TimePlanningChannels) - SchemaUtils.create(TimePlanningMessages) - SchemaUtils.create(MatchPlanningData) - SchemaUtils.create(PlanningNotifierRoles) - } } } diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/entry/MatchPlanningDataData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/entry/MatchPlanningDataData.kt index 451278e..ca0bd32 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/entry/MatchPlanningDataData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/entry/MatchPlanningDataData.kt @@ -20,13 +20,13 @@ package net.moonleay.lilJudd.data.entry data class MatchPlanningDataData( val id: Int, - val serverid: Long, - val channelid: Long, + val serverid: String, + val channelid: String, val matchtype: String, - val registererid: Long, - val roleid: Long, + val registererid: String, + val roleid: String, val opponentname: String, - val messageid: Long, - val timestamp: Long, + val messageid: String, + val timestamp: String, val jobstr: String ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/entry/PlanningNotifierRolesData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/entry/PlanningNotifierRolesData.kt index fc15729..8cba107 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/entry/PlanningNotifierRolesData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/entry/PlanningNotifierRolesData.kt @@ -19,8 +19,8 @@ package net.moonleay.lilJudd.data.entry data class PlanningNotifierRolesData( - val serverID: Long, // The id of the server - val channelId: Long, // The id of the channel - val hastimeroleid: Long, // The id of the role that has time today - val wantstobenotifid: Long // The id of the role that wants to be notified + val serverID: String, // The id of the server + val channelId: String, // The id of the channel + val hastimeroleid: String, // The id of the role that has time today + val wantstobenotifid: String // The id of the role that wants to be notified ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningMessagesData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningMessagesData.kt index c4de368..3da4ba8 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningMessagesData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningMessagesData.kt @@ -19,8 +19,8 @@ package net.moonleay.lilJudd.data.entry data class TimePlanningMessagesData( - val serverid: Long, // The discord server id - val channelid: Long, // The discord channel id - val weekstamp: Long, // The timestamp of the monday of the week at 4am UTC + val serverid: String, // The discord server id + val channelid: String, // The discord channel id + val weekstamp: String, // The timestamp of the monday of the week at 4am UTC val messageids: String // IDs are in the following format: "{weekdayNr}:{id};{weekdayNr}:{id};[etc.]" ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/MatchPlanningData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/tables/MatchPlanningData.kt index e2e8afa..2de3ece 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/MatchPlanningData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/tables/MatchPlanningData.kt @@ -18,17 +18,16 @@ package net.moonleay.lilJudd.data.tables -import org.jetbrains.exposed.sql.Table +import org.jetbrains.exposed.dao.id.IntIdTable -object MatchPlanningData : Table(name = "new_matchplanning_data") { - var id = integer("id").autoIncrement() - var serverid = long("serverid") - var channelid = long("channelid") +object MatchPlanningData : IntIdTable() { + var serverid = varchar("serverid", 50) + var channelid = varchar("channelid", 50) var matchtype = varchar("matchtype", 50) - var registererid = long("registererid") - var roleid = long("roleid") + var registererid = varchar("registererid", 50) + var roleid = varchar("roleid", 50) var opponentName = varchar("opponentname", 100) - var messageid = long("messageid") - var timestamp = long("timestamp") + var messageid = varchar("messageid", 50) + var timestamp = varchar("timestamp", 50) var jobstr = varchar("jobstr", 50) } diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/PlanningNotifierRoles.kt b/src/main/kotlin/net/moonleay/lilJudd/data/tables/PlanningNotifierRoles.kt index e2fc9e0..d8d3b9d 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/PlanningNotifierRoles.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/tables/PlanningNotifierRoles.kt @@ -18,12 +18,11 @@ package net.moonleay.lilJudd.data.tables -import org.jetbrains.exposed.sql.Table +import org.jetbrains.exposed.dao.id.IntIdTable -object PlanningNotifierRoles : Table(name = "new_planningnotifier_roles") { - var id = integer("id").autoIncrement() - var serverid = long("serverid") - var channelid = long("channelid") - var hastimeroleid = long("hastimeroleid") - var wantstobenotifiedid = long("wantstobenotifiedid") +object PlanningNotifierRoles : IntIdTable() { + var serverid = varchar("serverid", 50) + var channelid = varchar("channelid", 50) + var hastimeroleid = varchar("hastimeroleid", 50) + var wantstobenotifiedid = varchar("wantstobenotifiedid", 50) } diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningChannels.kt b/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningChannels.kt index a521838..a746aa1 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningChannels.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningChannels.kt @@ -18,11 +18,9 @@ package net.moonleay.lilJudd.data.tables -import org.jetbrains.exposed.sql.Table +import org.jetbrains.exposed.dao.id.IntIdTable - -object TimePlanningChannels : Table(name = "new_timeplanning_channels") { - var id = integer("id").autoIncrement() - var serverid = long("serverid") - val channelid = long("channelid") +object TimePlanningChannels : IntIdTable() { + var serverid = varchar("serverid", 50) + val channelid = varchar("channelid", 50) } diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningMessages.kt b/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningMessages.kt index 8f8a01b..7498edb 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningMessages.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningMessages.kt @@ -18,12 +18,11 @@ package net.moonleay.lilJudd.data.tables -import org.jetbrains.exposed.sql.Table +import org.jetbrains.exposed.dao.id.IntIdTable -object TimePlanningMessages : Table(name = "new_timeplanning_messages") { - var id = integer("id").autoIncrement() - var serverid = long("serverid") - var channelid = long("channelid") - var weekstamp = long("weekstamp") +object TimePlanningMessages : IntIdTable() { + var serverid = varchar("serverid", 50) + var channelid = varchar("channelid", 50) + var weekstamp = varchar("weekstamp", 50) var messageids = varchar("messageids", 200) } diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt index eac08c6..48f68e9 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt @@ -60,8 +60,8 @@ class FeatureManageExtension : Extension() { } return@action } - val gID = this.guild!!.id.value.toLong() - val cID = this.arguments.channel.id.value.toLong() + val gID = this.guild!!.id.toString() + val cID = this.arguments.channel.id.toString() val channel = this.arguments.channel val args = this.arguments Logger.out("${args.feature.readableName} ${args.setStatus.readableName} ${channel.data.name.value}") diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt index 3be70f7..4eb1db0 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt @@ -36,9 +36,9 @@ import net.moonleay.lilJudd.jobs.component.JobManager import net.moonleay.lilJudd.util.EmbedUtil import net.moonleay.lilJudd.util.MessageUtil import net.moonleay.lilJudd.util.TimeUtil +import org.jetbrains.exposed.dao.id.EntityID import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.transactions.transaction -import kotlin.properties.Delegates class MatchExtension : Extension() { @@ -54,8 +54,8 @@ class MatchExtension : Extension() { this.action { val args = this.arguments val m = this.member!! - val gID = this.guild!!.id.value - val cID = this.channel.id.value + val gID = this.guild!!.id.value.toString() + val cID = this.channel.id.value.toString() val opponent = args.opponent ?: "?" val msg = this.respond { this.embeds.add( @@ -100,17 +100,17 @@ class MatchExtension : Extension() { } return@action } - var tableID by Delegates.notNull() + lateinit var tableID: EntityID transaction { tableID = MatchPlanningData.insert { - it[MatchPlanningData.serverid] = gID.toLong() - it[MatchPlanningData.channelid] = cID.toLong() - it[MatchPlanningData.messageid] = msg.id.value.toLong() + it[MatchPlanningData.serverid] = gID + it[MatchPlanningData.channelid] = cID + it[MatchPlanningData.messageid] = msg.id.value.toString() it[MatchPlanningData.matchtype] = args.matchType.readableName - it[MatchPlanningData.roleid] = role.id.value.toLong() - it[MatchPlanningData.registererid] = m.id.value.toLong() + it[MatchPlanningData.roleid] = role.id.value.toString() + it[MatchPlanningData.registererid] = m.id.value.toString() it[MatchPlanningData.opponentName] = opponent - it[MatchPlanningData.timestamp] = (zdt.toEpochSecond() * 1000) + it[MatchPlanningData.timestamp] = (zdt.toEpochSecond() * 1000).toString() it[MatchPlanningData.jobstr] = jobString } get MatchPlanningData.id } @@ -120,8 +120,8 @@ class MatchExtension : Extension() { JobManager.addJob( MatchJob( jobString, - tableID, - "${args.matchType.readableName}_Vs_${opponent}_[${tableID}]-${gID}_${cID}", + tableID.value, + "${args.matchType.readableName}_Vs_${opponent}_[${tableID.value}]-${gID}_${cID}", ) ) } diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt index 0e53f7b..c02294e 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt @@ -107,9 +107,9 @@ class SendPlannerExtension : Extension() { // Save the message ids transaction { TimePlanningMessages.insert { - it[TimePlanningMessages.serverid] = c.data.guildId.value?.value!!.toLong() - it[TimePlanningMessages.channelid] = c.id.value.toLong() - it[TimePlanningMessages.weekstamp] = (TimeUtil.getWeekStamp().toEpochSecond() * 1000) + it[TimePlanningMessages.serverid] = c.data.guildId.value.toString() + it[TimePlanningMessages.channelid] = c.id.value.toString() + it[TimePlanningMessages.weekstamp] = (TimeUtil.getWeekStamp().toEpochSecond() * 1000).toString() it[TimePlanningMessages.messageids] = msgStr } get TimePlanningMessages.id } diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt index d9fff00..2a980dc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt @@ -56,11 +56,11 @@ object AvailabilityManager : IFeature { // ChannelID, Data val messageMap = mutableMapOf() // ChannelID, Data - val roleMap = mutableMapOf() + val roleMap = mutableMapOf() transaction { for (pnr in TimePlanningMessages.select { - TimePlanningMessages.weekstamp eq (TimeUtil.getWeekStamp().toEpochSecond() * 1000) + TimePlanningMessages.weekstamp eq (TimeUtil.getWeekStamp().toEpochSecond() * 1000).toString() }) { messageMap[Snowflake(pnr[TimePlanningMessages.channelid])] = TimePlanningMessagesData( @@ -169,8 +169,8 @@ object AvailabilityManager : IFeature { override suspend fun enable( u: UserBehavior, - gID: Long, - cID: Long, + gID: String, + cID: String, ch: Channel, args: FeatureManageExtension.FeatureManagerArgs ): EmbedBuilder { @@ -187,13 +187,13 @@ object AvailabilityManager : IFeature { this.name = "available [${ch.data.name.value}]" this.mentionable = true } - val htr = hasTimeRole.id.value.toLong() + val htr = hasTimeRole.id.toString() val wantsNotifsRole = Bot.bot.kordRef.getGuildOrThrow(Snowflake(gID)).createRole { this.name = "notifications [${ch.data.name.value}]" this.mentionable = true } - val wnr = wantsNotifsRole.id.value.toLong() + val wnr = wantsNotifsRole.id.toString() // Save the role ids to db transaction { @@ -224,8 +224,8 @@ object AvailabilityManager : IFeature { override suspend fun disable( u: UserBehavior, - gID: Long, - cID: Long, + gID: String, + cID: String, ch: Channel, args: FeatureManageExtension.FeatureManagerArgs ): EmbedBuilder { diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt index 1591545..a92ad6a 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt @@ -38,7 +38,7 @@ object MatchManager { MatchPlanningData.selectAll().forEach { dataList.add( MatchPlanningDataData( - it[MatchPlanningData.id], + it[MatchPlanningData.id].value, it[MatchPlanningData.serverid], it[MatchPlanningData.channelid], it[MatchPlanningData.matchtype], @@ -79,9 +79,9 @@ object MatchManager { Logger.out("Registered job for match ${data.id}...") } - private suspend fun removeRoleFromGuild(gid: Long, rid: Long): Boolean { - val guild = Bot.bot.kordRef.getGuildOrNull(Snowflake(gid)) ?: return false - val role = guild.getRoleOrNull(Snowflake(rid)) ?: return false + private suspend fun removeRoleFromGuild(gid: String, rid: String): Boolean { + val guild = Bot.bot.kordRef.getGuildOrNull(Snowflake(gid.toLong())) ?: return false + val role = guild.getRoleOrNull(Snowflake(rid.toLong())) ?: return false role.delete() return true } diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt index 2058c11..9acbc33 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt @@ -151,9 +151,9 @@ object TimeManager : IFeature { // Save the message ids transaction { TimePlanningMessages.insert { - it[TimePlanningMessages.serverid] = c.data.guildId.value?.value!!.toLong() - it[TimePlanningMessages.channelid] = c.id.value.toLong() - it[TimePlanningMessages.weekstamp] = (TimeUtil.getWeekStamp().toEpochSecond() * 1000) + it[TimePlanningMessages.serverid] = c.data.guildId.value.toString() + it[TimePlanningMessages.channelid] = c.id.value.toString() + it[TimePlanningMessages.weekstamp] = (TimeUtil.getWeekStamp().toEpochSecond() * 1000).toString() it[TimePlanningMessages.messageids] = msgStr } get TimePlanningMessages.id } @@ -164,8 +164,8 @@ object TimeManager : IFeature { override suspend fun enable( u: UserBehavior, - gID: Long, - cID: Long, + gID: String, + cID: String, ch: Channel, args: FeatureManageExtension.FeatureManagerArgs ): EmbedBuilder { @@ -200,8 +200,8 @@ object TimeManager : IFeature { override suspend fun disable( u: UserBehavior, - gID: Long, - cID: Long, + gID: String, + cID: String, ch: Channel, args: FeatureManageExtension.FeatureManagerArgs ): EmbedBuilder { diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/component/IFeature.kt b/src/main/kotlin/net/moonleay/lilJudd/features/component/IFeature.kt index 1145797..aa27536 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/component/IFeature.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/features/component/IFeature.kt @@ -29,16 +29,16 @@ interface IFeature { suspend fun enable( u: UserBehavior, - gID: Long, - cID: Long, + gID: String, + cID: String, ch: Channel, args: FeatureManageExtension.FeatureManagerArgs ): EmbedBuilder suspend fun disable( u: UserBehavior, - gID: Long, - cID: Long, + gID: String, + cID: String, ch: Channel, args: FeatureManageExtension.FeatureManagerArgs ): EmbedBuilder diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt b/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt index 89b33e4..394758a 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt @@ -54,7 +54,7 @@ class MatchJob( MatchPlanningData.id eq (tableId) }) { mpdd = MatchPlanningDataData( - pnr[MatchPlanningData.id], + pnr[MatchPlanningData.id].value, pnr[MatchPlanningData.serverid], pnr[MatchPlanningData.channelid], pnr[MatchPlanningData.matchtype],