diff --git a/build.gradle.kts b/build.gradle.kts index 7fb8244..0ad11dc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,11 +29,11 @@ plugins { } //lilJudd version 2 -val ownerID = 372703841151614976L +val creatorID = 372703841151614976L group = "net.moonleay.liljudd" version = System.getenv("CI_COMMIT_TAG")?.let { "$it-${System.getenv("CI_COMMIT_SHORT_SHA")}-prod" } ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" } - ?: "2.7.1" + ?: "2.7.2" val kordver = "1.7.1-SNAPSHOT" val coroutinesver = "1.7.3" @@ -120,7 +120,7 @@ val templateSrc = project.rootDir.resolve("src/main/templates") val templateDest = project.projectDir.resolve("build/generated/templates") val templateProps = mapOf( "version" to project.version as String, - "ownerID" to ownerID, + "creatorID" to creatorID, "kordversion" to kordver, "coroutinesversion" to coroutinesver, "ktorversion" to ktorver, diff --git a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt b/src/main/kotlin/net/moonleay/liljudd/Bot.kt similarity index 67% rename from src/main/kotlin/net/moonleay/lilJudd/Bot.kt rename to src/main/kotlin/net/moonleay/liljudd/Bot.kt index 4196213..2e5e5aa 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt +++ b/src/main/kotlin/net/moonleay/liljudd/Bot.kt @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd +package net.moonleay.liljudd import com.kotlindiscord.kord.extensions.ExtensibleBot +import com.kotlindiscord.kord.extensions.utils.dm import dev.kord.common.entity.PresenceStatus import dev.kord.core.behavior.interaction.response.respond import dev.kord.core.event.gateway.ReadyEvent @@ -26,27 +27,28 @@ import dev.kord.core.event.interaction.ButtonInteractionCreateEvent import dev.kord.core.on import dev.kord.gateway.Intent import dev.kord.gateway.PrivilegedIntent +import dev.kord.gateway.builder.Shards +import dev.kord.rest.builder.message.embed import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import net.moonleay.lilJudd.buttons.component.EditButtonManager -import net.moonleay.lilJudd.data.CredentialManager -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3Api -import net.moonleay.lilJudd.data.database.DB -import net.moonleay.lilJudd.extensions.* -import net.moonleay.lilJudd.features.AvailabilityManager -import net.moonleay.lilJudd.features.MatchManager -import net.moonleay.lilJudd.features.TimeManager -import net.moonleay.lilJudd.jobs.Splatoon3ApiScheduleUpdateScheduler -import net.moonleay.lilJudd.jobs.StatusUpdater -import net.moonleay.lilJudd.jobs.component.JobManager -import net.moonleay.lilJudd.util.EmbedColor -import net.moonleay.lilJudd.util.Logger -import net.moonleay.lilJudd.util.MessageUtil import net.moonleay.liljudd.build.BuildConstants +import net.moonleay.liljudd.buttons.component.EditButtonManager +import net.moonleay.liljudd.data.CredentialManager +import net.moonleay.liljudd.data.NewsManager +import net.moonleay.liljudd.data.StacktraceSaver +import net.moonleay.liljudd.data.database.DB +import net.moonleay.liljudd.extensions.* +import net.moonleay.liljudd.features.AvailabilityManager +import net.moonleay.liljudd.features.MatchManager +import net.moonleay.liljudd.features.TimeManager +import net.moonleay.liljudd.util.EmbedColor +import net.moonleay.liljudd.util.Logger +import net.moonleay.liljudd.util.MessageUtil import kotlin.system.exitProcess + object Bot { //The kord object gets set at app launch lateinit var bot: ExtensibleBot @@ -72,6 +74,7 @@ object Bot { exitProcess(3) } + // Check if there are api credentials if (CredentialManager.apiDomain == "empty" || CredentialManager.apiToken == "empty") { Logger.out("The config does not contain the whole API credentials.") exitProcess(3) @@ -125,11 +128,26 @@ object Bot { +Intent.GuildMembers } - // Will add Sharding someday, I promise - /* - sharding { recommended -> + errorResponse { _, type -> + val stamp = System.currentTimeMillis() + this.embed { + this.title = "Oops. Something went wrong." + this.description = "The bot encountered an error during execution.\n" + + "Please report this to <@${BuildConstants.creatorID}>.\n" + + "The errorid is \"$stamp.stk\"" + this.field { + this.name = "Error message:" + this.value = type.error.message.toString() + this.inline = false + } + } + + StacktraceSaver.saveStacktrace(type.error, stamp) + } + + this.sharding { recommended -> Shards(recommended) - } */ + } } // Register button presses @@ -167,13 +185,39 @@ object Bot { bot.kordRef.on { AvailabilityManager.runThread() // Update Availabilities MatchManager.update() // Update Matches + // Load news + NewsManager.load() + if(NewsManager.shouldPost == "yes"){ + val contactedOwners = mutableListOf() + bot.kordRef.guilds.collect { + val owner = it.owner.asUser() + if (!contactedOwners.contains(owner.id.value)) { + Logger.out("Sent News to ${owner.username} from ${it.name}") + owner.dm { + this.embed { + this.title = NewsManager.title + this.description = NewsManager.news + this.footer { + this.icon = bot.kordRef.getSelf().avatar?.cdnUrl?.toUrl() + this.text = MessageUtil.getFooter() + } + } + } + contactedOwners.add(owner.id.value) + } + } + NewsManager.shouldPost = "no" + NewsManager.update() + } + + // Make the bot update the status every 6 seconds - JobManager.addJob(StatusUpdater) +// JobManager.addJob(StatusUpdater) } // Update the Splatoon 3 api data and make sure it stays up-to-date - Splatoon3Api.updateSchedule() - JobManager.addJob(Splatoon3ApiScheduleUpdateScheduler) +// Splatoon3Api.updateSchedule() +// JobManager.addJob(Splatoon3ApiScheduleUpdateScheduler) /* Other caches will be added when implemented its not used yet in order to reduce load on the api, diff --git a/src/main/kotlin/net/moonleay/lilJudd/Main.kt b/src/main/kotlin/net/moonleay/liljudd/Main.kt similarity index 73% rename from src/main/kotlin/net/moonleay/lilJudd/Main.kt rename to src/main/kotlin/net/moonleay/liljudd/Main.kt index 36be8b3..a1196f8 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/Main.kt +++ b/src/main/kotlin/net/moonleay/liljudd/Main.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,9 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package net.moonleay.lilJudd +package net.moonleay.liljudd import net.moonleay.liljudd.build.BuildConstants +import net.moonleay.liljudd.util.Logger suspend fun main() { @@ -27,9 +28,11 @@ suspend fun main() { "| |_| |__| |_ _ _| |_| |\n" + "| | | | | | | | . | . |\n" + "|_|_|_|_____|___|___|___|\n" + - " " + "v.${BuildConstants.version}\n" ) - println("v.${BuildConstants.version}") + + Logger.out("li'l Judd made by moonleay (https://moonleay.net). Web UI made by aronmal (https://mal-noh.de).") + Logger.out("For more information check out https://liljudd.ink and https://git.moonleay.net/DiscordBots/lilJudd") Bot.start() } diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/component/EditButtonManager.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/component/EditButtonManager.kt similarity index 67% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/component/EditButtonManager.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/component/EditButtonManager.kt index f0df57f..384a09d 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/component/EditButtonManager.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/component/EditButtonManager.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.component +package net.moonleay.liljudd.buttons.component -import net.moonleay.lilJudd.buttons.matchplanner.AcceptEditButton -import net.moonleay.lilJudd.buttons.matchplanner.CancelEditButton -import net.moonleay.lilJudd.buttons.matchplanner.DeclineEditButton -import net.moonleay.lilJudd.buttons.timeplanner.IsAvailableEditButton -import net.moonleay.lilJudd.buttons.timeplanner.MaybeAvailableEditButton -import net.moonleay.lilJudd.buttons.timeplanner.NotAvailableEditButton +import net.moonleay.liljudd.buttons.matchplanner.AcceptEditButton +import net.moonleay.liljudd.buttons.matchplanner.CancelEditButton +import net.moonleay.liljudd.buttons.matchplanner.DeclineEditButton +import net.moonleay.liljudd.buttons.timeplanner.IsAvailableEditButton +import net.moonleay.liljudd.buttons.timeplanner.MaybeAvailableEditButton +import net.moonleay.liljudd.buttons.timeplanner.NotAvailableEditButton object EditButtonManager { val buttons = listOf( diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/component/IEditButton.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/component/IEditButton.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/component/IEditButton.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/component/IEditButton.kt index 0fbe64e..d973ceb 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/component/IEditButton.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/component/IEditButton.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.component +package net.moonleay.liljudd.buttons.component import dev.kord.core.behavior.interaction.response.PublicMessageInteractionResponseBehavior import dev.kord.core.entity.Guild diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/AcceptEditButton.kt similarity index 91% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/AcceptEditButton.kt index ff4d4cf..7e7e382 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/AcceptEditButton.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.matchplanner +package net.moonleay.liljudd.buttons.matchplanner import dev.kord.common.entity.Snowflake import dev.kord.core.behavior.edit @@ -27,12 +27,12 @@ import dev.kord.core.entity.channel.MessageChannel import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.EmbedBuilder import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.buttons.component.IEditButton -import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository -import net.moonleay.lilJudd.util.EmbedUtil -import net.moonleay.lilJudd.util.Logger -import net.moonleay.lilJudd.util.MessageUtil +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.buttons.component.IEditButton +import net.moonleay.liljudd.data.database.repository.MatchPlanningDataRepository +import net.moonleay.liljudd.util.EmbedUtil +import net.moonleay.liljudd.util.Logger +import net.moonleay.liljudd.util.MessageUtil class AcceptEditButton : IEditButton { override val id: String = "public.edit.btn.matchmanagement.accept" diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/CancelEditButton.kt similarity index 89% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/CancelEditButton.kt index 12eaea1..07e1016 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/CancelEditButton.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.matchplanner +package net.moonleay.liljudd.buttons.matchplanner import dev.kord.common.entity.Snowflake import dev.kord.core.behavior.edit @@ -27,11 +27,11 @@ import dev.kord.core.entity.channel.MessageChannel import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.EmbedBuilder import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.buttons.component.IEditButton -import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository -import net.moonleay.lilJudd.util.EmbedUtil -import net.moonleay.lilJudd.util.Logger +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.buttons.component.IEditButton +import net.moonleay.liljudd.data.database.repository.MatchPlanningDataRepository +import net.moonleay.liljudd.util.EmbedUtil +import net.moonleay.liljudd.util.Logger class CancelEditButton : IEditButton { override val id: String = "public.edit.btn.matchmanagement.cancel" diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/DeclineEditButton.kt similarity index 91% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/DeclineEditButton.kt index d205b05..06f7e44 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/matchplanner/DeclineEditButton.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.matchplanner +package net.moonleay.liljudd.buttons.matchplanner import dev.kord.common.entity.Snowflake import dev.kord.core.behavior.edit @@ -27,12 +27,12 @@ import dev.kord.core.entity.channel.MessageChannel import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.EmbedBuilder import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.buttons.component.IEditButton -import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository -import net.moonleay.lilJudd.util.EmbedUtil -import net.moonleay.lilJudd.util.Logger -import net.moonleay.lilJudd.util.MessageUtil +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.buttons.component.IEditButton +import net.moonleay.liljudd.data.database.repository.MatchPlanningDataRepository +import net.moonleay.liljudd.util.EmbedUtil +import net.moonleay.liljudd.util.Logger +import net.moonleay.liljudd.util.MessageUtil class DeclineEditButton : IEditButton { override val id: String = "public.edit.btn.matchmanagement.decline" diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/IsAvailableEditButton.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/IsAvailableEditButton.kt similarity index 90% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/IsAvailableEditButton.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/IsAvailableEditButton.kt index ccc67fd..b4cdfef 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/IsAvailableEditButton.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/IsAvailableEditButton.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.timeplanner +package net.moonleay.liljudd.buttons.timeplanner import dev.kord.core.behavior.edit import dev.kord.core.behavior.interaction.response.PublicMessageInteractionResponseBehavior @@ -25,10 +25,10 @@ import dev.kord.core.entity.User import dev.kord.core.entity.channel.MessageChannel import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.buttons.component.IEditButton -import net.moonleay.lilJudd.features.AvailabilityManager -import net.moonleay.lilJudd.util.EmbedUtil +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.buttons.component.IEditButton +import net.moonleay.liljudd.features.AvailabilityManager +import net.moonleay.liljudd.util.EmbedUtil class IsAvailableEditButton : IEditButton { override val id: String = "public.edit.btn.timemanagement.available" diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/MaybeAvailableEditButton.kt similarity index 90% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/MaybeAvailableEditButton.kt index a8b174c..23b9c61 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/MaybeAvailableEditButton.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.timeplanner +package net.moonleay.liljudd.buttons.timeplanner import dev.kord.core.behavior.edit import dev.kord.core.behavior.interaction.response.PublicMessageInteractionResponseBehavior @@ -25,10 +25,10 @@ import dev.kord.core.entity.User import dev.kord.core.entity.channel.MessageChannel import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.buttons.component.IEditButton -import net.moonleay.lilJudd.features.AvailabilityManager -import net.moonleay.lilJudd.util.EmbedUtil +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.buttons.component.IEditButton +import net.moonleay.liljudd.features.AvailabilityManager +import net.moonleay.liljudd.util.EmbedUtil class MaybeAvailableEditButton : IEditButton { override val id: String = "public.edit.btn.timemanagement.maybeavailable" diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/NotAvailableEditButton.kt b/src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/NotAvailableEditButton.kt similarity index 90% rename from src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/NotAvailableEditButton.kt rename to src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/NotAvailableEditButton.kt index e5e8103..0fd5390 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/NotAvailableEditButton.kt +++ b/src/main/kotlin/net/moonleay/liljudd/buttons/timeplanner/NotAvailableEditButton.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.buttons.timeplanner +package net.moonleay.liljudd.buttons.timeplanner import dev.kord.core.behavior.edit import dev.kord.core.behavior.interaction.response.PublicMessageInteractionResponseBehavior @@ -25,10 +25,10 @@ import dev.kord.core.entity.User import dev.kord.core.entity.channel.MessageChannel import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.buttons.component.IEditButton -import net.moonleay.lilJudd.features.AvailabilityManager -import net.moonleay.lilJudd.util.EmbedUtil +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.buttons.component.IEditButton +import net.moonleay.liljudd.features.AvailabilityManager +import net.moonleay.liljudd.util.EmbedUtil class NotAvailableEditButton : IEditButton { override val id: String = "public.edit.btn.timemanagement.notavailable" diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/CredentialManager.kt b/src/main/kotlin/net/moonleay/liljudd/data/CredentialManager.kt similarity index 99% rename from src/main/kotlin/net/moonleay/lilJudd/data/CredentialManager.kt rename to src/main/kotlin/net/moonleay/liljudd/data/CredentialManager.kt index e406414..7a92197 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/CredentialManager.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/CredentialManager.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data +package net.moonleay.liljudd.data import java.io.* import java.util.* diff --git a/src/main/kotlin/net/moonleay/liljudd/data/NewsManager.kt b/src/main/kotlin/net/moonleay/liljudd/data/NewsManager.kt new file mode 100644 index 0000000..30dc1e4 --- /dev/null +++ b/src/main/kotlin/net/moonleay/liljudd/data/NewsManager.kt @@ -0,0 +1,120 @@ +/* + * lilJudd + * Copyright (C) 2024 moonleay + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.moonleay.liljudd.data + +import java.io.* +import java.util.* + +object NewsManager { + private const val foldername = "data" + private const val filename = "news.nick" + lateinit var shouldPost: String + lateinit var title: String + lateinit var news: String + + ///Load the needed credentials, generate a config if there is none + fun load() { + val folder = File(foldername) + if (!folder.exists()) { + save() + return + } + val configFile = File(folder, filename) + if (!configFile.exists()) { + save() + return + } + try { + val input: InputStream = FileInputStream(foldername + File.separator + filename) + val prop = Properties() + prop.load(input) + shouldPost = prop.getProperty("shouldPost") + title = prop.getProperty("title") + news = prop.getProperty("news") + input.close() + } catch (e: IOException) { + e.printStackTrace() + } + } + + fun update(){ + val folder = File(foldername) + if (!folder.exists()) { + try { + folder.mkdirs() + } catch (e: IOException) { + e.printStackTrace() + } + } + val configFile = File(foldername + File.separator + filename) + if (!configFile.exists()) { + try { + configFile.createNewFile() + } catch (e: IOException) { + e.printStackTrace() + } + } + try { + val output: OutputStream = FileOutputStream(foldername + File.separator + filename) + val prop = Properties() + prop.setProperty("shouldPost", shouldPost) + prop.setProperty("title", title) + prop.setProperty("news", news) + prop.store(output, null) + output.close() + } catch (e: IOException) { + e.printStackTrace() + } + } + + ///generate a new sample config + private fun save() { + val folder = File(foldername) + if (!folder.exists()) { + try { + folder.mkdirs() + } catch (e: IOException) { + e.printStackTrace() + } + } + val configFile = File(foldername + File.separator + filename) + if (!configFile.exists()) { + try { + configFile.createNewFile() + } catch (e: IOException) { + e.printStackTrace() + } + } + try { + val output: OutputStream = FileOutputStream(foldername + File.separator + filename) + val prop = Properties() + prop.setProperty("shouldPost", "no") + prop.setProperty("title", "empty") + prop.setProperty("news", "empty") + prop.store(output, null) + output.close() + + shouldPost = "no" + title = "empty" + news = "empty" + } catch (e: IOException) { + e.printStackTrace() + } + } +} diff --git a/src/main/kotlin/net/moonleay/liljudd/data/StacktraceSaver.kt b/src/main/kotlin/net/moonleay/liljudd/data/StacktraceSaver.kt new file mode 100644 index 0000000..84828c2 --- /dev/null +++ b/src/main/kotlin/net/moonleay/liljudd/data/StacktraceSaver.kt @@ -0,0 +1,37 @@ +/* + * lilJudd + * Copyright (C) 2024 moonleay + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.moonleay.liljudd.data + +import java.io.File + +object StacktraceSaver { + fun saveStacktrace(stacktrace: Throwable, timestamp: Long) { + createFolder() + val dir = File("data", "stacktraces") + File(dir, "$timestamp.stk").bufferedWriter().use { out -> + out.write(stacktrace.stackTraceToString()) + } + } + + private fun createFolder() { + val dir = File("data", "stacktraces") + if (!dir.exists()) + dir.mkdir() + } +} 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 similarity index 88% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/Splatoon3Api.kt index 100c9dc..2b7fa40 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 @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink +package net.moonleay.liljudd.data.api.splatoon3ink import kotlinx.serialization.json.Json -import net.moonleay.lilJudd.data.api.splatoon3ink.schedules.Schedules -import net.moonleay.lilJudd.util.NetUtil import net.moonleay.liljudd.build.BuildConstants +import net.moonleay.liljudd.data.api.splatoon3ink.schedules.Schedules +import net.moonleay.liljudd.util.NetUtil object Splatoon3Api { 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiDataGrabber.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/Splatoon3ApiDataGrabber.kt index f24a46f..5357116 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 @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink +package net.moonleay.liljudd.data.api.splatoon3ink -import net.moonleay.lilJudd.data.api.splatoon3ink.schedules.BankaraNode -import net.moonleay.lilJudd.data.api.splatoon3ink.schedules.RegularNode -import net.moonleay.lilJudd.data.api.splatoon3ink.schedules.SalmonRunNode -import net.moonleay.lilJudd.data.api.splatoon3ink.schedules.XNode -import net.moonleay.lilJudd.util.TimeUtil +import net.moonleay.liljudd.data.api.splatoon3ink.schedules.BankaraNode +import net.moonleay.liljudd.data.api.splatoon3ink.schedules.RegularNode +import net.moonleay.liljudd.data.api.splatoon3ink.schedules.SalmonRunNode +import net.moonleay.liljudd.data.api.splatoon3ink.schedules.XNode +import net.moonleay.liljudd.util.TimeUtil object Splatoon3ApiDataGrabber { fun getRegularMode(timestamp: Long): RegularNode { 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraMatchSetting.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/BankaraMatchSetting.kt index 773f4e8..d4188cd 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/BankaraNode.kt index 953c79a..20f0c9a 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BankaraSchedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/BankaraSchedules.kt index a770703..7f6cd90 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BannerImage.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/BannerImage.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BannerImage.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/BannerImage.kt index 3713c22..245536a 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BannerImage.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/BannerImage.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/BigRunSchedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/BigRunSchedules.kt index 47b5890..476dc59 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Boss.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Boss.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Boss.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Boss.kt index 1501727..abf1858 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Boss.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Boss.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Color.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Color.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Color.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Color.kt index 7ed55be..b359a33 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Color.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Color.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopGroupingSchedule.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/CoopGroupingSchedule.kt index 23770d9..1a5d5be 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopSetting.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/CoopSetting.kt similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopSetting.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/CoopSetting.kt index c4dce9f..7f20c4c 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopSetting.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/CoopSetting.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CoopStage.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/CoopStage.kt index 2cb21da..6441baa 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentFest.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/CurrentFest.kt index d13d8fd..e2fe9ed 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/CurrentPlayer.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/CurrentPlayer.kt index 5abc31b..50c8f74 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/EventNode.kt index 96e1419..2e66a3c 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/EventSchedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/EventSchedules.kt index c86ea33..fb6ed6f 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingX.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/FestMatchSettingX.kt index 8b212c8..db4e294 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingXX.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/FestMatchSettingXX.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingXX.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/FestMatchSettingXX.kt index a1f5d3d..d2fbfc5 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestMatchSettingXX.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/FestMatchSettingXX.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/FestNode.kt index b9b4262..8e869a9 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/FestSchedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/FestSchedules.kt index d606246..9a1acc7 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Image.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Image.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Image.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Image.kt index f635fa6..9543b8a 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Image.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Image.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchEvent.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/LeagueMatchEvent.kt similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchEvent.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/LeagueMatchEvent.kt index 64fe6b9..494703b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchEvent.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/LeagueMatchEvent.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/LeagueMatchSetting.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/LeagueMatchSetting.kt index 8008afc..41cf553 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/MapNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/MapNode.kt index b1c3813..f17d17c 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/OriginalImage.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/OriginalImage.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/OriginalImage.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/OriginalImage.kt index e294963..0393f71 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/OriginalImage.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/OriginalImage.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularMatchSetting.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/RegularMatchSetting.kt index 44da86c..ea899be 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/RegularNode.kt index 321e0be..9a6935f 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/RegularSchedules.kt index ab2ccd8..b6c55db 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/RegularSchedulesX.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/RegularSchedulesX.kt index 132b607..04418e0 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SalmonRunNode.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/SalmonRunNode.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SalmonRunNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/SalmonRunNode.kt index 85c4c8a..ad53d45 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SalmonRunNode.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/SalmonRunNode.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Schedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Schedules.kt index 10c9412..f3d08c7 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 96% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/SchedulesData.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/SchedulesData.kt index 21e4c48..0bf967a 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Setting.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Setting.kt index 8d1529b..3ebd2f2 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Team.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Team.kt index 2ee6032..8043c5d 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TeamContestNode.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TeamContestNode.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TeamContestNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TeamContestNode.kt index 309b1f9..22b36d8 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TeamContestNode.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TeamContestNode.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TeamContestSchedules.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TeamContestSchedules.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TeamContestSchedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TeamContestSchedules.kt index f4e9adc..1265efc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TeamContestSchedules.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TeamContestSchedules.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/ThumbnailImage.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/ThumbnailImage.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/ThumbnailImage.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/ThumbnailImage.kt index cb357a9..9fb03cd 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/ThumbnailImage.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/ThumbnailImage.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TimePeriod.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TimePeriod.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TimePeriod.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TimePeriod.kt index 99037bf..d86de17 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TimePeriod.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TimePeriod.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/TricolorStage.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/TricolorStage.kt index 21ba8c5..b5685cc 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/UserIcon.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/UserIcon.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/UserIcon.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/UserIcon.kt index 74ee2eb..673f73a 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/UserIcon.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/UserIcon.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsRule.kt b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/VsRule.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsRule.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/VsRule.kt index 5e47251..bddb5a5 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsRule.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/VsRule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStage.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/VsStage.kt index 3225c3d..0b9cebf 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/VsStages.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/VsStages.kt index 08501f9..142508d 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/Weapon.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/Weapon.kt index 66f880c..a65820d 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XMatchSetting.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/XMatchSetting.kt index 5a1dc64..edca851 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XNode.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/XNode.kt index 95b8435..0242771 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName 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 similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/schedules/XSchedules.kt rename to src/main/kotlin/net/moonleay/liljudd/data/api/splatoon3ink/schedules/XSchedules.kt index ba079aa..9de2887 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 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.schedules +package net.moonleay.liljudd.data.api.splatoon3ink.schedules import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/DB.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/DB.kt similarity index 83% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/DB.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/DB.kt index 7c58ea0..2475f28 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/DB.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/DB.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database +package net.moonleay.liljudd.data.database -import net.moonleay.lilJudd.data.database.tables.MatchPlanningData -import net.moonleay.lilJudd.data.database.tables.PlanningNotifierRoles -import net.moonleay.lilJudd.data.database.tables.TimePlanningChannels -import net.moonleay.lilJudd.data.database.tables.TimePlanningMessages +import net.moonleay.liljudd.data.database.tables.MatchPlanningData +import net.moonleay.liljudd.data.database.tables.PlanningNotifierRoles +import net.moonleay.liljudd.data.database.tables.TimePlanningChannels +import net.moonleay.liljudd.data.database.tables.TimePlanningMessages import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.sql.SchemaUtils import org.jetbrains.exposed.sql.transactions.transaction diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/MatchPlanningDataData.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/MatchPlanningDataData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/entry/MatchPlanningDataData.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/entry/MatchPlanningDataData.kt index b19c5e7..77bfcc8 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/MatchPlanningDataData.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/MatchPlanningDataData.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.entry +package net.moonleay.liljudd.data.database.entry data class MatchPlanningDataData( val id: Int, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/PlanningNotifierRolesData.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/PlanningNotifierRolesData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/entry/PlanningNotifierRolesData.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/entry/PlanningNotifierRolesData.kt index c58130a..b6d0abf 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/PlanningNotifierRolesData.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/PlanningNotifierRolesData.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.entry +package net.moonleay.liljudd.data.database.entry data class PlanningNotifierRolesData( val id: Int, // The id of the entry diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningChannelsData.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/TimePlanningChannelsData.kt similarity index 90% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningChannelsData.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/entry/TimePlanningChannelsData.kt index 7edd496..0f93b9e 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningChannelsData.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/TimePlanningChannelsData.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.entry +package net.moonleay.liljudd.data.database.entry data class TimePlanningChannelsData( val id: Int, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningMessagesData.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/TimePlanningMessagesData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningMessagesData.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/entry/TimePlanningMessagesData.kt index 3126e2c..c1192fc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningMessagesData.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/entry/TimePlanningMessagesData.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.entry +package net.moonleay.liljudd.data.database.entry data class TimePlanningMessagesData( val id: Int, // The id of the entry 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 similarity index 91% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/repository/MatchPlanningDataRepository.kt index 6b0bbd9..5c93b43 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 @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,12 +16,15 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.repository +package net.moonleay.liljudd.data.database.repository -import net.moonleay.lilJudd.data.database.entry.MatchPlanningDataData -import net.moonleay.lilJudd.data.database.tables.MatchPlanningData -import org.jetbrains.exposed.sql.* +import net.moonleay.liljudd.data.database.entry.MatchPlanningDataData +import net.moonleay.liljudd.data.database.tables.MatchPlanningData import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +import org.jetbrains.exposed.sql.and +import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.sql.insert +import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction object MatchPlanningDataRepository { 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 similarity index 91% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/repository/PlanningNotifierRolesRepository.kt index eea22df..3333471 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 @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,12 +16,15 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.repository +package net.moonleay.liljudd.data.database.repository -import net.moonleay.lilJudd.data.database.entry.PlanningNotifierRolesData -import net.moonleay.lilJudd.data.database.tables.PlanningNotifierRoles -import org.jetbrains.exposed.sql.* +import net.moonleay.liljudd.data.database.entry.PlanningNotifierRolesData +import net.moonleay.liljudd.data.database.tables.PlanningNotifierRoles import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +import org.jetbrains.exposed.sql.and +import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.sql.insert +import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction object PlanningNotifierRolesRepository { 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 similarity index 85% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/repository/TimePlanningChannelsRepository.kt index 305a8b5..f809420 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 @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,12 +16,15 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.repository +package net.moonleay.liljudd.data.database.repository -import net.moonleay.lilJudd.data.database.entry.TimePlanningChannelsData -import net.moonleay.lilJudd.data.database.tables.TimePlanningChannels -import org.jetbrains.exposed.sql.* +import net.moonleay.liljudd.data.database.entry.TimePlanningChannelsData +import net.moonleay.liljudd.data.database.tables.TimePlanningChannels import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +import org.jetbrains.exposed.sql.and +import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.sql.insert +import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction object TimePlanningChannelsRepository { 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 similarity index 88% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/repository/TimePlanningMessagesRepository.kt index fad3a7c..4c92a08 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 @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,12 +16,13 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.repository +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.* -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +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.selectAll import org.jetbrains.exposed.sql.transactions.transaction object TimePlanningMessagesRepository { diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/MatchPlanningData.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/MatchPlanningData.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/tables/MatchPlanningData.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/tables/MatchPlanningData.kt index 391b3e8..1ba4ae3 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/MatchPlanningData.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/MatchPlanningData.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.tables +package net.moonleay.liljudd.data.database.tables import org.jetbrains.exposed.sql.Table diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/PlanningNotifierRoles.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/PlanningNotifierRoles.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/tables/PlanningNotifierRoles.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/tables/PlanningNotifierRoles.kt index 66fe906..0e44813 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/PlanningNotifierRoles.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/PlanningNotifierRoles.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.tables +package net.moonleay.liljudd.data.database.tables import org.jetbrains.exposed.sql.Table diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningChannels.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/TimePlanningChannels.kt similarity index 91% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningChannels.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/tables/TimePlanningChannels.kt index d3b31e3..7b81b0b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningChannels.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/TimePlanningChannels.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.tables +package net.moonleay.liljudd.data.database.tables import org.jetbrains.exposed.sql.Table diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningMessages.kt b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/TimePlanningMessages.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningMessages.kt rename to src/main/kotlin/net/moonleay/liljudd/data/database/tables/TimePlanningMessages.kt index dd48838..f7061ac 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningMessages.kt +++ b/src/main/kotlin/net/moonleay/liljudd/data/database/tables/TimePlanningMessages.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.database.tables +package net.moonleay.liljudd.data.database.tables import org.jetbrains.exposed.sql.Table diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/FeatureManageExtension.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/FeatureManageExtension.kt index 21e7bec..309e433 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/FeatureManageExtension.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions +package net.moonleay.liljudd.extensions import com.kotlindiscord.kord.extensions.commands.Arguments import com.kotlindiscord.kord.extensions.commands.application.slash.converters.impl.enumChoice @@ -26,12 +26,12 @@ import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.utils.hasPermission import dev.kord.common.entity.Permission import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.extensions.component.EnableOrDisable -import net.moonleay.lilJudd.features.component.FeatureEnum -import net.moonleay.lilJudd.features.component.FeatureManager -import net.moonleay.lilJudd.util.EmbedColor -import net.moonleay.lilJudd.util.Logger -import net.moonleay.lilJudd.util.MessageUtil +import net.moonleay.liljudd.extensions.component.EnableOrDisable +import net.moonleay.liljudd.features.component.FeatureEnum +import net.moonleay.liljudd.features.component.FeatureManager +import net.moonleay.liljudd.util.EmbedColor +import net.moonleay.liljudd.util.Logger +import net.moonleay.liljudd.util.MessageUtil class FeatureManageExtension : Extension() { diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/InfoExtension.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/InfoExtension.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/InfoExtension.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/InfoExtension.kt index 4928043..b47af0b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/InfoExtension.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/InfoExtension.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions +package net.moonleay.liljudd.extensions import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.util.EmbedColor import net.moonleay.liljudd.build.BuildConstants +import net.moonleay.liljudd.util.EmbedColor class InfoExtension : Extension() { override val name = "info" diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/MatchExtension.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/MatchExtension.kt index e825baa..7d6a8c6 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/MatchExtension.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions +package net.moonleay.liljudd.extensions import com.kotlindiscord.kord.extensions.commands.Arguments import com.kotlindiscord.kord.extensions.commands.application.slash.converters.impl.enumChoice @@ -26,15 +26,15 @@ import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import dev.kord.core.behavior.createRole import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.data.database.entry.MatchPlanningDataData -import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository -import net.moonleay.lilJudd.extensions.component.MatchTypes -import net.moonleay.lilJudd.jobs.MatchJob -import net.moonleay.lilJudd.jobs.component.JobManager -import net.moonleay.lilJudd.util.EmbedColor -import net.moonleay.lilJudd.util.EmbedUtil -import net.moonleay.lilJudd.util.MessageUtil -import net.moonleay.lilJudd.util.TimeUtil +import net.moonleay.liljudd.data.database.entry.MatchPlanningDataData +import net.moonleay.liljudd.data.database.repository.MatchPlanningDataRepository +import net.moonleay.liljudd.extensions.component.MatchTypes +import net.moonleay.liljudd.jobs.MatchJob +import net.moonleay.liljudd.jobs.component.JobManager +import net.moonleay.liljudd.util.EmbedColor +import net.moonleay.liljudd.util.EmbedUtil +import net.moonleay.liljudd.util.MessageUtil +import net.moonleay.liljudd.util.TimeUtil class MatchExtension : Extension() { diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/RotationExtension.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/RotationExtension.kt similarity index 99% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/RotationExtension.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/RotationExtension.kt index 9c458b5..d5b0d7e 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/RotationExtension.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/RotationExtension.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions +package net.moonleay.liljudd.extensions import com.kotlindiscord.kord.extensions.commands.Arguments import com.kotlindiscord.kord.extensions.commands.application.slash.converters.impl.enumChoice @@ -25,9 +25,9 @@ import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import dev.kord.common.Color import dev.kord.rest.builder.message.embed import kotlinx.datetime.Clock -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3ApiDataGrabber -import net.moonleay.lilJudd.extensions.component.SplatoonOnlineMode -import net.moonleay.lilJudd.util.TimeUtil +import net.moonleay.liljudd.data.api.splatoon3ink.Splatoon3ApiDataGrabber +import net.moonleay.liljudd.extensions.component.SplatoonOnlineMode +import net.moonleay.liljudd.util.TimeUtil class RotationExtension : Extension() { diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/SendPlannerExtension.kt similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/SendPlannerExtension.kt index f5d7c32..a2d98dc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/SendPlannerExtension.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions +package net.moonleay.liljudd.extensions import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand @@ -26,10 +26,10 @@ import dev.kord.core.behavior.channel.createMessage import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed import kotlinx.coroutines.delay -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData -import net.moonleay.lilJudd.data.database.repository.TimePlanningMessagesRepository -import net.moonleay.lilJudd.util.* +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.data.database.entry.TimePlanningMessagesData +import net.moonleay.liljudd.data.database.repository.TimePlanningMessagesRepository +import net.moonleay.liljudd.util.* import java.time.ZoneId import java.time.ZonedDateTime diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/UpdateRolesExtension.kt similarity index 91% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/UpdateRolesExtension.kt index 6d29add..7ffe5e9 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/UpdateRolesExtension.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions +package net.moonleay.liljudd.extensions import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.utils.hasPermission import dev.kord.common.entity.Permission import dev.kord.rest.builder.message.embed -import net.moonleay.lilJudd.features.AvailabilityManager -import net.moonleay.lilJudd.util.EmbedColor -import net.moonleay.lilJudd.util.Logger -import net.moonleay.lilJudd.util.MessageUtil +import net.moonleay.liljudd.features.AvailabilityManager +import net.moonleay.liljudd.util.EmbedColor +import net.moonleay.liljudd.util.Logger +import net.moonleay.liljudd.util.MessageUtil class UpdateRolesExtension : Extension() { override val name = "updateroles" diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/component/EnableOrDisable.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/component/EnableOrDisable.kt similarity index 91% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/component/EnableOrDisable.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/component/EnableOrDisable.kt index 6d5e614..4cd9a92 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/component/EnableOrDisable.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/component/EnableOrDisable.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions.component +package net.moonleay.liljudd.extensions.component import com.kotlindiscord.kord.extensions.commands.application.slash.converters.ChoiceEnum diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/component/MatchTypes.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/component/MatchTypes.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/component/MatchTypes.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/component/MatchTypes.kt index 3cde91b..cc60220 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/component/MatchTypes.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/component/MatchTypes.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions.component +package net.moonleay.liljudd.extensions.component import com.kotlindiscord.kord.extensions.commands.application.slash.converters.ChoiceEnum diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/component/SplatoonOnlineMode.kt b/src/main/kotlin/net/moonleay/liljudd/extensions/component/SplatoonOnlineMode.kt similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/extensions/component/SplatoonOnlineMode.kt rename to src/main/kotlin/net/moonleay/liljudd/extensions/component/SplatoonOnlineMode.kt index c6ae569..92e587e 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/component/SplatoonOnlineMode.kt +++ b/src/main/kotlin/net/moonleay/liljudd/extensions/component/SplatoonOnlineMode.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.extensions.component +package net.moonleay.liljudd.extensions.component import com.kotlindiscord.kord.extensions.commands.application.slash.converters.ChoiceEnum diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt b/src/main/kotlin/net/moonleay/liljudd/features/AvailabilityManager.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt rename to src/main/kotlin/net/moonleay/liljudd/features/AvailabilityManager.kt index cc49d1c..e4d0441 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt +++ b/src/main/kotlin/net/moonleay/liljudd/features/AvailabilityManager.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.features +package net.moonleay.liljudd.features import com.kotlindiscord.kord.extensions.utils.isNullOrBot import dev.inmo.krontab.buildSchedule @@ -29,22 +29,22 @@ import dev.kord.core.entity.channel.Channel import dev.kord.core.entity.channel.MessageChannel import dev.kord.gateway.PrivilegedIntent import dev.kord.rest.builder.message.EmbedBuilder -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.data.database.entry.PlanningNotifierRolesData -import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData -import net.moonleay.lilJudd.data.database.repository.PlanningNotifierRolesRepository -import net.moonleay.lilJudd.data.database.repository.TimePlanningMessagesRepository -import net.moonleay.lilJudd.extensions.FeatureManageExtension -import net.moonleay.lilJudd.features.component.FeatureEnum -import net.moonleay.lilJudd.features.component.IFeature -import net.moonleay.lilJudd.util.* +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.data.database.entry.PlanningNotifierRolesData +import net.moonleay.liljudd.data.database.entry.TimePlanningMessagesData +import net.moonleay.liljudd.data.database.repository.PlanningNotifierRolesRepository +import net.moonleay.liljudd.data.database.repository.TimePlanningMessagesRepository +import net.moonleay.liljudd.extensions.FeatureManageExtension +import net.moonleay.liljudd.features.component.FeatureEnum +import net.moonleay.liljudd.features.component.IFeature +import net.moonleay.liljudd.util.* import java.time.ZonedDateTime object AvailabilityManager : IFeature { // This runs during the cronjob. suspend fun runThread() { - Logger.out("Starting to update roles...") + Logger.out("Updating match roles") // ChannelID, Data val messages = TimePlanningMessagesRepository.getWeek(TimeUtil.getWeekStamp().toEpochSecond()) @@ -70,7 +70,7 @@ object AvailabilityManager : IFeature { } this.updateInChannel(snf, data, roleData) } - Logger.out("Done! Until tomorrow! <3 ") + Logger.out("Finished updating roles") } suspend fun updateInChannel(snf: Snowflake) { @@ -162,7 +162,7 @@ object AvailabilityManager : IFeature { // Register the cronjob to run at 1AM UTC every day override suspend fun registerThread() { - Logger.out("Adding availability scheduler...") + Logger.out("Registering daily planning message role update coroutine") val scheduler = buildSchedule("0 0 2 * * *") // 0 0 4 * * * 0o 1w // 0o is UTC scheduler.doInfinity { this.runThread() @@ -176,7 +176,7 @@ object AvailabilityManager : IFeature { ch: Channel, args: FeatureManageExtension.FeatureManagerArgs ): EmbedBuilder { - var alreadyExists = PlanningNotifierRolesRepository.existsInChannel(cID) + val alreadyExists = PlanningNotifierRolesRepository.existsInChannel(cID) // Check if the channel and guild already exist in the db if (!alreadyExists) { // Create the roles in Discord diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt b/src/main/kotlin/net/moonleay/liljudd/features/MatchManager.kt similarity index 80% rename from src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt rename to src/main/kotlin/net/moonleay/liljudd/features/MatchManager.kt index 129fdc0..1bdeafe 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt +++ b/src/main/kotlin/net/moonleay/liljudd/features/MatchManager.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.features +package net.moonleay.liljudd.features import dev.kord.common.entity.Snowflake -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.data.database.entry.MatchPlanningDataData -import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository -import net.moonleay.lilJudd.jobs.MatchJob -import net.moonleay.lilJudd.jobs.component.JobManager -import net.moonleay.lilJudd.util.Logger +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.data.database.entry.MatchPlanningDataData +import net.moonleay.liljudd.data.database.repository.MatchPlanningDataRepository +import net.moonleay.liljudd.jobs.MatchJob +import net.moonleay.liljudd.jobs.component.JobManager +import net.moonleay.liljudd.util.Logger object MatchManager { suspend fun update() { - Logger.out("Updating match roles...") + Logger.out("Updating matches") val dataList = MatchPlanningDataRepository.getAll() for (data in dataList) { @@ -41,7 +41,7 @@ object MatchManager { } this.registerJob(data) } - Logger.out("Done. Until next time! <3 ") + Logger.out("Finished updating matches") } private fun registerJob(data: MatchPlanningDataData) { diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt b/src/main/kotlin/net/moonleay/liljudd/features/TimeManager.kt similarity index 87% rename from src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt rename to src/main/kotlin/net/moonleay/liljudd/features/TimeManager.kt index a9cc7be..0496dff 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt +++ b/src/main/kotlin/net/moonleay/liljudd/features/TimeManager.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.features +package net.moonleay.liljudd.features import dev.inmo.krontab.buildSchedule import dev.inmo.krontab.doInfinity @@ -29,19 +29,19 @@ import dev.kord.rest.builder.message.EmbedBuilder import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed import kotlinx.coroutines.delay -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.data.database.entry.TimePlanningChannelsData -import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData -import net.moonleay.lilJudd.data.database.repository.PlanningNotifierRolesRepository -import net.moonleay.lilJudd.data.database.repository.TimePlanningChannelsRepository -import net.moonleay.lilJudd.data.database.repository.TimePlanningMessagesRepository -import net.moonleay.lilJudd.extensions.FeatureManageExtension -import net.moonleay.lilJudd.features.component.FeatureEnum -import net.moonleay.lilJudd.features.component.IFeature -import net.moonleay.lilJudd.util.EmbedColor -import net.moonleay.lilJudd.util.EmbedUtil -import net.moonleay.lilJudd.util.Logger -import net.moonleay.lilJudd.util.MessageUtil +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.data.database.entry.TimePlanningChannelsData +import net.moonleay.liljudd.data.database.entry.TimePlanningMessagesData +import net.moonleay.liljudd.data.database.repository.PlanningNotifierRolesRepository +import net.moonleay.liljudd.data.database.repository.TimePlanningChannelsRepository +import net.moonleay.liljudd.data.database.repository.TimePlanningMessagesRepository +import net.moonleay.liljudd.extensions.FeatureManageExtension +import net.moonleay.liljudd.features.component.FeatureEnum +import net.moonleay.liljudd.features.component.IFeature +import net.moonleay.liljudd.util.EmbedColor +import net.moonleay.liljudd.util.EmbedUtil +import net.moonleay.liljudd.util.Logger +import net.moonleay.liljudd.util.MessageUtil import java.time.ZoneId import java.time.ZonedDateTime @@ -52,7 +52,7 @@ object TimeManager : IFeature { // Register the cronjob to run at 0:01 AM UTC every Monday override suspend fun registerThread() { - Logger.out("Adding message scheduler...") + Logger.out("Registering weekly planning message posting coroutine") val scheduler = buildSchedule("0 0 1 * * * 0o 1w") // 0 0 4 * * * 0o 1w // 0o is UTC scheduler.doInfinity { this.runThread() @@ -60,7 +60,7 @@ object TimeManager : IFeature { } private suspend fun runThread() { - Logger.out("Starting to notify...") + Logger.out("Starting to send out weekly planning messages") // ChannelID -> Data val targetedChannels = TimePlanningChannelsRepository.getAll().associateBy { it.channelID } @@ -72,7 +72,7 @@ object TimeManager : IFeature { for (ch2 in targetedChannels.keys) { val ch = Snowflake(ch2) if (Bot.bot.kordRef.getChannel(ch) == null) - continue // TODO: Check if the channel is valid in another shard + continue val c = Bot.bot.kordRef.getChannelOf(ch)!! msgStr = "" if (targetedRoles != null && targetedRoles.keys.contains(ch2) && targetedRoles[ch2] != null) { @@ -133,7 +133,7 @@ object TimeManager : IFeature { } msgStr += "${it}:${msg.id.value};" then = then.plusDays(1).withHour(4).withMinute(0).withSecond(0) - Logger.out("Finished sending day $it") + Logger.out("Finished sending day $it in $ch") delay(1000) } @@ -186,7 +186,7 @@ object TimeManager : IFeature { ): EmbedBuilder { // Check if entry exists in db if (TimePlanningChannelsRepository.exists(cID, gID)) { - // delete all entrys for this channel + // delete all entries for this channel TimePlanningChannelsRepository.deleteFromChannelInServer(cID, gID) return MessageUtil.getEmbed( EmbedColor.SUCCESS, diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/component/FeatureEnum.kt b/src/main/kotlin/net/moonleay/liljudd/features/component/FeatureEnum.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/features/component/FeatureEnum.kt rename to src/main/kotlin/net/moonleay/liljudd/features/component/FeatureEnum.kt index 8b3a0a8..b06fc3b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/component/FeatureEnum.kt +++ b/src/main/kotlin/net/moonleay/liljudd/features/component/FeatureEnum.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.features.component +package net.moonleay.liljudd.features.component import com.kotlindiscord.kord.extensions.commands.application.slash.converters.ChoiceEnum diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/component/FeatureManager.kt b/src/main/kotlin/net/moonleay/liljudd/features/component/FeatureManager.kt similarity index 82% rename from src/main/kotlin/net/moonleay/lilJudd/features/component/FeatureManager.kt rename to src/main/kotlin/net/moonleay/liljudd/features/component/FeatureManager.kt index d380d9c..a9212b4 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/component/FeatureManager.kt +++ b/src/main/kotlin/net/moonleay/liljudd/features/component/FeatureManager.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.features.component +package net.moonleay.liljudd.features.component -import net.moonleay.lilJudd.features.AvailabilityManager -import net.moonleay.lilJudd.features.TimeManager +import net.moonleay.liljudd.features.AvailabilityManager +import net.moonleay.liljudd.features.TimeManager object FeatureManager { val features = mutableListOf(AvailabilityManager, TimeManager) // Stores all features diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/component/IFeature.kt b/src/main/kotlin/net/moonleay/liljudd/features/component/IFeature.kt similarity index 89% rename from src/main/kotlin/net/moonleay/lilJudd/features/component/IFeature.kt rename to src/main/kotlin/net/moonleay/liljudd/features/component/IFeature.kt index 1145797..77170f3 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/component/IFeature.kt +++ b/src/main/kotlin/net/moonleay/liljudd/features/component/IFeature.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.features.component +package net.moonleay.liljudd.features.component import dev.kord.core.behavior.UserBehavior import dev.kord.core.entity.channel.Channel import dev.kord.rest.builder.message.EmbedBuilder -import net.moonleay.lilJudd.extensions.FeatureManageExtension +import net.moonleay.liljudd.extensions.FeatureManageExtension interface IFeature { val feat: FeatureEnum diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt b/src/main/kotlin/net/moonleay/liljudd/jobs/MatchJob.kt similarity index 84% rename from src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt rename to src/main/kotlin/net/moonleay/liljudd/jobs/MatchJob.kt index 6f13dfa..130e304 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt +++ b/src/main/kotlin/net/moonleay/liljudd/jobs/MatchJob.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.jobs +package net.moonleay.liljudd.jobs import dev.inmo.krontab.KronScheduler import dev.kord.common.entity.Snowflake import kotlinx.coroutines.Job -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository -import net.moonleay.lilJudd.jobs.component.CronjobType -import net.moonleay.lilJudd.jobs.component.ICronjob -import net.moonleay.lilJudd.jobs.component.JobManager -import net.moonleay.lilJudd.util.Logger +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.data.database.repository.MatchPlanningDataRepository +import net.moonleay.liljudd.jobs.component.CronjobType +import net.moonleay.liljudd.jobs.component.ICronjob +import net.moonleay.liljudd.jobs.component.JobManager +import net.moonleay.liljudd.util.Logger class MatchJob( override val jobIncoming: String, diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt b/src/main/kotlin/net/moonleay/liljudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt similarity index 85% rename from src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt rename to src/main/kotlin/net/moonleay/liljudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt index 6ec76f9..b5701c0 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt +++ b/src/main/kotlin/net/moonleay/liljudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.jobs +package net.moonleay.liljudd.jobs import dev.inmo.krontab.KronScheduler import kotlinx.coroutines.Job -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3Api -import net.moonleay.lilJudd.jobs.component.CronjobType -import net.moonleay.lilJudd.jobs.component.ICronjob -import net.moonleay.lilJudd.util.Logger +import net.moonleay.liljudd.data.api.splatoon3ink.Splatoon3Api +import net.moonleay.liljudd.jobs.component.CronjobType +import net.moonleay.liljudd.jobs.component.ICronjob +import net.moonleay.liljudd.util.Logger object Splatoon3ApiScheduleUpdateScheduler : ICronjob { override val jobName: String diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/StatusUpdater.kt b/src/main/kotlin/net/moonleay/liljudd/jobs/StatusUpdater.kt similarity index 90% rename from src/main/kotlin/net/moonleay/lilJudd/jobs/StatusUpdater.kt rename to src/main/kotlin/net/moonleay/liljudd/jobs/StatusUpdater.kt index 7fed538..fdb421b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/StatusUpdater.kt +++ b/src/main/kotlin/net/moonleay/liljudd/jobs/StatusUpdater.kt @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.jobs +package net.moonleay.liljudd.jobs import dev.inmo.krontab.KronScheduler import dev.kord.common.entity.PresenceStatus import kotlinx.coroutines.Job -import net.moonleay.lilJudd.Bot -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3ApiDataGrabber -import net.moonleay.lilJudd.jobs.component.CronjobType -import net.moonleay.lilJudd.jobs.component.ICronjob +import net.moonleay.liljudd.Bot +import net.moonleay.liljudd.data.api.splatoon3ink.Splatoon3ApiDataGrabber +import net.moonleay.liljudd.jobs.component.CronjobType +import net.moonleay.liljudd.jobs.component.ICronjob object StatusUpdater : ICronjob { override val jobName: String diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/component/CronjobType.kt b/src/main/kotlin/net/moonleay/liljudd/jobs/component/CronjobType.kt similarity index 90% rename from src/main/kotlin/net/moonleay/lilJudd/jobs/component/CronjobType.kt rename to src/main/kotlin/net/moonleay/liljudd/jobs/component/CronjobType.kt index fa34b60..fa1992b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/component/CronjobType.kt +++ b/src/main/kotlin/net/moonleay/liljudd/jobs/component/CronjobType.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.jobs.component +package net.moonleay.liljudd.jobs.component enum class CronjobType { INFINITE, diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/component/ICronjob.kt b/src/main/kotlin/net/moonleay/liljudd/jobs/component/ICronjob.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/jobs/component/ICronjob.kt rename to src/main/kotlin/net/moonleay/liljudd/jobs/component/ICronjob.kt index d3f6700..8e3f946 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/component/ICronjob.kt +++ b/src/main/kotlin/net/moonleay/liljudd/jobs/component/ICronjob.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.jobs.component +package net.moonleay.liljudd.jobs.component import dev.inmo.krontab.KronScheduler import kotlinx.coroutines.Job diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/component/JobManager.kt b/src/main/kotlin/net/moonleay/liljudd/jobs/component/JobManager.kt similarity index 96% rename from src/main/kotlin/net/moonleay/lilJudd/jobs/component/JobManager.kt rename to src/main/kotlin/net/moonleay/liljudd/jobs/component/JobManager.kt index cc55256..ce62d1c 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/component/JobManager.kt +++ b/src/main/kotlin/net/moonleay/liljudd/jobs/component/JobManager.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.jobs.component +package net.moonleay.liljudd.jobs.component import dev.inmo.krontab.buildSchedule import dev.inmo.krontab.doInfinityTz @@ -25,7 +25,7 @@ import dev.inmo.krontab.doWhileTz import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import net.moonleay.lilJudd.util.Logger +import net.moonleay.liljudd.util.Logger import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/src/main/kotlin/net/moonleay/lilJudd/util/EmbedColor.kt b/src/main/kotlin/net/moonleay/liljudd/util/EmbedColor.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/util/EmbedColor.kt rename to src/main/kotlin/net/moonleay/liljudd/util/EmbedColor.kt index cb3e983..7d9def4 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/util/EmbedColor.kt +++ b/src/main/kotlin/net/moonleay/liljudd/util/EmbedColor.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.util +package net.moonleay.liljudd.util import dev.kord.common.Color diff --git a/src/main/kotlin/net/moonleay/lilJudd/util/EmbedUtil.kt b/src/main/kotlin/net/moonleay/liljudd/util/EmbedUtil.kt similarity index 98% rename from src/main/kotlin/net/moonleay/lilJudd/util/EmbedUtil.kt rename to src/main/kotlin/net/moonleay/liljudd/util/EmbedUtil.kt index 17615b3..f109ed3 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/util/EmbedUtil.kt +++ b/src/main/kotlin/net/moonleay/liljudd/util/EmbedUtil.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.util +package net.moonleay.liljudd.util import dev.kord.common.entity.ButtonStyle import dev.kord.core.entity.Embed diff --git a/src/main/kotlin/net/moonleay/lilJudd/util/Logger.kt b/src/main/kotlin/net/moonleay/liljudd/util/Logger.kt similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/util/Logger.kt rename to src/main/kotlin/net/moonleay/liljudd/util/Logger.kt index 446609c..25a5804 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/util/Logger.kt +++ b/src/main/kotlin/net/moonleay/liljudd/util/Logger.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.util +package net.moonleay.liljudd.util import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/src/main/kotlin/net/moonleay/lilJudd/util/MessageUtil.kt b/src/main/kotlin/net/moonleay/liljudd/util/MessageUtil.kt similarity index 84% rename from src/main/kotlin/net/moonleay/lilJudd/util/MessageUtil.kt rename to src/main/kotlin/net/moonleay/liljudd/util/MessageUtil.kt index 3307f58..f531dd0 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/util/MessageUtil.kt +++ b/src/main/kotlin/net/moonleay/liljudd/util/MessageUtil.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.util +package net.moonleay.liljudd.util import dev.kord.core.behavior.UserBehavior import dev.kord.core.entity.Embed @@ -37,6 +37,11 @@ object MessageUtil { val ebb = EmbedBuilder() ebb.color = e.color ebb.title = e.title + ebb.author { + this.icon = e.author?.url + this.name = e.author?.name.toString() + this.url = e.author?.url + } e.fields.forEach { val fb = EmbedBuilder.Field() fb.name = it.name @@ -44,6 +49,10 @@ object MessageUtil { fb.inline = it.inline ebb.fields.add(fb) } + ebb.footer { + this.icon = e.footer?.iconUrl + this.text = e.footer?.text.toString() + } ebb.description = e.description return ebb } @@ -52,6 +61,11 @@ object MessageUtil { val ebb = EmbedBuilder() ebb.color = e.color ebb.title = e.title + ebb.author { + this.icon = e.author?.url + this.name = e.author?.name.toString() + this.url = e.author?.url + } e.fields.forEach { val fb = EmbedBuilder.Field() fb.name = it.name @@ -59,6 +73,10 @@ object MessageUtil { fb.inline = it.inline ebb.fields.add(fb) } + ebb.footer { + this.icon = e.footer?.icon + this.text = e.footer?.text.toString() + } ebb.description = e.description return ebb } diff --git a/src/main/kotlin/net/moonleay/lilJudd/util/NetUtil.kt b/src/main/kotlin/net/moonleay/liljudd/util/NetUtil.kt similarity index 96% rename from src/main/kotlin/net/moonleay/lilJudd/util/NetUtil.kt rename to src/main/kotlin/net/moonleay/liljudd/util/NetUtil.kt index 5b43bbc..665d0bb 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/util/NetUtil.kt +++ b/src/main/kotlin/net/moonleay/liljudd/util/NetUtil.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2023 moonleay + * Copyright (C) 2024 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.util +package net.moonleay.liljudd.util import java.net.URL import javax.net.ssl.HttpsURLConnection diff --git a/src/main/kotlin/net/moonleay/lilJudd/util/TimeUtil.kt b/src/main/kotlin/net/moonleay/liljudd/util/TimeUtil.kt similarity index 99% rename from src/main/kotlin/net/moonleay/lilJudd/util/TimeUtil.kt rename to src/main/kotlin/net/moonleay/liljudd/util/TimeUtil.kt index acf0da8..bddc8b1 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/util/TimeUtil.kt +++ b/src/main/kotlin/net/moonleay/liljudd/util/TimeUtil.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.util +package net.moonleay.liljudd.util import kotlinx.datetime.DayOfWeek import java.time.Duration diff --git a/src/main/templates/net/moonleay/lilJudd/build/BuildConstants.kt b/src/main/templates/net/moonleay/lilJudd/build/BuildConstants.kt index 44c46b3..73a4fdd 100644 --- a/src/main/templates/net/moonleay/lilJudd/build/BuildConstants.kt +++ b/src/main/templates/net/moonleay/lilJudd/build/BuildConstants.kt @@ -20,7 +20,7 @@ package net.moonleay.liljudd.build internal object BuildConstants { const val version = "${version}" - const val ownerID = "${ownerID}" + const val creatorID = "${creatorID}" const val kordVersion = "${kordversion}" const val coroutinesVersion = "${coroutinesversion}" const val ktorVersion = "${ktorversion}"