feature/ScheduleCommand #5

Merged
moonleay merged 7 commits from feature/ScheduleCommand into master 2024-01-19 21:47:20 +00:00
41 changed files with 97 additions and 101 deletions
Showing only changes of commit b65dadd42f - Show all commits

View file

@ -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))) {

View file

@ -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}")

View file

@ -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}")

View file

@ -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")

View file

@ -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<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsStage>
val vsStages: List<VsStage>
)

View file

@ -25,11 +25,11 @@ import kotlinx.serialization.Serializable
@Serializable
data class BankaraNode(
@SerialName("bankaraMatchSettings")
val bankaraMatchSettings: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BankaraMatchSetting>?,
val bankaraMatchSettings: List<BankaraMatchSetting>?,
@SerialName("endTime")
val endTime: String,
@SerialName("festMatchSettings")
val festMatchSettings: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.FestMatchSettingX>?,
val festMatchSettings: List<FestMatchSettingX>?,
@SerialName("startTime")
val startTime: String
)

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class BankaraSchedules(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BankaraNode>
val nodes: List<BankaraNode>
)

View file

@ -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")

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class BigRunSchedules(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BigRunScheduleNode>
val nodes: List<BigRunScheduleNode>
)

View file

@ -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?
)

View file

@ -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
)

View file

@ -35,9 +35,9 @@ data class CurrentFest(
@SerialName("state")
val state: String,
@SerialName("teams")
val teams: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Team>,
val teams: List<Team>,
@SerialName("title")
val title: String,
@SerialName("tricolorStage")
val tricolorStage: net.moonleay.lilJudd.data.api.splatoon3ink.schedules.TricolorStage
val tricolorStage: TricolorStage
)

View file

@ -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
)

View file

@ -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<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.TimePeriod>
val timePeriods: List<TimePeriod>
)

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class EventSchedules(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.EventNode>
val nodes: List<EventNode>
)

View file

@ -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<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsStage>
val vsStages: List<VsStage>
)

View file

@ -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
)

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class FestSchedules(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.FestNode>
val nodes: List<FestNode>
)

View file

@ -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<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsStage>
val vsStages: List<VsStage>
)

View file

@ -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")

View file

@ -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<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsStage>
val vsStages: List<VsStage>
)

View file

@ -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
)

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class RegularSchedules(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BigRunScheduleNode>
val nodes: List<BigRunScheduleNode>
)

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class RegularSchedulesX(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.RegularNode>
val nodes: List<RegularNode>
)

View file

@ -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
)

View file

@ -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
)

View file

@ -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<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Weapon>
val weapons: List<Weapon>
)

View file

@ -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")

View file

@ -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
)

View file

@ -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")

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class VsStages(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.MapNode>
val nodes: List<MapNode>
)

View file

@ -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")

View file

@ -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<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.VsStage>
val vsStages: List<VsStage>
)

View file

@ -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
)

View file

@ -25,5 +25,5 @@ import kotlinx.serialization.Serializable
@Serializable
data class XSchedules(
@SerialName("nodes")
val nodes: List<net.moonleay.lilJudd.data.api.splatoon3ink.schedules.XNode>
val nodes: List<XNode>
)

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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<TimePlanningMessagesData> {
val dataList = mutableListOf<TimePlanningMessagesData>()
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],

View file

@ -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 {

View file

@ -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 {