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 ffb7759..ff4d4cf 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt @@ -34,7 +34,7 @@ import net.moonleay.lilJudd.util.EmbedUtil import net.moonleay.lilJudd.util.Logger import net.moonleay.lilJudd.util.MessageUtil -class AcceptEditButton() : IEditButton { +class AcceptEditButton : IEditButton { override val id: String = "public.edit.btn.matchmanagement.accept" override suspend fun onInteraction( @@ -60,7 +60,7 @@ class AcceptEditButton() : IEditButton { Logger.out("role is null") return } - val member = interaction.user.asMember(guild.id) ?: return + val member = interaction.user.asMember(guild.id) // do the checks and update if (m.embeds[0].fields[0].value.contains(user.id.value.toString())) { if (member.roleIds.contains(Snowflake(mpdd.roleID))) { 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 12c8375..d205b05 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt @@ -60,7 +60,7 @@ class DeclineEditButton : IEditButton { Logger.out("role is null") return } - val member = interaction.user.asMember(guild.id) ?: return + val member = interaction.user.asMember(guild.id) if (m.embeds[0].fields[0].value.contains(user.id.value.toString())) { if (member.roleIds.contains(Snowflake(mpdd.roleID))) { Logger.out("Removing role from ${member.username}") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt index bce9a62..100c9dc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt @@ -25,7 +25,7 @@ import net.moonleay.liljudd.build.BuildConstants object Splatoon3Api { - var schedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Schedules? = null + var schedules: Schedules? = null fun updateSchedule() { val response = NetUtil.GETJsonData("https://splatoon3.ink/data/schedules.json", "lilJudd/${BuildConstants.version}") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiDataGrabber.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiDataGrabber.kt index 6a9eedf..298e943 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiDataGrabber.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiDataGrabber.kt @@ -24,7 +24,7 @@ import net.moonleay.lilJudd.data.api.splatoon3ink.schedules.XNode import net.moonleay.lilJudd.util.TimeUtil object Splatoon3ApiDataGrabber { - private fun getRegularMode(timestamp: Long): net.moonleay.lilJudd.data.api.splatoon3ink.schedules.RegularNode { + private fun getRegularMode(timestamp: Long): RegularNode { Splatoon3Api.schedules!!.data.regularSchedules.nodes.map { modeData -> val startTime = TimeUtil.deformatJSONTime(modeData.startTime, "UTC") val endTime = TimeUtil.deformatJSONTime(modeData.endTime, "UTC") @@ -35,7 +35,7 @@ object Splatoon3ApiDataGrabber { throw Exception("No current mode found") } - private fun getOpenMode(timestamp: Long): net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BankaraNode { + private fun getOpenMode(timestamp: Long): BankaraNode { Splatoon3Api.schedules!!.data.bankaraSchedules.nodes.map { modeData -> val startTime = TimeUtil.deformatJSONTime(modeData.startTime, "UTC") val endTime = TimeUtil.deformatJSONTime(modeData.endTime, "UTC") @@ -49,7 +49,7 @@ object Splatoon3ApiDataGrabber { throw Exception("No current mode found") } - private fun getXMode(timestamp: Long): net.moonleay.lilJudd.data.api.splatoon3ink.schedules.XNode { + private fun getXMode(timestamp: Long): XNode { Splatoon3Api.schedules!!.data.xSchedules.nodes.map { modeData -> val startTime = TimeUtil.deformatJSONTime(modeData.startTime, "UTC") val endTime = TimeUtil.deformatJSONTime(modeData.endTime, "UTC") @@ -60,7 +60,7 @@ object Splatoon3ApiDataGrabber { throw Exception("No current mode found") } - private fun getSeriesMode(timestamp: Long): net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BankaraNode { + private fun getSeriesMode(timestamp: Long): BankaraNode { Splatoon3Api.schedules!!.data.bankaraSchedules.nodes.map { modeData -> val startTime = TimeUtil.deformatJSONTime(modeData.startTime, "UTC") val endTime = TimeUtil.deformatJSONTime(modeData.endTime, "UTC") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraMatchSetting.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraMatchSetting.kt index a73a448..773f4e8 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraMatchSetting.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraMatchSetting.kt @@ -31,7 +31,7 @@ data class BankaraMatchSetting( @SerialName("__typename") val typename: String, @SerialName("vsRule") - val vsRule: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsRule, + val vsRule: VsRule, @SerialName("vsStages") - val vsStages: List + val vsStages: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraNode.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraNode.kt index e40379c..953c79a 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraNode.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraNode.kt @@ -25,11 +25,11 @@ import kotlinx.serialization.Serializable @Serializable data class BankaraNode( @SerialName("bankaraMatchSettings") - val bankaraMatchSettings: List?, + val bankaraMatchSettings: List?, @SerialName("endTime") val endTime: String, @SerialName("festMatchSettings") - val festMatchSettings: List?, + val festMatchSettings: List?, @SerialName("startTime") val startTime: String ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraSchedules.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraSchedules.kt index 0363b5f..a770703 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraSchedules.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraSchedules.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class BankaraSchedules( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunScheduleNode.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunScheduleNode.kt index e51551e..583e7c4 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunScheduleNode.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunScheduleNode.kt @@ -27,7 +27,7 @@ data class BigRunScheduleNode( @SerialName("endTime") val endTime: String, @SerialName("setting") - val setting: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Setting, + val setting: Setting, @SerialName("__splatoon3ink_king_salmonid_guess") val splatoon3inkKingSalmonidGuess: String, @SerialName("startTime") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunSchedules.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunSchedules.kt index de77938..f6ff9f0 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunSchedules.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunSchedules.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class BigRunSchedules( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopGroupingSchedule.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopGroupingSchedule.kt index baefdf1..412e5fd 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopGroupingSchedule.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopGroupingSchedule.kt @@ -27,9 +27,9 @@ data class CoopGroupingSchedule( @SerialName("bannerImage") val bannerImage: String?, // is null @SerialName("bigRunSchedules") - val bigRunSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BigRunSchedules, + val bigRunSchedules: BigRunSchedules, @SerialName("regularSchedules") - val regularSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.RegularSchedules, + val regularSchedules: RegularSchedules, @SerialName("teamContestSchedules") - val teamContestSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.TeamContestSchedules? + val teamContestSchedules: TeamContestSchedules? ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopStage.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopStage.kt index ddfb9da..2cb21da 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopStage.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopStage.kt @@ -27,9 +27,9 @@ data class CoopStage( @SerialName("id") val id: String, @SerialName("image") - val image: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Image, + val image: Image, @SerialName("name") val name: String, @SerialName("thumbnailImage") - val thumbnailImage: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.ThumbnailImage + val thumbnailImage: ThumbnailImage ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentFest.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentFest.kt index 63d995e..d13d8fd 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentFest.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentFest.kt @@ -35,9 +35,9 @@ data class CurrentFest( @SerialName("state") val state: String, @SerialName("teams") - val teams: List, + val teams: List, @SerialName("title") val title: String, @SerialName("tricolorStage") - val tricolorStage: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.TricolorStage + val tricolorStage: TricolorStage ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentPlayer.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentPlayer.kt index 3bab50b..5abc31b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentPlayer.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentPlayer.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class CurrentPlayer( @SerialName("userIcon") - val userIcon: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.UserIcon + val userIcon: UserIcon ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventNode.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventNode.kt index 7b7f011..96e1419 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventNode.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventNode.kt @@ -25,7 +25,7 @@ import kotlinx.serialization.Serializable @Serializable data class EventNode( @SerialName("leagueMatchSetting") - val leagueMatchSetting: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.LeagueMatchSetting, + val leagueMatchSetting: LeagueMatchSetting, @SerialName("timePeriods") - val timePeriods: List + val timePeriods: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventSchedules.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventSchedules.kt index f5f3fe3..c86ea33 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventSchedules.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventSchedules.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class EventSchedules( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingX.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingX.kt index c759a30..8b212c8 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingX.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingX.kt @@ -29,7 +29,7 @@ data class FestMatchSettingX( @SerialName("__typename") val typename: String, @SerialName("vsRule") - val vsRule: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsRule, + val vsRule: VsRule, @SerialName("vsStages") - val vsStages: List + val vsStages: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestNode.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestNode.kt index e8a438d..b9b4262 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestNode.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestNode.kt @@ -27,7 +27,7 @@ data class FestNode( @SerialName("endTime") val endTime: String, @SerialName("festMatchSettings") - val festMatchSettings: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.FestMatchSettingX?, + val festMatchSettings: FestMatchSettingX?, @SerialName("startTime") val startTime: String ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestSchedules.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestSchedules.kt index 8eed590..d606246 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestSchedules.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestSchedules.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class FestSchedules( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchSetting.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchSetting.kt index c8e4ba1..8008afc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchSetting.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchSetting.kt @@ -27,11 +27,11 @@ data class LeagueMatchSetting( @SerialName("__isVsSetting") val isVsSetting: String, @SerialName("leagueMatchEvent") - val leagueMatchEvent: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.LeagueMatchEvent, + val leagueMatchEvent: LeagueMatchEvent, @SerialName("__typename") val typename: String, @SerialName("vsRule") - val vsRule: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsRule, + val vsRule: VsRule, @SerialName("vsStages") - val vsStages: List + val vsStages: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/MapNode.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/MapNode.kt index 107545f..b1c3813 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/MapNode.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/MapNode.kt @@ -29,7 +29,7 @@ data class MapNode( @SerialName("name") val name: String, @SerialName("originalImage") - val originalImage: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.OriginalImage, + val originalImage: OriginalImage, @SerialName("stats") val stats: String?, // is null @SerialName("vsStageId") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularMatchSetting.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularMatchSetting.kt index ffb1d51..44da86c 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularMatchSetting.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularMatchSetting.kt @@ -29,7 +29,7 @@ data class RegularMatchSetting( @SerialName("__typename") val typename: String, @SerialName("vsRule") - val vsRule: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsRule, + val vsRule: VsRule, @SerialName("vsStages") - val vsStages: List + val vsStages: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularNode.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularNode.kt index 48d08fa..321e0be 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularNode.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularNode.kt @@ -27,9 +27,9 @@ data class RegularNode( @SerialName("endTime") val endTime: String, @SerialName("festMatchSettings") - val festMatchSettings: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.FestMatchSettingXX?, + val festMatchSettings: FestMatchSettingXX?, @SerialName("regularMatchSetting") - val regularMatchSetting: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.RegularMatchSetting, + val regularMatchSetting: RegularMatchSetting, @SerialName("startTime") val startTime: String ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedules.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedules.kt index 6dc058f..4b96d47 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedules.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedules.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class RegularSchedules( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedulesX.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedulesX.kt index 6995bf3..132b607 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedulesX.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedulesX.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class RegularSchedulesX( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Schedules.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Schedules.kt index 2d058c6..10c9412 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Schedules.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Schedules.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class Schedules( @SerialName("data") - val data: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.SchedulesData + val data: SchedulesData ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SchedulesData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SchedulesData.kt index 9dd136b..21e4c48 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SchedulesData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SchedulesData.kt @@ -25,21 +25,21 @@ import kotlinx.serialization.Serializable @Serializable data class SchedulesData( @SerialName("bankaraSchedules") - val bankaraSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BankaraSchedules, + val bankaraSchedules: BankaraSchedules, @SerialName("coopGroupingSchedule") - val coopGroupingSchedule: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.CoopGroupingSchedule, + val coopGroupingSchedule: CoopGroupingSchedule, @SerialName("currentFest") - val currentFest: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.CurrentFest?, + val currentFest: CurrentFest?, @SerialName("currentPlayer") - val currentPlayer: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.CurrentPlayer, + val currentPlayer: CurrentPlayer, @SerialName("eventSchedules") - val eventSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.EventSchedules, + val eventSchedules: EventSchedules, @SerialName("festSchedules") - val festSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.FestSchedules, + val festSchedules: FestSchedules, @SerialName("regularSchedules") - val regularSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.RegularSchedulesX, + val regularSchedules: RegularSchedulesX, @SerialName("vsStages") - val vsStages: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsStages, + val vsStages: VsStages, @SerialName("xSchedules") - val xSchedules: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.XSchedules + val xSchedules: XSchedules ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Setting.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Setting.kt index ef98cfa..8d1529b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Setting.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Setting.kt @@ -25,13 +25,13 @@ import kotlinx.serialization.Serializable @Serializable data class Setting( @SerialName("boss") - val boss: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Boss, + val boss: Boss, @SerialName("coopStage") - val coopStage: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.CoopStage, + val coopStage: CoopStage, @SerialName("__isCoopSetting") val isCoopSetting: String, @SerialName("__typename") val typename: String, @SerialName("weapons") - val weapons: List + val weapons: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Team.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Team.kt index f015188..2ee6032 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Team.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Team.kt @@ -25,7 +25,7 @@ import kotlinx.serialization.Serializable @Serializable data class Team( @SerialName("color") - val color: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Color, + val color: Color, @SerialName("id") val id: String, // @SerialName("myVoteState") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TricolorStage.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TricolorStage.kt index 958d1a5..21ba8c5 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TricolorStage.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TricolorStage.kt @@ -27,7 +27,7 @@ data class TricolorStage( @SerialName("id") val id: String, @SerialName("image") - val image: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Image, + val image: Image, @SerialName("name") val name: String ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStage.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStage.kt index 9d9ecb3..3225c3d 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStage.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStage.kt @@ -27,7 +27,7 @@ data class VsStage( @SerialName("id") val id: String, @SerialName("image") - val image: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Image, + val image: Image, @SerialName("name") val name: String, @SerialName("vsStageId") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStages.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStages.kt index 21d32f1..08501f9 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStages.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStages.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class VsStages( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Weapon.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Weapon.kt index 9b47a82..66f880c 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Weapon.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Weapon.kt @@ -25,7 +25,7 @@ import kotlinx.serialization.Serializable @Serializable data class Weapon( @SerialName("image") - val image: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Image, + val image: Image, @SerialName("name") val name: String, @SerialName("__splatoon3ink_id") diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XMatchSetting.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XMatchSetting.kt index 7467db1..5a1dc64 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XMatchSetting.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XMatchSetting.kt @@ -29,7 +29,7 @@ data class XMatchSetting( @SerialName("__typename") val typename: String, @SerialName("vsRule") - val vsRule: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsRule, + val vsRule: VsRule, @SerialName("vsStages") - val vsStages: List + val vsStages: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XNode.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XNode.kt index 1a55bc5..95b8435 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XNode.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XNode.kt @@ -27,9 +27,9 @@ data class XNode( @SerialName("endTime") val endTime: String, @SerialName("festMatchSettings") - val festMatchSettings: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.FestMatchSettingXX?, + val festMatchSettings: FestMatchSettingXX?, @SerialName("startTime") val startTime: String, @SerialName("xMatchSetting") - val xMatchSetting: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.XMatchSetting + val xMatchSetting: XMatchSetting ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XSchedules.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XSchedules.kt index a3939c3..ba079aa 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XSchedules.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XSchedules.kt @@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable @Serializable data class XSchedules( @SerialName("nodes") - val nodes: List + val nodes: List ) diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt index 84a1e66..6b0bbd9 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt @@ -51,7 +51,7 @@ object MatchPlanningDataRepository { fun get(id: Int): MatchPlanningDataData? = transaction { - MatchPlanningData.select { MatchPlanningData.id eq id }.firstOrNull()?.let { + MatchPlanningData.selectAll().where { MatchPlanningData.id eq id }.firstOrNull()?.let { MatchPlanningDataData( it[MatchPlanningData.id], it[MatchPlanningData.serverid], @@ -69,7 +69,7 @@ object MatchPlanningDataRepository { fun getFromMessageInChannelInServer(messageID: Long, channelID: Long, serverID: Long): MatchPlanningDataData? = transaction { - MatchPlanningData.select { + MatchPlanningData.selectAll().where { MatchPlanningData.messageid eq (messageID) and ( MatchPlanningData.serverid eq (serverID)) and ( MatchPlanningData.channelid eq (channelID)) @@ -98,15 +98,15 @@ object MatchPlanningDataRepository { fun write(data: MatchPlanningDataData): Int = transaction { MatchPlanningData.insert { - it[MatchPlanningData.serverid] = data.serverID - it[MatchPlanningData.channelid] = data.channelID - it[MatchPlanningData.matchtype] = data.matchType - it[MatchPlanningData.registererid] = data.registererID - it[MatchPlanningData.roleid] = data.roleID - it[MatchPlanningData.opponentName] = data.opponentName - it[MatchPlanningData.messageid] = data.messageID - it[MatchPlanningData.timestamp] = data.timestamp - it[MatchPlanningData.jobstr] = data.jobString + it[serverid] = data.serverID + it[channelid] = data.channelID + it[matchtype] = data.matchType + it[registererid] = data.registererID + it[roleid] = data.roleID + it[opponentName] = data.opponentName + it[messageid] = data.messageID + it[timestamp] = data.timestamp + it[jobstr] = data.jobString } get MatchPlanningData.id } } diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt index 4059e70..eea22df 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt @@ -46,9 +46,7 @@ object PlanningNotifierRolesRepository { fun getForChannel(channelID: Long): PlanningNotifierRolesData? = transaction { - PlanningNotifierRoles.select { - PlanningNotifierRoles.channelid eq channelID - }.firstOrNull()?.let { + PlanningNotifierRoles.selectAll().where { PlanningNotifierRoles.channelid eq channelID }.firstOrNull()?.let { PlanningNotifierRolesData( it[PlanningNotifierRoles.id], it[PlanningNotifierRoles.serverid], @@ -61,9 +59,9 @@ object PlanningNotifierRolesRepository { fun getForChannelInServer(channelID: Long, serverID: Long): PlanningNotifierRolesData? = transaction { - PlanningNotifierRoles.select { - PlanningNotifierRoles.channelid eq channelID and (PlanningNotifierRoles.serverid eq serverID) - }.firstOrNull()?.let { + PlanningNotifierRoles.selectAll() + .where { PlanningNotifierRoles.channelid eq channelID and (PlanningNotifierRoles.serverid eq serverID) } + .firstOrNull()?.let { PlanningNotifierRolesData( it[PlanningNotifierRoles.id], it[PlanningNotifierRoles.serverid], @@ -76,22 +74,23 @@ object PlanningNotifierRolesRepository { fun existsInChannel(channelID: Long): Boolean = transaction { - PlanningNotifierRoles.select { PlanningNotifierRoles.channelid eq channelID }.count() > 0 + PlanningNotifierRoles.selectAll().where { PlanningNotifierRoles.channelid eq channelID }.count() > 0 } fun existsInChannelFromSever(channelID: Long, serverID: Long): Boolean = transaction { - PlanningNotifierRoles.select { PlanningNotifierRoles.channelid eq channelID and (PlanningNotifierRoles.serverid eq serverID) } + PlanningNotifierRoles.selectAll() + .where { PlanningNotifierRoles.channelid eq channelID and (PlanningNotifierRoles.serverid eq serverID) } .count() > 0 } fun write(data: PlanningNotifierRolesData) { transaction { PlanningNotifierRoles.insert { - it[PlanningNotifierRoles.serverid] = data.serverID - it[PlanningNotifierRoles.channelid] = data.channelID - it[PlanningNotifierRoles.hastimeroleid] = data.hasTimeRoleID - it[PlanningNotifierRoles.wantstobenotifiedid] = data.wantsToBeNotifiedID + it[serverid] = data.serverID + it[channelid] = data.channelID + it[hastimeroleid] = data.hasTimeRoleID + it[wantstobenotifiedid] = data.wantsToBeNotifiedID } get PlanningNotifierRoles.id } } diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt index f5fd171..305a8b5 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt @@ -43,7 +43,8 @@ object TimePlanningChannelsRepository { fun exists(channelID: Long, serverID: Long): Boolean = transaction { - TimePlanningChannels.select { TimePlanningChannels.channelid eq channelID and (TimePlanningChannels.serverid eq serverID) } + TimePlanningChannels.selectAll() + .where { TimePlanningChannels.channelid eq channelID and (TimePlanningChannels.serverid eq serverID) } .firstOrNull() != null } @@ -55,15 +56,15 @@ object TimePlanningChannelsRepository { fun deleteFromChannelInServer(channelID: Long, serverID: Long) { transaction { - TimePlanningChannels.deleteWhere { TimePlanningChannels.channelid eq channelID and (TimePlanningChannels.serverid eq serverID) } + TimePlanningChannels.deleteWhere { channelid eq channelID and (serverid eq serverID) } } } fun write(data: TimePlanningChannelsData): Int = transaction { TimePlanningChannels.insert { - it[TimePlanningChannels.serverid] = data.serverID - it[TimePlanningChannels.channelid] = data.channelID + it[serverid] = data.serverID + it[channelid] = data.channelID } get TimePlanningChannels.id } } diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt index 780a939..fad3a7c 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt @@ -20,9 +20,8 @@ package net.moonleay.lilJudd.data.database.repository import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData import net.moonleay.lilJudd.data.database.tables.TimePlanningMessages -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.select +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.sql.transactions.transaction object TimePlanningMessagesRepository { @@ -40,9 +39,7 @@ object TimePlanningMessagesRepository { fun getWeek(stamp: Long): List { val dataList = mutableListOf() transaction { - for (pnr in TimePlanningMessages.select { - TimePlanningMessages.weekstamp eq (stamp) - }) { + for (pnr in TimePlanningMessages.selectAll().where { TimePlanningMessages.weekstamp eq (stamp) }) { dataList.add( TimePlanningMessagesData( pnr[TimePlanningMessages.id], @@ -59,9 +56,8 @@ object TimePlanningMessagesRepository { fun getWeekInChannel(stamp: Long, channelID: Long): TimePlanningMessagesData? = transaction { - TimePlanningMessages.select { - TimePlanningMessages.weekstamp eq (stamp) and (TimePlanningMessages.channelid eq channelID) - }.firstOrNull()?.let { + TimePlanningMessages.selectAll() + .where { TimePlanningMessages.weekstamp eq (stamp) and (TimePlanningMessages.channelid eq channelID) }.firstOrNull()?.let { TimePlanningMessagesData( it[TimePlanningMessages.id], it[TimePlanningMessages.serverid], diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt index acd59f4..f5d7c32 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt @@ -41,7 +41,7 @@ class SendPlannerExtension : Extension() { get() = false override suspend fun setup() { - publicSlashCommand() { + publicSlashCommand { name = "sendplanner" description = "Send the planner for the current week" this.action { diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt index 1d0ad06..6d29add 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt @@ -34,7 +34,7 @@ class UpdateRolesExtension : Extension() { get() = false override suspend fun setup() { - publicSlashCommand() { + publicSlashCommand { name = "updateroles" description = "Update the roles of the members in the current server" this.action {